[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 4/7] ppc64el: kernel: patch: temporarily disable zImage



Debian ppc64el will wait for the 'powerpc/boot: 64bit little endian wrapper'
(zImage) patches upstream rather than shipping 32-bit tools for zImage.

Add a patch to avoid this build error:

	[...]
	  LD      vmlinux
	  SYSMAP  System.map
	[...]
	  WRAP    arch/powerpc/boot/zImage.pseries
	ld: unrecognised emulation mode: elf32ppc
	Supported emulations: elf64lppc elf32lppc elf32lppclinux elf32lppcsim
	make[6]: *** [arch/powerpc/boot/zImage.pseries] Error 1
	make[5]: *** [zImage] Error 2

Signed-off-by: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
---
 debian/patches/debian/ppc64el-disable-zImage.patch |   20 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 21 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/debian/ppc64el-disable-zImage.patch

diff --git a/debian/patches/debian/ppc64el-disable-zImage.patch b/debian/patches/debian/ppc64el-disable-zImage.patch
new file mode 100644
index 0000000..1fb9a1f
--- /dev/null
+++ b/debian/patches/debian/ppc64el-disable-zImage.patch
@@ -0,0 +1,20 @@
+Index: linux-3.14.2/arch/powerpc/boot/Makefile
+===================================================================
+--- linux-3.14.2.orig/arch/powerpc/boot/Makefile	2014-05-02 16:52:37.000000000 -0300
++++ linux-3.14.2/arch/powerpc/boot/Makefile	2014-05-07 09:39:11.000000000 -0300
+@@ -344,6 +344,15 @@
+ $(obj)/%.dtb: $(src)/dts/%.dts FORCE
+ 	$(call if_changed_dep,dtc)
+ 
++# Debian ppc64el will wait for the 'powerpc/boot: 64bit little endian wrapper'
++# (zImage) patches upstream rather than shipping 32-bit tools for zImage.
++# This makes the next conditional block to pick vmlinux.strip as image-y.
++ifdef CONFIG_PPC64
++ifdef CONFIG_CPU_LITTLE_ENDIAN
++image-y :=
++endif
++endif
++
+ # If there isn't a platform selected then just strip the vmlinux.
+ ifeq (,$(image-y))
+ image-y := vmlinux.strip
diff --git a/debian/patches/series b/debian/patches/series
index 22d532a..c313b85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@ debian/ia64-hardcode-arch-script-output.patch
 debian/mips-disable-werror.patch
 debian/arch-sh4-fix-uimage-build.patch
 debian/powerpcspe-omit-uimage.patch
+debian/ppc64el-disable-zImage.patch
 features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch
 
 # Fixes/improvements to firmware loading
-- 
1.7.1


Reply to: