Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-12-01 16:30:47 +0100
committerTakashi Iwai <tiwai@suse.de>2017-12-01 16:30:47 +0100
commitd786e981f7a718ddc750e00fbde13ac619add2f0 (patch)
treeb4759a0a1ab006bc3cbcc9fac8624900c65ed07b
parent5103b61679be9d7417c38c28e43441de835c70e4 (diff)
parentda9bb38a021902d34d9b1e4a25796e23ad133541 (diff)
Merge branch 'users/msuchanek/SLE12-SP3/for-next' into SLE12-SP3-fastpath
Pull ppc64le build fix from Michal Suchanek (bsc#1070805)
-rw-r--r--patches.rpmify/powerpc-Blacklist-GCC-5.4-6.1-and-6.2.patch (renamed from patches.arch/powerpc-Blacklist-GCC-5.4-6.1-and-6.2.patch)0
-rw-r--r--patches.rpmify/ppc64le-build-vmlinux.patch (renamed from patches.arch/ppc64le-build-vmlinux.patch)10
-rw-r--r--series.conf4
3 files changed, 7 insertions, 7 deletions
diff --git a/patches.arch/powerpc-Blacklist-GCC-5.4-6.1-and-6.2.patch b/patches.rpmify/powerpc-Blacklist-GCC-5.4-6.1-and-6.2.patch
index 21f634837a..21f634837a 100644
--- a/patches.arch/powerpc-Blacklist-GCC-5.4-6.1-and-6.2.patch
+++ b/patches.rpmify/powerpc-Blacklist-GCC-5.4-6.1-and-6.2.patch
diff --git a/patches.arch/ppc64le-build-vmlinux.patch b/patches.rpmify/ppc64le-build-vmlinux.patch
index 3524aba2ee..997def9a00 100644
--- a/patches.arch/ppc64le-build-vmlinux.patch
+++ b/patches.rpmify/ppc64le-build-vmlinux.patch
@@ -1,6 +1,8 @@
From: Dinar Valeev <dvaleev@suse.com>
Subject: PPC: Build only vmlinux target
-Patch-Mainline: no
+Patch-Mainline: no, tbd (ancient patch)
+
+References: bsc#1070805
The zImage target doesn't build on ppc64le and we only ever
care about the resulting vmlinux file anyway, so drop compilation
@@ -9,10 +11,8 @@ of the zImage target for us.
Signed-off-by: Dinar Valeev <dvaleev@suse.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
-Index: linux-3.13-rc2/arch/powerpc/Makefile
-===================================================================
---- linux-3.13-rc2.orig/arch/powerpc/Makefile
-+++ linux-3.13-rc2/arch/powerpc/Makefile
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
@@ -222,7 +222,7 @@ core-$(CONFIG_PERF_EVENTS) += arch/power
drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
diff --git a/series.conf b/series.conf
index b83c071248..ae8005cd8b 100644
--- a/series.conf
+++ b/series.conf
@@ -1403,13 +1403,13 @@
########################################################
# powerpc/little endian
########################################################
- patches.arch/ppc64le-build-vmlinux.patch
+ patches.rpmify/ppc64le-build-vmlinux.patch
patches.arch/ppc64le-ile-0001-powerpc-Add-global-exports-for-all-interrupt-vectors.patch
patches.arch/ppc64le-ile-0002-powerpc-Add-relocation-code-for-fixups.patch
patches.arch/ppc64le-ile-0003-powerpc-Add-hack-to-make-ppc64le-work-on-hosts-witho.patch
patches.arch/ppc64le-ile-0004-powerpc-Don-t-return-to-BE-mode-when-we-are-already-.patch
- patches.arch/powerpc-Blacklist-GCC-5.4-6.1-and-6.2.patch
+ patches.rpmify/powerpc-Blacklist-GCC-5.4-6.1-and-6.2.patch
# fate#320253