add wpa conf

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 71c40a6f4c0827ac98bc0d6a821fc179b2e74a9c..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()
@@ -42,7 +42,7 @@ build_linux()
         git reset --hard origin/asahi; git clean -f -x -d
         curl -s https://tg.st/u/9ce9060dea91951a330feeeda3ad636bc88c642c.patch | git am -
         curl -s https://tg.st/u/5nly | git am -
-        curl -s https://tg.st/u/asahi-config-2022-01-19 > .config
+        curl -s https://tg.st/u/config-2022-01-24 > .config
         make olddefconfig
         make -j 16 bindeb-pkg
 )
@@ -64,11 +64,13 @@ build_rootfs()
 
         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'
+        sudo bash -c 'chroot . apt install -y firmware-linux-free'
 
         sudo -- perl -p -i -e 's/root:x:/root::/' etc/passwd
 
@@ -82,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 .)
 )
 }
 
@@ -111,12 +113,28 @@ 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
 
-build_m1n1
-build_uboot
-build_linux
-build_rootfs
-build_stick
-build_fs
+# build_m1n1
+# build_uboot
+# build_linux
+# build_rootfs
+# build_live_stick
+build_di_stick
+# build_fs