add wpa conf

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 9d2c39fb4bc68e6105b76927d31ac8c7c5f6e078..b890105a176247181ba606f162881dea67832504 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -30,7 +30,7 @@ build_uboot()
         make -j 16 || true
 )
 
-        cat m1n1/build/m1n1.macho `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho
+        cat m1n1/build/m1n1.bin `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.bin
 }
 
 build_linux()
@@ -70,7 +70,7 @@ build_rootfs()
         sudo cp ../../files/eth0 etc/network/interfaces.d/
 
         sudo bash -c 'chroot . apt update'
-        sudo bash -c 'chroot . apt install -y firmware-linux'
+        sudo bash -c 'chroot . apt install -y firmware-linux-free'
 
         sudo -- perl -p -i -e 's/root:x:/root::/' etc/passwd
 
@@ -84,16 +84,16 @@ build_rootfs()
 )
 }
 
-build_stick()
+build_live_stick()
 {
 (
-        rm -rf stick
-        mkdir -p stick/efi/boot stick/efi/debian/
-        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
-        (cd stick; tar cf ../asahi-debian-live-`date "+%Y-%m-%d"`.tar .)
+        rm -rf live-stick
+        mkdir -p live-stick/efi/boot live-stick/efi/debian/
+        sudo bash -c 'cd testing; find . | cpio --quiet -H newc -o | pigz > ../live-stick/initrd.gz'
+        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
+        (cd live-stick; tar cf ../asahi-debian-live-`date "+%Y-%m-%d"`.tar .)
 )
 }
 
@@ -113,6 +113,21 @@ build_fs()
 )
 }
 
+build_di_stick()
+{
+        rm -rf di-stick
+        mkdir -p live-stick/efi/boot live-stick/efi/debian/
+        wget https://d-i.debian.org/daily-images/arm64/daily/netboot/debian-installer/arm64/initrd.gz
+        mkdir initrd; cd initrd; gzip -cd ../initrd.gz | sudo cpio -imd --quiet
+        rm -rf initrd/lib/modules/*
+        cp -a ../testing/lib/modules/* initrd/lib/modules/
+        (cd initrd; find . | cpio --quiet -H newc -o | pigz > ../initrd.gz)
+        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
+        (cd live-stick; tar cf ../m1-d-i-`date "+%Y-%m-%d"`.tar .)
+}
+
 mkdir -p build
 cd build
 
@@ -120,5 +135,6 @@ cd build
 # build_uboot
 # build_linux
 # build_rootfs
-build_stick
-build_fs
+# build_live_stick
+build_di_stick
+# build_fs