notes on geekbench

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 2c5d1e920864a52274b53f710dbe6d4634f4bb18..9b3b22e3138af4fd7826f71e376e50d7e97fa30b 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -27,8 +27,9 @@ 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/config-2022-03-09-4k > .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-17-distro-sven-jannau.txt > .config
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
@@ -57,8 +58,8 @@ build_uboot()
         make -j `nproc`
 )
 
-        cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
-        cat m1n1/build/m1n1.macho `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho
+        cat m1n1/build/m1n1.bin   `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` <(gzip -c u-boot/u-boot-nodtb.bin) > u-boot.bin
+        cat m1n1/build/m1n1.macho `find linux/arch/arm64/boot/dts/apple/ -name \*.dtb` <(gzip -c u-boot/u-boot-nodtb.bin) > u-boot.macho
 }
 
 build_rootfs()
@@ -67,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://deb.debian.org/debian
 
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
 
@@ -75,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'
 
@@ -120,7 +121,7 @@ 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 media
         tune2fs -O extents,uninit_bg,dir_index -m 0 -c 0 -i 0 media
@@ -156,12 +157,12 @@ build_asahi_installer_image()
 {
 (
         rm -rf aii
-        mkdir -p aii/esp aii/m1n1
+        mkdir -p aii/esp/m1n1
         cp -a EFI aii/esp/
-        cp u-boot.bin aii/m1n1/boot.bin
+        cp u-boot.bin aii/esp/m1n1/boot.bin
         ln media aii/media
         cd aii
-        zip -r9 ../debian-base.zip esp m1n1 media
+        zip -r9 ../debian-base.zip esp media
 )
 }
 
@@ -190,7 +191,7 @@ 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 debian-base.zip /u/
+        sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho 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
@@ -202,7 +203,7 @@ build_linux
 build_m1n1
 build_uboot
 build_rootfs
-build_di_stick
+#build_di_stick
 build_dd
 build_efi
 build_asahi_installer_image