diff --git a/.gitignore b/.gitignore index bc1314f..d6f3533 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /kmod-20.tar.xz /kmod-21.tar.xz /kmod-22.tar.xz +/kmod-23.tar.xz diff --git a/depmod-powerpc-fix-TOC.patch b/depmod-powerpc-fix-TOC.patch deleted file mode 100644 index b4deec8..0000000 --- a/depmod-powerpc-fix-TOC.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tools/depmod.c b/tools/depmod.c -index 6e9bb4d..a2e07c1 100644 ---- a/tools/depmod.c -+++ b/tools/depmod.c -@@ -2153,6 +2153,8 @@ static void depmod_add_fake_syms(struct depmod *depmod) - depmod_symbol_add(depmod, "__this_module", true, 0, NULL); - /* On S390, this is faked up too */ - depmod_symbol_add(depmod, "_GLOBAL_OFFSET_TABLE_", true, 0, NULL); -+ /* On PowerPC64 ABIv2, .TOC. is more or less _GLOBAL_OFFSET_TABLE_ */ -+ depmod_symbol_add(depmod, "TOC.", true, 0, NULL); - } - - static int depmod_load_symvers(struct depmod *depmod, const char *filename) diff --git a/kmod.spec b/kmod.spec index 7ce5586..cd735cd 100644 --- a/kmod.spec +++ b/kmod.spec @@ -1,6 +1,6 @@ Name: kmod -Version: 22 -Release: 4%{?dist} +Version: 23 +Release: 1%{?dist} Summary: Linux kernel module management utilities Group: System Environment/Kernel @@ -9,7 +9,6 @@ URL: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary Source0: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%{name}-%{version}.tar.xz Source1: weak-modules # http://patchwork.ozlabs.org/patch/581441/ -Patch1: depmod-powerpc-fix-TOC.patch Exclusiveos: Linux BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -50,7 +49,6 @@ applications that wish to load or unload Linux kernel modules. %prep %setup -q -%patch1 -p1 -b .ppcToC %build export V=1 @@ -114,6 +112,9 @@ install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/weak-modules %{_libdir}/libkmod.so %changelog +* Fri Jul 22 2016 Josh Boyer - 23-1 +- Update to version 23 + * Thu Feb 25 2016 Peter Robinson 22-4 - Add powerpc patch to fix ToC on 4.5 ppc64le kernel diff --git a/sources b/sources index 06e6b66..427b806 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4371b847f3fbfaa4e9aa890ad616748f kmod-22.tar.xz +3cf469f40ec2ed51f56ba45ea03793e7 kmod-23.tar.xz