From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Sun, 4 Dec 2022 18:28:23 +0000 (+0100)
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/fe26e69fad1fb8e2288a78997aeb0b209cca9a18?ds=inline;hp=-c

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

fe26e69fad1fb8e2288a78997aeb0b209cca9a18
diff --combined bootstrap.sh
index 251ad0d,389ccd4..ca3426d
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@@ -31,7 -31,7 +31,7 @@@ 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-16k.txt > .config
          make olddefconfig
@@@ -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,9 -59,8 +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`
@@@ -206,17 -205,19 +205,17 @@@ publish_artefacts(
          export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
          cp ${KERNEL} k.deb
          sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho 2k.bin 4k.bin k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi debian-base.zip /u/
 +        echo 'Reminder: Publish __all__ kernel packages'
  }
  
  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 curl
 +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
  
  build_linux
  build_m1n1
  build_uboot
 -
 -exit
 -
  build_rootfs
  #build_di_stick
  build_dd
@@@ -224,3 -225,5 +223,3 @@@ build_ef
  build_asahi_installer_image
  build_live_stick
  publish_artefacts
 -
 -echo 'Reminder: On the next release publish __all__ kernel packages'