From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Wed, 9 Mar 2022 20:01:36 +0000 (+0100)
Subject: manual merge
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/6351c6f9de8ed8056ecfb6c9a8e3f63ecdcf9a43?hp=-c

manual merge
---

6351c6f9de8ed8056ecfb6c9a8e3f63ecdcf9a43
diff --combined bootstrap.sh
index ea1e9bb,7a2d88a..26edbe3
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@@ -28,7 -28,8 +28,8 @@@ build_linux(
          git fetch
          git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
          curl -s https://tg.st/u/0001-4k-iommu-patch.patch | git am -
 -        curl -s https://tg.st/u/config-2022-03-09-4k > .config
 +        curl -s https://tg.st/u/config-debian-distro-kernel-2022-03-09-4k > .config
+         git pull --commit https://github.com/povik/linux asahi-sound-wip
          make olddefconfig
          make -j `nproc` V=0 bindeb-pkg > /dev/null
  )
@@@ -192,7 -193,7 +193,7 @@@ publish_artefacts(
  mkdir -p build
  cd build
  
 -sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross 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
 +sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev-arm64-cross 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