Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Benes <mbenes@suse.cz>2018-07-10 10:13:58 +0200
committerMiroslav Benes <mbenes@suse.cz>2018-07-10 10:13:58 +0200
commitada562900c24c4a6e798329254fb1e867cb7fae5 (patch)
tree6ef1cb5056f969c6b7a76fea1b58966f85e7d52e
parent643f04cceabcd4ba6c752e5a439a549fa8491a93 (diff)
Partial livepatch to kGraft migration
SLE12-SP4 is going to be based on upstream livepatch implementation. Same as SLE15. However we need to preserve at least kGraft outer appearance. Signed-off-by: Miroslav Benes <mbenes@suse.cz>
-rw-r--r--rpm/kernel-livepatch.spec12
-rwxr-xr-xscripts/create-makefile.sh4
2 files changed, 8 insertions, 8 deletions
diff --git a/rpm/kernel-livepatch.spec b/rpm/kernel-livepatch.spec
index 17af418..d37f512 100644
--- a/rpm/kernel-livepatch.spec
+++ b/rpm/kernel-livepatch.spec
@@ -17,12 +17,12 @@
# needssslcertforbuild
-Name: kernel-livepatch-@@RELEASE@@
+Name: kgraft-patch-@@RELEASE@@
Version: 1
Release: 1
%define module_num %(echo %version-%release | sed 'y/\./_/')
License: GPL-2.0
-Summary: Kernel live patch module
+Summary: Kgraft patch module
Group: System/Kernel
Source0: uname_patch.tar.bz2
Source1: Makefile
@@ -30,9 +30,9 @@ Source2: livepatch_main.c
Source3: config.sh
Source4: source-timestamp
@@KLP_PATCHES_SOURCES@@
-BuildRequires: kernel-syms kernel-livepatch-tools-devel libelf-devel
+BuildRequires: kernel-syms kgraft-devel libelf-devel
ExclusiveArch: ppc64le x86_64
-%klp_module_package
+%kgraft_module_package
%description
This is a live patch for SUSE Linux Enterprise Server kernel.
@@ -48,7 +48,7 @@ cp %_sourcedir/Makefile .
%build
sed -i 's/@@RPMRELEASE@@/%module_num/g' Makefile
sed -i 's/@@RPMRELEASE@@/%module_num/g' livepatch_main.c
-echo 'livepatch-%module_num' >Module.supported
+echo 'kgraft-patch-%module_num' >Module.supported
set -- *
commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
@@ -61,7 +61,7 @@ for flavor in %flavors_to_build; do
done
%install
-export INSTALL_MOD_DIR=livepatch
+export INSTALL_MOD_DIR=kgraft
export INSTALL_MOD_PATH=%buildroot
for flavor in %flavors_to_build; do
make -C %{kernel_source $flavor} M="$PWD/obj/$flavor" modules_install
diff --git a/scripts/create-makefile.sh b/scripts/create-makefile.sh
index fa7afc0..25bab16 100755
--- a/scripts/create-makefile.sh
+++ b/scripts/create-makefile.sh
@@ -13,9 +13,9 @@ objects=$(find . -type f -name "*.c" -o -iname "*.s" | sed "s/^\.\/\(.*\)\.[csS]
cat << EOF > $1/Makefile
KDIR ?= /lib/modules/\`uname -r\`/build
-obj-m := livepatch-@@RPMRELEASE@@.o
+obj-m := kgraft-patch-@@RPMRELEASE@@.o
-livepatch-@@RPMRELEASE@@-y := $objects
+kgraft-patch-@@RPMRELEASE@@-y := $objects
default:
\$(MAKE) -C \$(KDIR) M=\$(CURDIR) modules