diff --git a/SOURCES/ignore-printk_index.patch b/SOURCES/ignore-printk_index.patch deleted file mode 100644 index 394262b..0000000 --- a/SOURCES/ignore-printk_index.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 400ded23da6d998982c0ffa384e0f2a790d78069 Mon Sep 17 00:00:00 2001 -From: Song Liu -Date: Fri, 30 Apr 2021 17:16:46 -0700 -Subject: [PATCH] create-diff-object: ignore section .printk_index - -Signed-off-by: Song Liu ---- - kpatch-build/create-diff-object.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kpatch-build/create-diff-object.c b/kpatch-build/create-diff-object.c -index 82e486f..502922c 100644 ---- a/kpatch-build/create-diff-object.c -+++ b/kpatch-build/create-diff-object.c -@@ -2591,7 +2591,8 @@ static void kpatch_mark_ignored_sections(struct kpatch_elf *kelf) - /* Ignore any discarded sections */ - list_for_each_entry(sec, &kelf->sections, list) { - if (!strncmp(sec->name, ".discard", 8) || -- !strncmp(sec->name, ".rela.discard", 13)) -+ !strncmp(sec->name, ".rela.discard", 13) || -+ !strncmp(sec->name, ".printk_index", 13)) - sec->ignore = 1; - } - --- -2.30.2 - diff --git a/SOURCES/ignore-section-pi.patch b/SOURCES/ignore-section-pi.patch deleted file mode 100644 index 309361d..0000000 --- a/SOURCES/ignore-section-pi.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3285953f7633113d399d9ccd93a134670f02d8d4 Mon Sep 17 00:00:00 2001 -From: Song Liu -Date: Wed, 26 May 2021 10:27:35 -0700 -Subject: [PATCH] create-diff-object: ignore section _pi.* - -Signed-off-by: Song Liu ---- - kpatch-build/create-diff-object.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kpatch-build/create-diff-object.c b/kpatch-build/create-diff-object.c -index 2222fea..d403800 100644 ---- a/kpatch-build/create-diff-object.c -+++ b/kpatch-build/create-diff-object.c -@@ -2592,7 +2592,8 @@ static void kpatch_mark_ignored_sections(struct kpatch_elf *kelf) - list_for_each_entry(sec, &kelf->sections, list) { - if (!strncmp(sec->name, ".discard", 8) || - !strncmp(sec->name, ".rela.discard", 13) || -- !strncmp(sec->name, ".printk_index", 13)) -+ !strncmp(sec->name, ".printk_index", 13) || -+ !strncmp(sec->name, "_pi.", 4)) - sec->ignore = 1; - } - --- -2.30.2 - diff --git a/SPECS/kpatch.spec b/SPECS/kpatch.spec index 162e8a7..d730643 100644 --- a/SPECS/kpatch.spec +++ b/SPECS/kpatch.spec @@ -2,7 +2,7 @@ Name: kpatch Version: 0.9.3 -Release: 1.3%{?dist} +Release: 1.4%{?dist} Summary: Dynamic kernel patch manager Group: System Environment/Kernel @@ -15,10 +15,6 @@ Source1: kpatch-dnf-v%{kpatch_dnf_ver}.tar.gz Patch0: 0001-contrib-disable-upstart-kpatch.conf-install.patch Patch1: 0002-kpatch-clarify-unload-unsupport.patch -# Hyperscale only -Patch50: ignore-printk_index.patch -Patch51: ignore-section-pi.patch - # Upstream backports Patch100: https://github.com/dynup/kpatch/pull/1183.patch @@ -65,8 +61,6 @@ kpatch-build is a tool to build patches for kpatch. %setup -q %patch0 -p1 %patch1 -p1 -%patch50 -p1 -%patch51 -p1 %patch100 -p1 %setup -D -T -a 1 @@ -108,6 +102,9 @@ echo -e "\t$ dnf kpatch auto" %{_mandir}/man1/kpatch-build.1* %changelog +* Fri Jun 4 2021 Davide Cavalca - 0.9.3-1.4 +- Drop patches to ignore.printk_index and _pi.* sections + * Wed May 26 2021 Davide Cavalca - 0.9.3-1.3 - Add patch to ignore _pi.* sections