X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/30bd9405366b30384cd998c3d7a7b2e163d73c5a..f7f571f945fe5e5e810ae40721b2b71b88e9777c:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index ca7ded5..0fec481 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -23,16 +23,17 @@ build_linux()
 {
 (
         handle_crosscompile
-        test -d linux || git clone --depth 1 https://github.com/AsahiLinux/linux -b smc/work
+        test -d linux || git clone --depth 1 https://github.com/jannau/linux -b spmi/work
         cd linux
         git fetch
-        git reset --hard origin/smc/work; git clean -f -x -d &> /dev/null
+        git reset --hard origin/spmi/work; git clean -f -x -d &> /dev/null
         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/0wM8 | git am -
         curl -s https://tg.st/u/256f5efbf23ff68c489dad92f99d1cecfb021729.patch | git am -
         curl -s https://tg.st/u/8737955a0263d09ffa8550658dfcac1df3d0665c.patch | git am -
         curl -s https://tg.st/u/0001-4k-iommu-patch.patch | git am -
+        curl -s https://tg.st/u/0001-21-02-axboe-grabbing-anv-lock-around-the-issue-does-.patch | git am -
         curl -s https://tg.st/u/config-2022-02-13 > .config
         make olddefconfig
         make -j $(( 2* `nproc`)) V=0 bindeb-pkg &> /dev/null
@@ -142,10 +143,8 @@ build_di_stick()
         sudo rm -rf initrd; mkdir initrd; (cd initrd; gzip -cd ../initrd.gz | sudo cpio -imd --quiet)
         sudo rm -rf initrd/lib/modules/*
         sudo cp -a testing/lib/modules/* initrd/lib/modules/
-        sudo cp ../files/options.sh initrd/usr/lib/base-installer.d/
-        sudo cp ../files/wifi.sh initrd/usr/lib/debian-installer-startup.d/
-        sudo cp ../files/boot.sh initrd/usr/lib/finish-install.d/
-        sudo cp ../files/wpa.conf initrd/etc/
+        sudo cp ../files/wifi.sh initrd/
+        sudo cp ../files/boot.sh initrd/
         (cd initrd; find . | cpio --quiet -H newc -o | pigz > ../di-stick/initrd.gz)
         sudo rm -rf initrd
         cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi di-stick/efi/boot/bootaa64.efi
@@ -177,11 +176,11 @@ cd build
 
 sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support
 
-# build_linux
-# build_m1n1
-# build_uboot
+build_linux
+build_m1n1
+build_uboot
 # build_rootfs
 # build_live_stick
-build_di_stick
+# build_di_stick
 # build_dd
 # upload_artefacts