diff --git a/anda/others/kernel-fyra/build.sh b/anda/others/kernel-fyra/build.sh index c3d7f552ef..3396b6b6bc 100644 --- a/anda/others/kernel-fyra/build.sh +++ b/anda/others/kernel-fyra/build.sh @@ -4,7 +4,7 @@ export KERNEL_ARK_REV='200' # Set the Fyra kernel overlay version -export FYRA_KERNELOVERLAY_VER='2' +export FYRA_KERNELOVERLAY_VER='3' # Fetch the patches git clone https://github.com/FyraLabs/linux-kernel-patches.git patches @@ -13,13 +13,13 @@ git clone https://github.com/FyraLabs/linux-kernel-patches.git patches pushd patches # Acquire the latest supported kernel-ark branch -export BRANCH="$(readlink current)" +export BRANCH="$(cat current/commit)" # Move out from the patches' directory popd # Fetch the source -git clone -b ${BRANCH} https://gitlab.com/cki-project/kernel-ark.git source +git clone -b ${COMMIT} https://gitlab.com/cki-project/kernel-ark.git source # Move into the source directory pushd source @@ -28,7 +28,7 @@ pushd source git config user.name 'Terra' ; git config user.email 'mail@example.com' # Apply all patches -for patch in ../patches/${BRANCH}/*.patch +for patch in ../patches/${BRANCH}/patches/*.patch do git am $patch done diff --git a/anda/others/kernel-fyra/pre.rhai b/anda/others/kernel-fyra/pre.rhai index bf899992af..7b17cae47f 100644 --- a/anda/others/kernel-fyra/pre.rhai +++ b/anda/others/kernel-fyra/pre.rhai @@ -1,18 +1,18 @@ print("kernel-fyra: running pre.rhai"); // Install the kernel dependencies first -print(" $ sudo dnf5 builddep kernel"); -sh("sudo dnf5 builddep kernel > OUT 2>&1"); -print(open_file("OUT").read_blob()); +print(" $ sudo dnf5 -y builddep kernel"); +sh("sudo dnf5 -y builddep kernel > OUT 2>&1"); +print(open_file("OUT").read()); // Install git for source and patchset retrieval -print(" $ sudo dnf5 install git"); -sh("sudo dnf5 install git > OUT 2>&1"); -print(open_file("OUT").read_blob()); +print(" $ sudo dnf5 -y install git"); +sh("sudo dnf5 -y install git > OUT 2>&1"); +print(open_file("OUT").read()); // Run the actual build script print(" $ ./build.sh"); sh("./build.sh > OUT 2>&1"); -print(open_file("OUT").read_blob()); +print(open_file("OUT").read()); print("kernel-fyra: finished running pre.rhai");