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

diff --git a/README.md b/README.md
index 064b0c44357bc7874256ebc4c5b98cdb95f262a0..0e82749c9bff7795ab80b2b57fdcc9a3724fd3a6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@ and Linux. In order to install Linux on a FileVault-enabled Mac run the
 installer from Recovery open Disk Utility > Expanding "Macintosh HD" >
 Selecting locked volume > click "Mount".
 
+# This installation is not suited to be mixed with other ASAHI or BSD installations until further investiation.
+
 # Artefacts
 If you don't want to use the prebuild artefacts, you can build them yourself using the [bootstrap.sh](https://git.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/blob_plain/refs/heads/master:/bootstrap.sh) script.
 

diff --git a/bootstrap.sh b/bootstrap.sh
index 4bf1b0b69f6e0ec6da3e1b52de287e0488b7b733..389ccd41b2517ca5632bb9113e2aac16139bdde4 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -33,7 +33,7 @@ build_linux()
         git fetch -a -t
         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
 )
@@ -210,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