X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/51cd86d8e21a3332aa00a31c882ca51cb3ece224..adfb7d3e18335003bbc8a386dc0cebcd6b6d48ce:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index b019d4f..1cd8634 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -17,28 +17,28 @@ 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`
-
         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 bash -c 'chroot . apt update'
         sudo bash -c 'chroot . apt install -y firmware-linux'
@@ -47,9 +47,9 @@ build_rootfs()
 
         sudo -- ln -s lib/systemd/systemd init
 
-        sudo cp ../${KERNEL} .
-        sudo chroot . dpkg -i ${KERNEL}
-        sudo rm ${KERNEL}
+        sudo chroot . apt update
+        sudo chroot . apt install -y m1n1 linux-image-asahi
+        sudo chroot . apt clean
 
         sudo bash -c 'chroot . apt-get clean'
 )
@@ -69,6 +69,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()
 {
 (
@@ -95,7 +111,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,8 +120,6 @@ 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/
 }
 
@@ -114,10 +128,8 @@ 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
 
-build_linux
-build_m1n1
-build_uboot
 build_rootfs
+build_dd
 build_efi
 build_asahi_installer_image
 build_live_stick