Skip to content

Commit

Permalink
fix(kernel-fyra): misc
Browse files Browse the repository at this point in the history
Signed-off-by: Paskal Sitepu <[email protected]>
  • Loading branch information
rmnscnce committed Sep 19, 2023
1 parent e6f15c4 commit 652a029
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions anda/others/kernel-fyra/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -28,7 +28,7 @@ pushd source
git config user.name 'Terra' ; git config user.email '[email protected]'

# Apply all patches
for patch in ../patches/${BRANCH}/*.patch
for patch in ../patches/${BRANCH}/patches/*.patch
do git am $patch
done

Expand Down
14 changes: 7 additions & 7 deletions anda/others/kernel-fyra/pre.rhai
Original file line number Diff line number Diff line change
@@ -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");

0 comments on commit 652a029

Please sign in to comment.