Skip to content

Commit

Permalink
fix: Patch rpmbuild to have a changelog for RPM style checks to pas…
Browse files Browse the repository at this point in the history
…s, use Loophole kernel fork

Signed-off-by: Felicitas Pojtinger <[email protected]>
  • Loading branch information
pojntfx committed Oct 19, 2024
1 parent c65ffee commit 2ef0386
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SHELL := /bin/bash
REPO := https://github.com/virt-pvm/linux.git
REPO := https://github.com/loopholelabs/linux-pvm.git
BASEURL := https://loopholelabs.github.io/linux-pvm-ci/

obj = fedora/baremetal fedora/hetzner fedora/digitalocean fedora/aws fedora/gcp fedora/ovh fedora/linode \
Expand All @@ -10,7 +10,7 @@ all: $(addprefix build/,$(obj))
clone:
rm -rf work/base/linux
mkdir -p work/base/linux
git clone --depth 1 --single-branch --branch pvm ${REPO} work/base/linux
git clone --depth 1 --single-branch --branch pvm-v6.7 ${REPO} work/base/linux

copy: $(addprefix copy/,$(obj))
$(addprefix copy/,$(obj)):
Expand All @@ -25,7 +25,8 @@ $(addprefix patch/pre/,$(obj)):
cd work/$(subst patch/pre/,,$@)/linux && \
git apply ../../../../patches/add-typedefs.patch && \
git apply ../../../../patches/fix-installkernel.patch && \
git apply ../../../../patches/use-fixed-pvm-range.patch
git apply ../../../../patches/use-fixed-pvm-range.patch && \
git apply ../../../../patches/fix-rpmbuild.patch

patch/fedora/baremetal: patch/pre/fedora/baremetal
patch/fedora/hetzner: patch/pre/fedora/hetzner
Expand Down
29 changes: 29 additions & 0 deletions patches/fix-rpmbuild.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From: Rafael Aquini <[email protected]>
Subject: https://patchwork.kernel.org/project/linux-kbuild/list/?series=860927
---
diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec
index e095eb1e290e..19e458341f45 100644
--- a/scripts/package/kernel.spec
+++ b/scripts/package/kernel.spec
@@ -27,7 +27,7 @@ The Linux Kernel, the operating system core itself
%package headers
Summary: Header files for the Linux kernel for use by glibc
Group: Development/System
-Obsoletes: kernel-headers
+Obsoletes: kernel-headers < %{version}
Provides: kernel-headers = %{version}
%description headers
Kernel-headers includes the C header files that specify the interface
diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec
index 19e458341f45..126b23c1f6c2 100644
--- a/scripts/package/kernel.spec
+++ b/scripts/package/kernel.spec
@@ -132,3 +132,8 @@ fi
/usr/src/kernels/%{KERNELRELEASE}
/lib/modules/%{KERNELRELEASE}/build
%endif
+
+%changelog
+* %(echo "$(LC_ALL=C; date +'%a %b %d %Y') $(git config --get user.name) \
+<$(git config --get user.email)>") - %{version}-%{release}
+- Custom built Linux kernel.

0 comments on commit 2ef0386

Please sign in to comment.