+= git reset --hard origin/main

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index fc8c366dc9d532df70ca898f7d3e1fc93fbae9b4..7b46c41fc28ad1ecd2fa151d40b5954034788cc7 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -63,7 +63,7 @@ build_live_stick()
         rm -rf live-stick
         mkdir -p live-stick/efi/boot live-stick/efi/debian/
         sudo cp ../files/wifi.pl testing/etc/rc.local
-        sudo bash -c 'cd testing; find . | cpio --quiet -H newc -o | pigz -9 > ../live-stick/initrd.gz'
+        sudo bash -c 'cd testing; find . | cpio --quiet -H newc -o | zstd -T0 -16 > ../live-stick/initrd.zstd'
         cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi live-stick/efi/boot/bootaa64.efi
         cp testing/boot/vmlinuz* live-stick/vmlinuz
         cp ../files/grub.cfg live-stick/efi/debian/grub.cfg
@@ -87,26 +87,6 @@ build_dd()
 )
 }
 
-build_efi()
-{
-(
-        rm -rf EFI
-        mkdir -p EFI/boot EFI/debian
-        cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi EFI/boot/bootaa64.efi
-
-        export INITRD=`ls -1 testing/boot/ | grep initrd`
-        export VMLINUZ=`ls -1 testing/boot/ | grep vmlinuz`
-        export UUID=`blkid -s UUID -o value media`
-        cat > EFI/debian/grub.cfg <<EOF
-search.fs_uuid ${UUID} root
-linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw
-initrd (\$root)/boot/${INITRD}
-boot
-EOF
-        tar czf efi.tgz EFI
-)
-}
-
 build_asahi_installer_image()
 {
 (
@@ -122,17 +102,16 @@ build_asahi_installer_image()
 
 publish_artefacts()
 {
-        sudo cp efi.tgz asahi-debian-live.tar debian-base.zip /u/
+        echo upload build/asahi-debian-live.tar build/debian-base.zip
 }
 
 mkdir -p build
 cd build
 
-sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev 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
+sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev 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 zstd
 
 build_rootfs
 build_dd
-build_efi
 build_asahi_installer_image
 build_live_stick
 publish_artefacts