enable disabled commands again

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 775ac1077d1dbb914fa80b2cbe43e584fe7f9372..df76d4c5765ceb997b6f1eb73f42dca1a7c52205 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -13,7 +13,7 @@ build_m1n1()
         cd m1n1
         git fetch
         git reset --hard origin/main; git clean -f -x -d
-        make -j
+        make -j 16
 )
 }
 
@@ -23,6 +23,7 @@ build_uboot()
         # Build u-boot
         test -d u-boot || git clone https://github.com/kettenis/u-boot
         cd u-boot
+        git fetch
         git reset --hard origin/apple-m1-m1n1-nvme; git clean -f -x -d
         make apple_m1_defconfig
         # it is normal that it runs on an error at the end
@@ -32,22 +33,67 @@ build_uboot()
         cat m1n1/build/m1n1.macho `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u-boot.macho
 }
 
+build_linux()
+{
+(
+        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux
+        cd linux
+        git fetch
+        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
+        make olddefconfig
+        make -j 16 bindeb-pkg
+)
+}
+
+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
+
+        cd testing
+
+        sudo bash -c 'echo live > etc/hostname'
+
+        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/
 
-# # Build our boot object that replaces step2.sh in the asahi installer
-# 
-# # Build Linux
-# git clone https://github.com/AsahiLinux/linux
-# cd linux
-# git checkout origin/asahi
-# # SPI patches
-# curl https://tg.st/u/aa6a11b3feeda0f57284f99406188e4615e7c43c.patch | patch -p1
-# curl https://tg.st/u/9ce9060dea91951a330feeeda3ad636bc88c642c.patch | patch -p1
-# # Sound patch
-# curl https://tg.st/u/5nly | patch -p1
-# # Config with sound enabled
-# curl https://tg.st/u/asahi-config-2022-01-19 > .config
-# make olddefconfig
-# make bindeb-pkg
+        sudo bash -c 'chroot . apt update'
+        sudo bash -c 'chroot . apt install -y firmware-linux'
+
+        sudo -- perl -p -i -e 's/root:x:/root::/' etc/passwd
+
+        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 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'
+)
+}
+
+build_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
+)
+}
 
 # build_m1n1
-build_uboot
+# build_uboot
+# build_linux
+# build_rootfs
+build_stick