X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/51cd86d8e21a3332aa00a31c882ca51cb3ece224..d5659d5f502f695f7a321c3aa06518e29a6e9e65:/bootstrap.sh?ds=sidebyside

diff --git a/bootstrap.sh b/bootstrap.sh
index b019d4f..1fd72b5 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -17,28 +17,31 @@ export DEBOOTSTRAP=debootstrap
 build_rootfs()
 {
 (
-        handle_crosscompile
         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
-
-        export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
+        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
 
-        sudo mkdir -p boot/efi
+        sudo mkdir -p boot/efi/m1n1 etc/X11/xorg.conf.d
 
         sudo bash -c 'echo debian > etc/hostname'
 
         sudo bash -c 'echo > etc/motd'
 
         sudo cp ../../files/sources.list etc/apt/sources.list
+        sudo cp ../../files/glanzmann.list etc/apt/sources.list.d/
+        sudo cp ../../files/thomas-glanzmann.gpg etc/apt/trusted.gpg.d/
         sudo cp ../../files/hosts etc/hosts
         sudo cp ../../files/resolv.conf etc/resolv.conf
         sudo cp ../../files/quickstart.txt root/
         sudo cp ../../files/interfaces etc/network/interfaces
         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'
@@ -47,11 +50,10 @@ build_rootfs()
 
         sudo -- ln -s lib/systemd/systemd init
 
-        sudo cp ../${KERNEL} .
-        sudo chroot . dpkg -i ${KERNEL}
-        sudo rm ${KERNEL}
-
-        sudo bash -c 'chroot . apt-get clean'
+        sudo chroot . apt update
+        sudo chroot . apt install -y m1n1 linux-image-asahi
+        sudo chroot . apt 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
-        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
@@ -69,6 +71,22 @@ build_live_stick()
 )
 }
 
+build_dd()
+{
+(
+        rm -f media
+        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
+        sudo mount -o loop media mnt
+        sudo cp -a testing/* mnt/
+        sudo rm -rf mnt/init mnt/boot/efi/m1n1
+        sudo umount mnt
+        tar cf - media | pigz -9 > m1.tgz
+)
+}
+
 build_efi()
 {
 (
@@ -81,11 +99,10 @@ build_efi()
         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
-        tar czf efi.tgz EFI
 )
 }
 
@@ -95,7 +112,7 @@ 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
+        cp testing/usr/lib/m1n1/boot.bin aii/esp/m1n1/boot.bin
         ln media aii/media
         cd aii
         zip -r9 ../debian-base.zip esp media
@@ -104,20 +121,16 @@ build_asahi_installer_image()
 
 publish_artefacts()
 {
-        export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
-        cp ${KERNEL} k.deb
-        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_linux
-build_m1n1
-build_uboot
 build_rootfs
+build_dd
 build_efi
 build_asahi_installer_image
 build_live_stick