From df3aeefb018b6a437dc893d80918c23480c2c2ae Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 05 2015 13:06:42 +0000 Subject: import kpatch-0.1.10-4.el7 --- diff --git a/SOURCES/0001-fix-dracut-dependencies.patch b/SOURCES/0001-fix-dracut-dependencies.patch new file mode 100644 index 0000000..c718870 --- /dev/null +++ b/SOURCES/0001-fix-dracut-dependencies.patch @@ -0,0 +1,35 @@ +From 6cdb5011c59ff19c684428318a028bc0a6bf5ac4 Mon Sep 17 00:00:00 2001 +Message-Id: <6cdb5011c59ff19c684428318a028bc0a6bf5ac4.1417711268.git.jpoimboe@redhat.com> +From: Josh Poimboeuf +Date: Wed, 3 Dec 2014 16:04:04 -0600 +Subject: [PATCH] fix dracut dependencies + +The "kpatch install" command is broken because the kpatch script has +some missing dependencies in the initramfs. Make sure the new +dependencies (readelf and awk) are added to the initramfs. +--- + contrib/module-setup.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/contrib/module-setup.sh b/contrib/module-setup.sh +index 71ec41a..0259b79 100755 +--- a/contrib/module-setup.sh ++++ b/contrib/module-setup.sh +@@ -19,11 +19,11 @@ install() { + # install kpatch script + inst_any -d /usr/sbin/kpatch /usr/local/sbin/kpatch /usr/sbin/kpatch + +- # install insmod (needed by kpatch script) ++ # install kpatch script dependencies + inst_symlink /usr/sbin/insmod +- +- # install dirname (needed by kpatch script) + inst /usr/bin/dirname ++ inst /usr/bin/readelf ++ inst /usr/bin/awk + + # install core module + inst_any -d /usr/lib/modules/$kernel/extra/kpatch/kpatch.ko /usr/local/lib/modules/$kernel/extra/kpatch/kpatch.ko /usr/lib/modules/$kernel/extra/kpatch/kpatch.ko /usr/lib/kpatch/$kernel/kpatch.ko /usr/local/lib/kpatch/$kernel/kpatch.ko +-- +1.9.3 + diff --git a/SPECS/kpatch.spec b/SPECS/kpatch.spec index 0b9c93a..01dd32b 100644 --- a/SPECS/kpatch.spec +++ b/SPECS/kpatch.spec @@ -1,6 +1,6 @@ Name: kpatch Version: 0.1.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Dynamic kernel patch manager Group: System Environment/Kernel @@ -10,6 +10,7 @@ Source0: https://github.com/dynup/kpatch/archive/v%{version}.tar.gz Patch0: 0002-Support-modprobe-style-names-in-kpatch-load.patch Patch1: 0003-Support-modprobe-format-names-in-uninstall.patch Patch2: 0003-re-enable-patch-modules-with-checksum-matching.patch +Patch3: 0001-fix-dracut-dependencies.patch #BuildRequires: Requires: bash kmod dracut binutils @@ -28,6 +29,7 @@ patch the kernel without rebooting. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build @@ -49,11 +51,14 @@ rm -f %{buildroot}/usr/share/man/man1/kpatch-build.1.gz %changelog +* Tue Sep 16 2014 Seth Jennings 0.1.10-4 +- fix dracut dependencies (rhbz#1170369) + * Tue Sep 16 2014 Seth Jennings 0.1.10-3 -- support re-enabling forced modules +- support re-enabling forced modules (rhbz#1140268) * Thu Sep 11 2014 Seth Jennings 0.1.10-2 -- support modprobe format names +- support modprobe format names (rhbz#1133045) * Thu Jul 31 2014 Josh Poimboeuf 0.1.10-1 - update to kpatch 0.1.10