add build-tools path

build.sh

@@ -26,12 +26,22 @@ set_vars() {
   # We expect that we're going to be running out of [PROJECT]/meta, so we hop up one directory.
   BASEDIR=$(realpath "$(dirname -- "$(realpath -- "${BASH_SOURCE[0]}")")/..")
 
+  # Add build-tools to PATH
+  PATH="${BASEDIR}/prebuilts/build-tools/linux-x86/bin:${PATH}"
+
   # Build toolchain locations
+  CLANGDIR="${BASEDIR}/prebuilts/clang/host/linux-x86/clang-r547379"
   GCCDIR="${BASEDIR}/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9"
   GCCDIR32="${BASEDIR}/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9"
-  CLANGDIR="${BASEDIR}/prebuilts/clang/host/linux-x86/clang-r547379"
   KERNELBUILDTOOLS="${BASEDIR}/prebuilts/kernel-build-tools/linux-x86"
 
+  # Array for all of the custom paths introduced by prebuilts
+  PREBUILTS_PATH=(
+    "${CLANGDIR}/bin"
+    "${GCCDIR}/bin"
+    "${KERNELBUILDTOOLS}/bin"
+  )
+
   # Common options used for `make`, particularly for cross-compile
   MAKEOPTS=(
     O="${BASEDIR}/work"
@@ -44,6 +54,7 @@ set_vars() {
     CLANG_TRIPLE=aarch64-linux-gnu-
   )
 
+
   # Environment tools that are already somewhere in the project so we'll use them instead of adding extra dependencies
   BUSYBOX="${BASEDIR}/prebuilts/magisk/lib/x86_64/libbusybox.so"
   MAGISKBOOT="${BASEDIR}/prebuilts/magisk/lib/x86_64/libmagiskboot.so"
@@ -53,8 +64,7 @@ set_vars() {
 check_tools() {
   # Ensure that we have everything we need to work before we get started.
   TOOLS_NEEDED=()
-  [ ! -x "$(command -v make)" ] && TOOLS_NEEDED+=(make)
+  [ ! -x "$(command -v curl)" ] && TOOLS_NEEDED+=(curl)
-  [ ! -x "$(command -v patch)" ] && TOOLS_NEEDED+=(patch)
   [ ! -x "$(command -v zip)" ] && TOOLS_NEEDED+=(zip)
   if [ "${#TOOLS_NEEDED[@]}" -gt 0 ]; then
     echo "You are missing: ${TOOLS_NEEDED[@]}"
@@ -102,7 +112,8 @@ add_susfs() {
 
   cp "${BASEDIR}/external/susfs4ksu/kernel_patches/fs/"* "fs/" || { echo "Failed to copy fs patches"; exit 1; }
   cp "${BASEDIR}/external/susfs4ksu/kernel_patches/include/linux/"* "include/linux/" || { echo "Failed to copy linux patches"; exit 1; }
-  patch --fuzz=3 -p1 < "${BASEDIR}/external/susfs4ksu/kernel_patches/50_add_susfs_in_gki-android15-6.6.patch" || { echo "Failed to patch kernel source for susfs"; exit 1; }
+  # Patch modified so that it works within a constrained environment
+  patch -p1 < "${BASEDIR}/meta/50_add_susfs_in_gki-android15-6.6.patch" || { echo "Failed to patch kernel source for susfs"; exit 1; }
 
   popd > /dev/null
 }
@@ -284,7 +295,7 @@ download_lineageos_boot() {
 
   echo "Fetching latest LineageOS build information for dodge..."
 
-  BOOT_URL=$(${BUSYBOX} curl -s "https://download.lineageos.org/api/v2/devices/dodge/builds" | ${PYTHON} -c 'import sys,json;d=json.load(sys.stdin);boot=[f for f in d[0]["files"] if f["filename"]=="boot.img"][0];print(boot["url"])' 2>/dev/null)
+  BOOT_URL=$(${BUSYBOX} wget -qO- "https://download.lineageos.org/api/v2/devices/dodge/builds" | ${PYTHON} -c 'import sys,json;d=json.load(sys.stdin);boot=[f for f in d[0]["files"] if f["filename"]=="boot.img"][0];print(boot["url"])' 2>/dev/null)
 
   if [ -z "$BOOT_URL" ]; then
     echo "Error: Failed to fetch boot.img URL from LineageOS API"

default.xml

@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
 
+  <!-- Repository definitions -->
   <remote name="github" fetch="https://github.com"               review="review.lineageos.org" />
   <remote name="gitlab" fetch="https://gitlab.com" />
-  <remote name="i5" fetch="https://git.i5.wtf" />
+  <!-- TEMP --> <remote name="i5" fetch="https://git.i5.wtf" />
   <remote name="aosp"   fetch="https://android.googlesource.com" review="android-review.googlesource.com" revision="refs/tags/android-16.0.0_r1" />
   <default revision="refs/heads/lineage-23.0" remote="github" sync-c="true" sync-j="4" />
 
-  <project path="meta"                                                      name="kitty/los-kernel-dodge-sukisu-susfs"                                       remote="i5" revision="master" >
+  <!-- This repository -->
+  <!-- MOVE TO GITHUB BEFORE RELEASE --> <project path="meta" name="kitty/los-kernel-dodge-sukisu-susfs" remote="i5" revision="master" >
     <linkfile src="build.sh" dest="build.sh" />
   </project>
-  <project path="prebuilts/clang/host/linux-x86/clang-r547379"              name="KiTTYsh/clang-r547379"                                                       clone-depth="1" revision="main" />
+
-  <project path="prebuilts/kernel-build-tools"                              name="kernel/prebuilts/build-tools"                                                clone-depth="1" remote="aosp" revision="main-kernel-build-2024" />
+  <!-- Build tools -->
+  <project path="prebuilts/build-tools/linux-x86" name="KiTTYsh/android_prebuilts_build-tools_linux-x86" clone-depth="1" revision="main" />
+  <project path="prebuilts/clang/host/linux-x86/clang-r547379" name="KiTTYsh/android_prebuilts_clang_host_linux-x86_clang-r547379" clone-depth="1" revision="main" />
   <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="LineageOS/android_prebuilts_gcc_linux-x86_aarch64_aarch64-linux-android-4.9" clone-depth="1" revision="lineage-19.1" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="LineageOS/android_prebuilts_gcc_linux-x86_arm_arm-linux-androideabi-4.9" clone-depth="1" revision="lineage-19.1" />
+  <project path="prebuilts/kernel-build-tools" name="kernel/prebuilts/build-tools" clone-depth="1" remote="aosp" revision="main-kernel-build-2024" />
+  <project path="prebuilts/magisk" name="KiTTYsh/magisk-unpacked" clone-depth="1" revision="main" />
+  <project path="external/AnyKernel3" name="osm0sis/AnyKernel3" clone-depth="1" revision="master" />
+
+  <!-- Kernel sources -->
   <project path="kernel/oneplus/sm8750" name="LineageOS/android_kernel_oneplus_sm8750" clone-depth="1" />
   <project path="kernel/oneplus/sm8750-modules" name="LineageOS/android_kernel_oneplus_sm8750-modules" clone-depth="1" >
     <linkfile src="oplus/kernel/touchpanel/kernelFwUpdate" dest="kernel/oneplus/sm8750/drivers/base" />
@@ -22,8 +31,8 @@
     <linkfile src="." dest="kernel/oneplus/sm8750/arch/arm64/boot/dts/vendor" />
     <linkfile src="bindings" dest="kernel/oneplus/sm8750/Documentation/devicetree/bindings" />
   </project>
-  <project path="external/AnyKernel3"                                       name="osm0sis/AnyKernel3"                                                          clone-depth="1" revision="master" />
+
-  <project path="prebuilts/magisk"                                          name="KiTTYsh/magisk-unpacked"                                                     clone-depth="1" revision="main" />
+  <!-- Kernel modifications -->
-  <project path="external/SukiSU-Ultra"                                     name="SukiSU-Ultra/SukiSU-Ultra"                                                   clone-depth="1" revision="susfs-main" />
+  <project path="external/SukiSU-Ultra" name="SukiSU-Ultra/SukiSU-Ultra" revision="c61d6fb6654dc12fa87c60c6f1eb57a4392995c2" /> <!-- v4.0.0 susfs-main -->
-  <project path="external/susfs4ksu"                                        name="simonpunk/susfs4ksu"                                                         clone-depth="1" remote="gitlab" revision="gki-android15-6.6" />
+  <project path="external/susfs4ksu" name="simonpunk/susfs4ksu" clone-depth="1" remote="gitlab" revision="c49b1dab205bbc4ef20b120e84c5b7530355961d" /> <!-- v1.5.12 gki-android15-6.6 -->
 </manifest>