X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blobdiff_plain/6a33e2fe2ebfa1dbbc7225ef37177040b103b924..9c9b4bb5bb0265f47386d3a3e549aca05774858d:/bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index c6087f2..b5ccc11 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -29,7 +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/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
@@ -55,6 +55,7 @@ build_uboot()
         cd u-boot
         git fetch
         git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
+        curl -s https://tg.st/u/102777230b057efa00fe39c7e545e13ddead1177.patch | git am -
         make apple_m1_defconfig
         make -j `nproc`
 )
@@ -143,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