Bug#759389: linux: ppc64el: do NOT switch to vmlinu*z*
Hi Aurelien,
On 08/29/2014 06:49 PM, Aurelien Jarno wrote:
On Fri, Aug 29, 2014 at 10:15:47AM -0300, Mauricio Faria de Oliveira wrote:
>I have to ask you to please revert the vmlinu*z* patch.
>
>Some of the ppc64el target platforms can only boot vmlinu*x*
>(no support for compressed kernels).
>
>Really sorry for taking your time.
No problem, I have just reverted this.
Thanks for reverting it.
(If it's not too much too ask, now that the revert-panic [for me] ended)
We can drop the patch 'ppc64el-disable-zImage.patch' now that the zImage
targets (i.e., zImage.pseries) don't cause build errors anymore.
The attached debdiff does that.
It was actually part of the previous patch.. so I probably should have
asked you to just revert the 'defines' changes previously.. apologies;
but I couldn't let go another thing like this w/out re-testing it. :/
I have successfully built linux-3.16-1~exp1 with it, and booted on that
platform I mentioned (just to /triple/-check the vmlinux file had no
sign of vmlinuz compression whatsoever.. even knowing this is dumb :).
Thanks again.
Embarrassingly funny,
--
Mauricio Faria de Oliveira
IBM Linux Technology Center
diff -Nru linux-3.16/debian/changelog linux-3.16/debian/changelog
--- linux-3.16/debian/changelog 2014-08-09 20:58:13.000000000 +0000
+++ linux-3.16/debian/changelog 2014-09-02 12:00:33.000000000 +0000
@@ -1,3 +1,11 @@
+linux (3.16-1~exp1ppc64el1) UNRELEASED; urgency=medium
+
+ * [ppc64el] debian/patches/debian/ppc64el-disable-zImage.patch: remove patch.
+ The 'powerpc/boot: 64bit little endian wrapper' patch-set is in linux 3.16,
+ thus the default make/image-y target is OK now.
+
+ -- Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com> Thu, 21 Aug 2014 15:25:35 -0300
+
linux (3.16-1~exp1) experimental; urgency=medium
* New upstream release: http://kernelnewbies.org/Linux_3.16
diff -Nru linux-3.16/debian/patches/debian/ppc64el-disable-zImage.patch linux-3.16/debian/patches/debian/ppc64el-disable-zImage.patch
--- linux-3.16/debian/patches/debian/ppc64el-disable-zImage.patch 2014-06-16 12:08:34.000000000 +0000
+++ linux-3.16/debian/patches/debian/ppc64el-disable-zImage.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-From: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
-Date: Wed, 4 Jun 2014 09:06:27 -0300
-Subject: 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. The
-patches are currently in Ben Herrenschmidt's linux-next tree [1].
-
-The patches are not being carried over instead of this workaround because,
-even without both, the build process does produces vmlinux, only failing for
-zImage. So, it's ok to just work-around this for now, as we pick vmlinux.
-
-The workaround patch just avoids 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
-
-[1] https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/log/?qt=grep&q=powerpc%2Fboot
- (15 commits with message prefix 'powerpc/boot:' dated of 2014-04-28)
-
-Signed-off-by: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
----
-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 -Nru linux-3.16/debian/patches/series linux-3.16/debian/patches/series
--- linux-3.16/debian/patches/series 2014-08-07 20:27:15.000000000 +0000
+++ linux-3.16/debian/patches/series 2014-09-02 12:00:33.000000000 +0000
@@ -6,7 +6,6 @@
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
Reply to: