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

Bug#759389: marked as done (linux: ppc64el: switch to vmlinuz (from vmlinux))

Your message dated Wed, 24 Sep 2014 13:22:23 +0100
with message-id <1411561343.3659.22.camel@decadent.org.uk>
and subject line Re: linux: ppc64el: switch to vmlinuz (from vmlinux)
has caused the Debian Bug report #759389,
regarding linux: ppc64el: switch to vmlinuz (from vmlinux)
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
759389: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759389
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: src:linux
Version: 3.16-1~exp1
Tags: patch
User: debian-powerpc@lists.debian.org
Usertags: ppc64el

Hi maintainers,

This patch switches the kernel type/image filename on ppc64el
to vmlinuz (from vmlinux), and drops a workaround patch.
$ dpkg-deb -c linux-image-3.16-trunk-powerpc64le_3.16-1~exp1ppc64el1_ppc64el.deb | fgrep vmlinu -rw-r--r-- root/root 4306765 2014-08-21 20:20 ./boot/vmlinuz-3.16-trunk-powerpc64le
$ dpkg-deb -c kernel-image-3.16-trunk-powerpc64le-di_3.16-1~exp1ppc64el1_ppc64el.udeb | fgrep vmlinu 
	-rw-r--r-- root/root   4306765 2014-08-21 20:22 ./boot/vmlinuz

The zImage build is available starting with linux 3.16, with the
introduction of the '64bit little endian wrapper' patch-set.
(FYI, this is also happening in Ubuntu LP #1358920 [1])

The necessary changes for d-i will be submitted shortly (on #754093).

May you please consider it for an upload?

Thanks!

[1] http://bugs.launchpad.net/bugs/1358920

--
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 17:58:13.000000000 -0300
+++ linux-3.16/debian/changelog	2014-08-21 16:41:39.000000000 -0300
@@ -1,3 +1,11 @@
+linux (3.16-1~exp1ppc64el1) UNRELEASED; urgency=medium
+
+  * [ppc64el] debian/config/ppc64el/defines: switch to vmlinuz (from vmlinux).
+  * [ppc64el] debian/patches/debian/ppc64el-disable-zImage.patch: remove patch.
+    The 'powerpc/boot: 64bit little endian wrapper' patch-set is in linux 3.16.
+
+ -- 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/config/ppc64el/defines linux-3.16/debian/config/ppc64el/defines
--- linux-3.16/debian/config/ppc64el/defines	2014-06-16 09:08:35.000000000 -0300
+++ linux-3.16/debian/config/ppc64el/defines	2014-08-21 16:41:46.000000000 -0300
@@ -4,12 +4,12 @@
 kernel-arch: powerpc
 
 [build]
-image-file: vmlinux
+image-file: arch/powerpc/boot/zImage
 
 [image]
 configs:
 suggests: mkvmlinuz
-install-stem: vmlinux
+install-stem: vmlinuz
 
 [powerpc64le_description]
 hardware: Little-endian 64-bit PowerPC
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 09:08:34.000000000 -0300
+++ linux-3.16/debian/patches/debian/ppc64el-disable-zImage.patch	1969-12-31 21:00:00.000000000 -0300
@@ -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 17:27:15.000000000 -0300
+++ linux-3.16/debian/patches/series	2014-08-21 16:41:31.000000000 -0300
@@ -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

--- End Message ---
--- Begin Message --- 
Closing as it's agreed this change should not be made.

Ben.

-- 
Ben Hutchings
Everything should be made as simple as possible, but not simpler.
                                                           - Albert Einstein

Attachment: signature.asc
Description: This is a digitally signed message part


--- End Message ---
Reply to: