From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Wed, 26 Oct 2022 12:56:57 +0000 (+0200)
Subject: Merge branch 'master' of a.gmvl.de:/git/m1-debian
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/409bd8cb215724a0ff602a54f6785cc6c5b2bc22?ds=sidebyside;hp=-c

Merge branch 'master' of a.gmvl.de:/git/m1-debian
---

409bd8cb215724a0ff602a54f6785cc6c5b2bc22
diff --combined bootstrap.sh
index 3f93d58,a55b12e..f5a5aa7
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@@ -27,9 -27,9 +27,9 @@@ build_linux(
          test -d linux || git clone https://github.com/AsahiLinux/linux
          cd linux
          git fetch -a -t
 -        git reset --hard asahi-6.0-rc5-4; git clean -f -x -d &> /dev/null
 +        git reset --hard asahi-6.0-rc6-1; git clean -f -x -d &> /dev/null
          curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am -
-         cat ../../config-16k.txt > .config
+         cat ../../config > .config
          make olddefconfig
          make -j `nproc` V=0 bindeb-pkg > /dev/null
  )
@@@ -211,6 -211,9 +211,9 @@@ sudo apt-get install -y build-essentia
  build_linux
  build_m1n1
  build_uboot
+ 
+ exit
+ 
  build_rootfs
  #build_di_stick
  build_dd