X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/9d00677cbc9657e89e80839607df4566290b8aad..814f760bfaf1c92f6ccb30a89bbe9505dd106a02:/bootstrap.sh?ds=sidebyside

diff --git a/bootstrap.sh b/bootstrap.sh
index 17e3833..58661ad 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -27,14 +27,11 @@ build_linux()
         cd linux
         git fetch
         git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
-        curl -s https://tg.st/u/0001-4k-iommu-patch.patch | git am -
-        curl -s https://tg.st/u/DXyl.patch | git am -
-        curl -s https://tg.st/u/0001-apple-mca-correct-prinkts.patch | git am -
-        curl -s https://tg.st/u/0001-Hookup-backlight-for-MacBook-Pro-13-inch-M1-2020-J29.patch | git am -
-        curl -s https://tg.st/u/XKVZ.patch | git am -
-        curl -s https://tg.st/u/config-2022-02-19 > .config
+        curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am -
+        curl -s https://tg.st/u/0001-4k-iommu-patch-2022-03-11.patch | git am -
+        curl -s https://tg.st/u/config-2022-03-15-4k > .config
         make olddefconfig
-        make -j `nproc` V=0 bindeb-pkg
+        make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
 }
 
@@ -53,11 +50,10 @@ build_uboot()
 {
 (
         handle_crosscompile
-        test -d u-boot || git clone --depth 1 https://github.com/jannau/u-boot -b x2r10g10b10
+        test -d u-boot || git clone --depth 1 https://github.com/AsahiLinux/u-boot
         cd u-boot
         git fetch
-        git reset --hard origin/x2r10g10b10; git clean -f -x -d &> /dev/null
-        curl -s https://tg.st/u/v2-console-usb-kbd-Limit-poll-frequency-to-improve-performance.diff | patch -p1
+        git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
         make apple_m1_defconfig
         make -j `nproc`
 )
@@ -72,7 +68,7 @@ build_rootfs()
         handle_crosscompile
         sudo rm -rf testing
         mkdir -p cache
-        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools testing testing http://ftp.fau.de/debian
+        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk testing testing http://ftp.fau.de/debian
 
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
 
@@ -80,7 +76,7 @@ build_rootfs()
 
         sudo mkdir -p boot/efi
 
-        sudo bash -c 'echo live > etc/hostname'
+        sudo bash -c 'echo debian > etc/hostname'
 
         sudo bash -c 'echo > etc/motd'
 
@@ -103,7 +99,7 @@ build_rootfs()
         sudo chroot . dpkg -i ${KERNEL}
         sudo rm ${KERNEL}
 
-        sudo bash -c 'apt-get clean'
+        sudo bash -c 'chroot . apt-get clean'
 )
 }
 
@@ -125,9 +121,9 @@ build_dd()
 {
 (
         rm -f media
-        dd if=/dev/zero of=media bs=1 count=0 seek=1G
+        dd if=/dev/zero of=media bs=1 count=0 seek=2G
         mkdir -p mnt
-        mkfs.ext4 -O ^metadata_csum media
+        mkfs.ext4 media
         tune2fs -O extents,uninit_bg,dir_index -m 0 -c 0 -i 0 media
         sudo mount -o loop media mnt
         sudo cp -a testing/* mnt/
@@ -157,6 +153,19 @@ EOF
 )
 }
 
+build_asahi_installer_image()
+{
+(
+        rm -rf aii
+        mkdir -p aii/esp/m1n1
+        cp -a EFI aii/esp/
+        cp u-boot.bin aii/esp/m1n1/boot.bin
+        ln media aii/media
+        cd aii
+        zip -r9 ../debian-base.zip esp media
+)
+}
+
 build_di_stick()
 {
         rm -rf di-stick
@@ -182,20 +191,21 @@ publish_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
-        sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi /u/
+        sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho di-stick/vmlinuz k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi debian-base.zip /u/
 }
 
 mkdir -p build
 cd build
 
-sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev
+sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves
 
 build_linux
 build_m1n1
 build_uboot
 build_rootfs
-build_live_stick
 build_di_stick
 build_dd
 build_efi
+build_asahi_installer_image
+build_live_stick
 publish_artefacts