Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Benes <mbenes@suse.cz>2017-12-04 15:25:24 +0100
committerMiroslav Benes <mbenes@suse.cz>2017-12-04 15:27:14 +0100
commit11e32205fda3d642aa655bc47583aa72b15b9946 (patch)
treed95c8335602656a34f35af5ce112f7a53f972654
parent95ed856ea8f99b4e48d7d324278b3628d2ac2fa2 (diff)
Revert "Add compat.h to deal with changes of KGR_PATCH macro"
This reverts commit 4186bef35862029a2fd36ba4a73d5fa538992709. All currently supported kernels (that is, everything since SLE12_Update_14 and SLE12-SP1_Update_5) have sympos support. We can drop compat, because we don't need it anymore. Signed-off-by: Miroslav Benes <mbenes@suse.cz>
-rw-r--r--compat.h21
-rw-r--r--kgr_patch_main.c2
-rw-r--r--rpm/kgraft-patch.spec6
-rwxr-xr-xscripts/register-patches.sh4
-rwxr-xr-xscripts/tar-up.sh1
5 files changed, 4 insertions, 30 deletions
diff --git a/compat.h b/compat.h
deleted file mode 100644
index 22bb082..0000000
--- a/compat.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _KGR_PATCH_COMPAT
-#define _KGR_PATCH_COMPAT
-
-#ifndef KGR_PATCH_OBJ
- #define __KGR_PATCH(_name, _new_function, abort) { \
- .name = #_name, \
- .new_fun = _new_function, \
- .abort_if_missing = abort, \
- }
-
- #undef KGR_PATCH
-
- #define KGR_PATCH(_name, _new_function) \
- __KGR_PATCH(_name, _new_function, true)
- #define KGR_PATCH_OBJ(_name, _new_function, _objname) \
- __KGR_PATCH(_name, _new_function, !_objname)
- #define KGR_PATCH_OBJPOS(_name, _new_function, _objname, _sympos) \
- __KGR_PATCH(_name, _new_function, !_objname)
-#endif
-
-#endif
diff --git a/kgr_patch_main.c b/kgr_patch_main.c
index 4505834..c6aa8e0 100644
--- a/kgr_patch_main.c
+++ b/kgr_patch_main.c
@@ -22,8 +22,6 @@
#include <linux/module.h>
#include <linux/types.h>
-#include "compat.h"
-
#include "uname_patch/kgr_patch_uname.h"
@@KGR_PATCHES_INCLUDES@@
diff --git a/rpm/kgraft-patch.spec b/rpm/kgraft-patch.spec
index 95af48c..868192a 100644
--- a/rpm/kgraft-patch.spec
+++ b/rpm/kgraft-patch.spec
@@ -29,9 +29,8 @@ Source1: Makefile
Source2: kgr_patch_main.c
Source3: config.sh
Source4: source-timestamp
-Source5: compat.h
-Source6: shadow.c
-Source7: shadow.h
+Source5: shadow.c
+Source6: shadow.h
@@KGR_PATCHES_SOURCES@@
BuildRequires: kernel-syms kgraft-devel
ExclusiveArch: @@EXCARCH@@
@@ -47,7 +46,6 @@ This is a live patch for SUSE Linux Enterprise Server kernel.
@@KGR_PATCHES_SETUP_SOURCES@@
cp %_sourcedir/kgr_patch_main.c .
cp %_sourcedir/Makefile .
-cp %_sourcedir/compat.h .
cp %_sourcedir/shadow.c .
cp %_sourcedir/shadow.h .
diff --git a/scripts/register-patches.sh b/scripts/register-patches.sh
index 88cbb93..a3622f8 100755
--- a/scripts/register-patches.sh
+++ b/scripts/register-patches.sh
@@ -125,8 +125,8 @@ EOF
# Finish kgraft-patch.spec:
## Enumerate the per subpatch source *.tar.bz2.
-## Note: Start with Source6
-S=8
+## Note: Start with Source7
+S=7
## First check that none of the to be occupied Source<n> slots has
## been used already.
for i in "${!kgr_patches[@]}"; do
diff --git a/scripts/tar-up.sh b/scripts/tar-up.sh
index a2aa613..cb58c80 100755
--- a/scripts/tar-up.sh
+++ b/scripts/tar-up.sh
@@ -76,7 +76,6 @@ install -m 644 kgr_patch_main.c $build_dir
install -m 644 rpm/kgraft-patch.spec $build_dir/kgraft-patch-"$RELEASE".spec
scripts/register-patches.sh $build_dir/kgr_patch_main.c $build_dir/kgraft-patch-"$RELEASE".spec
install -m 644 rpm/config.sh $build_dir/config.sh
-install -m 644 compat.h $build_dir
install -m 644 shadow.c $build_dir
install -m 644 shadow.h $build_dir