From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Sun, 4 Dec 2022 17:23:34 +0000 (+0100)
Subject: Merge branch 'master' of 88.198.237.222:/git/m1-debian
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/ada5f71b6752b1b0263be0bcc4e50e94f486463d?ds=inline;hp=-c

Merge branch 'master' of 88.198.237.222:/git/m1-debian
---

ada5f71b6752b1b0263be0bcc4e50e94f486463d
diff --combined bootstrap.sh
index 4bf1b0b,469fc88..389ccd4
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@@ -31,9 -31,9 +31,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-rc6-1; git clean -f -x -d &> /dev/null
 +        git reset --hard asahi-6.1-rc6-5; git clean -f -x -d &> /dev/null
          curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am -
-         cat ../../config > .config
+         cat ../../config-16k.txt > .config
          make olddefconfig
          make -j `nproc` V=0 bindeb-pkg > /dev/null
  )
@@@ -46,7 -46,7 +46,7 @@@ build_m1n1(
          cd m1n1
          git fetch -a -t
          # https://github.com/AsahiLinux/PKGBUILDs/blob/main/m1n1/PKGBUILD
 -        git reset --hard v1.1.4; git clean -f -x -d &> /dev/null
 +        git reset --hard v1.1.8; git clean -f -x -d &> /dev/null
          make -j `nproc`
  )
  }
@@@ -59,8 -59,9 +59,8 @@@ build_uboot(
          cd u-boot
          git fetch -a -t
          # For tag, see https://github.com/AsahiLinux/PKGBUILDs/blob/main/uboot-asahi/PKGBUILD
 -        git reset --hard asahi-v2022.07-3; git clean -f -x -d &> /dev/null
 +        git reset --hard asahi-v2022.10-1; git clean -f -x -d &> /dev/null
          git revert --no-edit 4d2b02faf69eaddd0f73758ab26c456071bd2017
 -        curl -s https://tg.st/u/0001-usb_setup_descriptor-Add-1ms-delay-in-order-to-unbre.patch | git am -
  
          make apple_m1_defconfig
          make -j `nproc`
@@@ -210,7 -211,7 +210,7 @@@ publish_artefacts(
  mkdir -p build
  cd build
  
- sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves clang-14 lld-14 llvm-14
+ sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves clang-14 lld-14 llvm-14 curl
  
  build_linux
  build_m1n1