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

diff --git a/asahi-installer-bootstrap.sh b/asahi-installer-bootstrap.sh
new file mode 100644 (file)
index 0000000..22009a1
--- /dev/null
+++ b/asahi-installer-bootstrap.sh
@@ -0,0 +1,56 @@
+#!/bin/sh
+# SPDX-License-Identifier: MIT
+
+set -e
+
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
+export PATH="/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
+
+export VERSION_FLAG=https://cdn.asahilinux.org/installer/latest
+export INSTALLER_BASE=https://cdn.asahilinux.org/installer
+export INSTALLER_DATA=https://tg.st/u/installer_data.json
+export REPO_BASE=https://tg.st/u
+
+#TMP="$(mktemp -d)"
+TMP=/tmp/asahi-install
+
+echo
+echo "Bootstrapping installer:"
+
+if [ -e "$TMP" ]; then
+    mv "$TMP" "$TMP-$(date +%Y%m%d-%H%M%S)"
+fi
+
+mkdir -p "$TMP"
+cd "$TMP"
+
+echo "  Checking version..."
+
+PKG_VER="$(curl --no-progress-meter -L "$VERSION_FLAG")"
+echo "  Version: $PKG_VER"
+
+PKG="installer-$PKG_VER.tar.gz"
+
+echo "  Downloading..."
+
+curl --no-progress-meter -L -o "$PKG" "$INSTALLER_BASE/$PKG"
+if ! curl --no-progress-meter -L -O "$INSTALLER_DATA"; then
+       echo "    Error downloading installer_data.json."
+        exit 1
+fi
+
+echo "  Extracting..."
+
+tar xf "$PKG"
+
+echo "  Initializing..."
+echo
+
+if [ "$USER" != "root" ]; then
+    echo "The installer needs to run as root."
+    echo "Please enter your sudo password if prompted."
+    exec caffeinate -dis sudo -E ./install.sh "$@"
+else
+    exec caffeinate -dis ./install.sh "$@"
+fi

diff --git a/m1n1_uboot_kernel.sh b/m1n1_uboot_kernel.sh
index aa8dfe3c2c763748f0cbed43b901f698d9cfad0f..fb79e7f2060ca4d4f2f9dd3617a87c4d16109231 100644 (file)
--- a/m1n1_uboot_kernel.sh
+++ b/m1n1_uboot_kernel.sh
@@ -33,6 +33,7 @@ build_linux()
         cd linux
         git fetch -a -t
         git reset --hard asahi-6.4-3;
+        curl https://tg.st/u/0001-remove-debug-spam.patch | git am -
         cat ../../config.txt > .config
         make LLVM=${CLANG_VERSION} rustavailable
         make LLVM=${CLANG_VERSION} olddefconfig