From 5e84179049dffa192332d48eefc722bde29f0811 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Feb 25 2016 10:12:29 +0000 Subject: Add powerpc patch to fix ToC on 4.5 ppc64le kernel --- diff --git a/depmod-powerpc-fix-TOC.patch b/depmod-powerpc-fix-TOC.patch new file mode 100644 index 0000000..b4deec8 --- /dev/null +++ b/depmod-powerpc-fix-TOC.patch @@ -0,0 +1,13 @@ +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 803bea4..02a137e 100644 --- a/kmod.spec +++ b/kmod.spec @@ -1,6 +1,6 @@ Name: kmod Version: 22 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Linux kernel module management utilities Group: System Environment/Kernel @@ -8,6 +8,8 @@ License: GPLv2+ 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) @@ -48,6 +50,7 @@ applications that wish to load or unload Linux kernel modules. %prep %setup -q +%patch1 -p1 -b .ppcToC %build export V=1 @@ -111,6 +114,9 @@ install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/weak-modules %{_libdir}/libkmod.so %changelog +* Thu Feb 24 2016 Peter Robinson 22-4 +- Add powerpc patch to fix ToC on 4.5 ppc64le kernel + * Thu Feb 04 2016 Fedora Release Engineering - 22-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild