X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/a636dc48f8cf66822e3e0c941751213ee4216797..cfd5816b34f78cd13691f56b9052a3b208e5d4d1:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 14fbf0a..3666165 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -29,6 +29,7 @@ build_linux()
         git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
         curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am -
         curl -s https://tg.st/u/0001-4k-iommu-patch-2022-03-11.patch | git am -
+        curl -s https://tg.st/u/WQRL.patch | git am -
         curl -s https://tg.st/u/config-2022-03-17-distro-sven-jannau.txt > .config
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
@@ -38,10 +39,11 @@ build_linux()
 build_m1n1()
 {
 (
-        test -d m1n1 || git clone --recursive https://github.com/AsahiLinux/m1n1.git
+        test -d m1n1 || git clone --recursive https://github.com/jannau/m1n1
         cd m1n1
         git fetch
-        git reset --hard origin/main; git clean -f -x -d &> /dev/null
+        git reset --hard origin/display_fb_alloc; git clean -f -x -d &> /dev/null
+        curl -s https://tg.st/u/0001-display-Add-wait-option-to-handle-monitor-disconnect.patch | git am -
         make -j `nproc`
 )
 }
@@ -142,7 +144,7 @@ build_efi()
 
         export INITRD=`ls -1 testing/boot/ | grep initrd`
         export VMLINUZ=`ls -1 testing/boot/ | grep vmlinuz`
-        export UUID=`blkid media | awk -F\" '{print $2}'`
+        export UUID=`blkid -s UUID -o value media`
         cat > EFI/debian/grub.cfg <<EOF
 search.fs_uuid ${UUID} root
 linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw
@@ -203,7 +205,7 @@ build_linux
 build_m1n1
 build_uboot
 build_rootfs
-# build_di_stick - Debian failed to upload the initrd.gz
+#build_di_stick
 build_dd
 build_efi
 build_asahi_installer_image