From: Thomas Glanzmann 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?hp=f379dcd93c3e3e1cd97dadd26df59ff703e364be Merge branch 'master' of 88.198.237.222:/git/m1-debian --- diff --git a/README.md b/README.md index 064b0c4..0e82749 100644 --- 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 4bf1b0b..389ccd4 100755 --- 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