updated for latest asahi branch

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index e5b88d952539590291cc3c64783c6da350404d4d..a7cb2f2c857d216d4cbc3f56d0fcd66286ed9bcd 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -27,10 +27,9 @@ build_linux()
         cd linux
         git fetch
         git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
-        # curl -s https://tg.st/u/0001-4k-iommu-patch-2022-03-11.patch | git am -
         curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am -
-        # curl -s https://tg.st/u/config-2022-03-09-4k > .config
-        curl -s https://tg.st/u/config-2022-03-09-16k > .config
+        curl -s https://tg.st/u/0001-4k-iommu-patch-2022-03-11.patch | git am -
+        curl -s https://tg.st/u/config-2022-03-15-4k > .config
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
@@ -69,7 +68,7 @@ build_rootfs()
         handle_crosscompile
         sudo rm -rf testing
         mkdir -p cache
-        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools testing testing http://ftp.fau.de/debian
+        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 testing testing http://ftp.fau.de/debian
 
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
 
@@ -203,10 +202,10 @@ sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu l
 build_linux
 build_m1n1
 build_uboot
-# build_rootfs
-# build_di_stick
-# build_dd
-# build_efi
-# build_asahi_installer_image
-# build_live_stick
-# publish_artefacts
+build_rootfs
+build_di_stick
+build_dd
+build_efi
+build_asahi_installer_image
+build_live_stick
+publish_artefacts