Merge branch 'master' of 88.198.237.222:/git/m1-debian

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 1cd86340d468ff60ace4767c4588f6a1269ba9cc..1fd72b5b143fc854c13aece884623132d572c96c 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -19,7 +19,7 @@ build_rootfs()
 (
         sudo rm -rf testing
         mkdir -p cache
 (
         sudo rm -rf testing
         mkdir -p cache

-        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,cryptsetup testing testing http://deb.debian.org/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,cryptsetup,wireless-regdb,zstd testing testing http://deb.debian.org/debian

 
         cd testing
 
 
         cd testing
 


@@ -39,6 +39,9 @@ build_rootfs()
         sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf
         sudo cp ../../files/rc.local etc/rc.local
         sudo cp ../../files/30-modeset.conf etc/X11/xorg.conf.d/30-modeset.conf
         sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf
         sudo cp ../../files/rc.local etc/rc.local
         sudo cp ../../files/30-modeset.conf etc/X11/xorg.conf.d/30-modeset.conf

+        sudo cp ../../files/blacklist.conf etc/modprobe.d/
+
+        sudo perl -p -i -e 's/"quiet"/"net.ifnames=0"/ if /^GRUB_CMDLINE_LINUX_DEFAULT=/' etc/default/grub

 
         sudo bash -c 'chroot . apt update'
         sudo bash -c 'chroot . apt install -y firmware-linux'
 
         sudo bash -c 'chroot . apt update'
         sudo bash -c 'chroot . apt install -y firmware-linux'


@@ -50,8 +53,7 @@ build_rootfs()
         sudo chroot . apt update
         sudo chroot . apt install -y m1n1 linux-image-asahi
         sudo chroot . apt clean
         sudo chroot . apt update
         sudo chroot . apt install -y m1n1 linux-image-asahi
         sudo chroot . apt clean

-
-        sudo bash -c 'chroot . apt-get clean'
+        sudo rm var/lib/apt/lists/* || true

 )
 }
 
 )
 }
 


@@ -61,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
         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
         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


@@ -97,11 +99,10 @@ build_efi()
         export UUID=`blkid -s UUID -o value media`
         cat > EFI/debian/grub.cfg <<EOF
 search.fs_uuid ${UUID} root
         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
+linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw net.ifnames=0

 initrd (\$root)/boot/${INITRD}
 boot
 EOF
 initrd (\$root)/boot/${INITRD}
 boot
 EOF

-        tar czf efi.tgz EFI

 )
 }
 
 )
 }
 


@@ -120,13 +121,13 @@ build_asahi_installer_image()
 
 publish_artefacts()
 {
 
 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
 
 }
 
 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_rootfs
 build_dd