From e519dfdbf3a7c9f4baa2570e08058fa1d49efb14 Mon Sep 17 00:00:00 2001 From: sharpenedblade Date: Tue, 21 Nov 2023 14:02:11 -0800 Subject: [PATCH] Cleanup kernel build script --- kernel/kernel.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/kernel/kernel.sh b/kernel/kernel.sh index 6b3719f..39948b9 100755 --- a/kernel/kernel.sh +++ b/kernel/kernel.sh @@ -5,20 +5,21 @@ KERNEL_VERSION=6.5.11-300.fc39 cd "$package_builddir" koji download-build --quiet --arch=src "kernel-$KERNEL_VERSION" -rpmdev-extract -q -C "$package_builddir" "kernel-$KERNEL_VERSION.src.rpm" +rpmdev-extract -q "kernel-$KERNEL_VERSION.src.rpm" mv -n "kernel-$KERNEL_VERSION.src"/* . rm -r "kernel-$KERNEL_VERSION.src.rpm" "kernel-$KERNEL_VERSION.src" # Fedora devs are against merging kernel-local for all architectures when keys are not properly specified, so we have to patch it in. -sed -i "s@for i in %{all_arch_configs}@for i in *.config@g" "$package_builddir/kernel.spec" +sed -i "s@for i in %{all_arch_configs}@for i in *.config@g" "kernel.spec" # Set buildid to .t2 -sed -i 's/# define buildid .local/%define buildid .t2/g' "$package_builddir/kernel.spec" +sed -i 's/# define buildid .local/%define buildid .t2/g' "kernel.spec" # Disable debug kernels -sed -i "/%define with_debug /c %define with_debug 0" "$package_builddir/kernel.spec" +sed -i "/%define with_debug /c %define with_debug 0" "kernel.spec" -cat "$package_builddir/linux-t2-patches/extra_config" > "$package_builddir/kernel-local" -cat "$package_builddir/linux-t2-patches"/*.patch > "$package_builddir/linux-kernel-test.patch" +# Add our patches +sed -i "/Patch1:/a Patch2: t2linux-combined.patch" "kernel.spec" -cd .. +cat "linux-t2-patches/extra_config" > "kernel-local" +cat "linux-t2-patches"/*.patch > "t2linux-combined.patch"