X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/1388429a2bcf57724ac39a2ee228b1e4c92f2e41..774619cdd61d7f3da006e7ad5d2f3acc9e964e30:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 71b2774..ddf7646 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -52,7 +52,9 @@ build_rootfs()
 {
 (
         sudo rm -rf testing
-        sudo eatmydata debootstrap --arch=arm64 --include iwd,tcpdump,vim,tmux,vlan,ntpdate,bridge-utils,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client testing testing http://ftp.fau.de/debian
+        sudo eatmydata debootstrap --arch=arm64 --include initramfs-tools,iwd,tcpdump,vim,tmux,vlan,ntpdate,bridge-utils,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client testing testing http://ftp.fau.de/debian
+
+        export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
 
         cd testing
 
@@ -60,9 +62,12 @@ build_rootfs()
 
         sudo bash -c 'echo > etc/motd'
 
-        sudo cp ../files/sources.list etc/apt/sources.list
-        sudo cp ../files/hosts etc/hosts
-        sudo cp ../files/quickstart.txt root/
+        sudo cp ../../files/sources.list etc/apt/sources.list
+        sudo cp ../../files/hosts etc/hosts
+        sudo cp ../../files/resolv.conf etc/resolv.conf
+        sudo cp ../../files/fstab etc/fstab
+        sudo cp ../../files/quickstart.txt root/
+        sudo cp ../../files/eth0 etc/network/interfaces.d/
 
         sudo bash -c 'chroot . apt update'
         sudo bash -c 'chroot . apt install -y firmware-linux'
@@ -71,11 +76,10 @@ build_rootfs()
 
         sudo -- ln -s lib/systemd/systemd init
 
-        sudo cp ../linux-image-5.16.0-asahi-next-20220118-gdcd14bb2ec40_5.16.0-asahi-next-20220118-gdcd14bb2ec40-1_arm64.deb .
-
-        sudo chroot . dpkg -i linux-image-5.16.0-asahi-next-20220118-gdcd14bb2ec40_5.16.0-asahi-next-20220118-gdcd14bb2ec40-1_arm64.deb
+        sudo cp ../${KERNEL} .
+        sudo chroot . dpkg -i ${KERNEL}
+        sudo rm ${KERNEL}
 
-        sudo rm linux-image-5.16.0-asahi-next-20220118-gdcd14bb2ec40_5.16.0-asahi-next-20220118-gdcd14bb2ec40-1_arm64.deb
         sudo bash -c 'apt-get clean'
 )
 }
@@ -88,13 +92,33 @@ build_stick()
         sudo bash -c 'cd testing; find . | cpio --quiet -H newc -o | pigz > ../stick/initrd.gz'
         cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi stick/efi/boot/bootaa64.efi
         cp testing/boot/vmlinuz* stick/vmlinuz
-        cp files/grub.cfg stick/efi/debian/grub.cfg
+        cp ../files/grub.cfg stick/efi/debian/grub.cfg
         (cd stick; tar cf ../asahi-debian-live-`date "+%Y-%m-%d"`.tar .)
 )
 }
 
+build_fs()
+{
+(
+        rm -f media
+        dd if=/dev/zero of=media bs=1 count=0 seek=1G
+        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 mnt/init
+        sudo umount mnt
+        tar cf - media | pigz > m1.tgz
+)
+}
+
+mkdir -p build
+cd build
+
 # build_m1n1
 # build_uboot
 # build_linux
 # build_rootfs
 build_stick
+build_fs