Bug#754093: debian-installer: ppc64el: ping / vmlinuz
On 08/26/2014 08:32 PM, Cyril Brulebois wrote: and thanks for both the bug report and the patch. Sure; my pleasure. Mauricio Faria de Oliveira (2014-08-26): >Would you have any news/comments about the patch attached in this bug? I'll rather let Aurelien comment on ppc64el patches. (Also, some bits could probably be shared between powerpc and ppc64el?) I'm not familiar w/ the approach/decision the original author(s) took about it, nor am familiar w/ the broader scope of d-i, so I'd like to defer the sharing question if possible. :) (I have only guesses about the lack of sharing because pcp64el is not actually/can't be a flavor of powerpc). I can try to find more info if needed. >We would like to switch the kernel on ppc64el to vmlinuz starting with >3.16 (introduction of zImage support for 64el). 3.16 is soon going to be the default anyway, as soon as it's uploaded to unstable and built on all architectures. Yup. I just mentioned that to justify the base version bump to 3.16 on the patch, without that version being on sid yet. :) Thanks again, -- Mauricio Faria de Oliveira IBM Linux Technology Center -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#754093: debian-installer: ppc64el: ping / vmlinuz
Hi, On Wed, Aug 27, 2014 at 01:32:32AM +0200, Cyril Brulebois wrote: > Hi, > > and thanks for both the bug report and the patch. > > Mauricio Faria de Oliveira (2014-08-26): > > Would you have any news/comments about the patch attached in this bug? > > I'll rather let Aurelien comment on ppc64el patches. (Also, some bits > could probably be shared between powerpc and ppc64el?) I have this patch in mind for ppc64el d-i (as well as the other one on partman-partioning-auto), I will look in details at it soon, but I would like to test build it using the Debian archive first. > > We would like to switch the kernel on ppc64el to vmlinuz starting with > > 3.16 (introduction of zImage support for 64el). > > 3.16 is soon going to be the default anyway, as soon as it's uploaded to > unstable and built on all architectures. I'll look at this one soon. Aurelien -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#754093: debian-installer: ppc64el: ping / vmlinuz
Hi,
and thanks for both the bug report and the patch.
Mauricio Faria de Oliveira (2014-08-26):
> Would you have any news/comments about the patch attached in this bug?
I'll rather let Aurelien comment on ppc64el patches. (Also, some bits
could probably be shared between powerpc and ppc64el?)
> We would like to switch the kernel on ppc64el to vmlinuz starting with
> 3.16 (introduction of zImage support for 64el).
3.16 is soon going to be the default anyway, as soon as it's uploaded to
unstable and built on all architectures.
> I am attaching an interdiff for that, on top of the previous patch,
> and a full debdiff for your convenience.
>
> I could successfully build d-i on ppc64el w/ those changes (plus adding
> a build-dep on grub-ieee1275-bin, apparently missed, for grub-mknetdir),
> on the debdiff.
>
> $ tar tf debian-installer-images_20140802ppc64el1_ppc64el.tar.gz |
> fgrep vmlinu
> ./installer-ppc64el/20140802ppc64el1/images/cdrom/vmlinuz
>
> ./installer-ppc64el/20140802ppc64el1/images/netboot/debian-installer/ppc64el/vmlinuz
>
> The respective bug on the linux source package has been filled on
> Debian #759389 (and Ubuntu LP #1358920).
>
> Thanks!
>
>
> --
> Mauricio Faria de Oliveira
> IBM Linux Technology Center
> diff -u b/build/config/ppc64el.cfg b/build/config/ppc64el.cfg
> --- b/build/config/ppc64el.cfg
> +++ b/build/config/ppc64el.cfg
> @@ -3,10 +3,10 @@
> MKLIBS = mklibs-copy
>
> KERNELMAJOR = 2.6
> -BASEVERSION = 3.14-1
> +BASEVERSION = 3.16-1
> KERNELVERSION = $(BASEVERSION)-powerpc64le
> KERNEL_FLAVOUR = di
> -KERNELNAME = vmlinux
> +KERNELNAME = vmlinuz
> KERNELIMAGEVERSION = $(KERNELVERSION)
>
> GRUB_CFG_CDROM = boot/ppc64el/grub-cdrom.cfg
> @@ -26,11 +26,11 @@
>$(TEMP_CD_TREE)/ppc/chrp \
>$(TEMP_CD_TREE)/install
>
> - cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/install/vmlinux
> + cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/install/vmlinuz
> cp $(TEMP_INITRD) $(TEMP_CD_TREE)/install/initrd.gz
>
> bootvars-subst \
> - KERNEL /install/vmlinux \
> + KERNEL /install/vmlinuz \
> INITRD /install/initrd.gz \
> < $(GRUB_CFG_CDROM) > $(TEMP_CD_TREE)/boot/grub/grub.cfg
>
> @@ -47,7 +47,7 @@
>$(TEMP_CD_INFO_DIR)/ppc/chrp
>
> bootvars-subst \
> - KERNEL /install/vmlinux \
> + KERNEL /install/vmlinuz \
> INITRD /install/initrd.gz \
> < $(GRUB_CFG_CDROM) > $(TEMP_CD_INFO_DIR)/boot/grub/grub.cfg
> grub-mkimage -O powerpc-ieee1275 -p '(ieee1275/cdrom)/boot/grub' \
> @@ -65,7 +65,7 @@
> cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
>
> bootvars-subst \
> - KERNEL $(NETBOOT_PATH)/vmlinux \
> + KERNEL $(NETBOOT_PATH)/vmlinuz \
> INITRD $(NETBOOT_PATH)/initrd.gz \
> < $(GRUB_CFG_NETBOOT) > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub.cfg
> if [ -n "$(SPLASH_PNG)" ]; then \
> diff -Nru debian-installer-20140802/build/boot/ppc64el/grub-cdrom.cfg
> debian-installer-20140802ppc64el1/build/boot/ppc64el/grub-cdrom.cfg
> --- debian-installer-20140802/build/boot/ppc64el/grub-cdrom.cfg
> 1970-01-01 00:00:00.0 +
> +++ debian-installer-20140802ppc64el1/build/boot/ppc64el/grub-cdrom.cfg
> 2014-08-26 22:50:39.0 +
> @@ -0,0 +1,11 @@
> +set timeout=-1
> +
> +menuentry "Install" {
> + linux ${KERNEL} -- quiet
> + initrd ${INITRD}
> +}
> +
> +menuentry "Rescue mode" {
> + linux ${KERNEL} rescue/enable=true -- quiet
> + initrd ${INITRD}
> +}
> diff -Nru debian-installer-20140802/build/config/ppc64el/cdrom.cfg
> debian-installer-20140802ppc64el1/build/config/ppc64el/cdrom.cfg
> --- debian-installer-20140802/build/config/ppc64el/cdrom.cfg 1970-01-01
> 00:00:00.0 +
> +++ debian-installer-20140802ppc64el1/build/config/ppc64el/cdrom.cfg
> 2014-08-26 22:50:39.0 +
> @@ -0,0 +1,8 @@
> +MEDIA_TYPE = CD-ROM
> +
> +TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
> +EXTRANAME = $(MEDIUM)/
> +
> +MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
> +MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
> +MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
> diff -Nru debian-installer-20140802/build/config/ppc64el/netboot.cfg
> debian-installer-20140802ppc64el1/build/config/ppc64el/netboot.cfg
> --- debian-installer-20140802/build/config/ppc64el/netboot.cfg
> 1970-01-01 00:00:00.0 +
> +++ debian-installer-20140802ppc64el1/build/config/ppc64el/netboot.cfg
> 2014-08-26 22:50:39.0 +
> @@ -0,0 +1,9 @@
> +MEDIA_TYPE = netboot image
> +
> +NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
> +TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
> +EXTRANAME = $(MEDIUM)/
> +
> +MANIFEST-NETBOOT_DIR = "boot directory for tftp server"
> +MANIFEST-NETBOOT_TAR = "tarball of boot directory"
> +MANIFEST-MINIISO = "tiny CD image that
Bug#754093: debian-installer: ppc64el: ping / vmlinuz
Package: src:debian-installer
Tags: patch
Hi,
Would you have any news/comments about the patch attached in this bug?
We would like to switch the kernel on ppc64el to vmlinuz starting with
3.16 (introduction of zImage support for 64el).
I am attaching an interdiff for that, on top of the previous patch,
and a full debdiff for your convenience.
I could successfully build d-i on ppc64el w/ those changes (plus adding
a build-dep on grub-ieee1275-bin, apparently missed, for grub-mknetdir),
on the debdiff.
$ tar tf debian-installer-images_20140802ppc64el1_ppc64el.tar.gz |
fgrep vmlinu
./installer-ppc64el/20140802ppc64el1/images/cdrom/vmlinuz
./installer-ppc64el/20140802ppc64el1/images/netboot/debian-installer/ppc64el/vmlinuz
The respective bug on the linux source package has been filled on
Debian #759389 (and Ubuntu LP #1358920).
Thanks!
--
Mauricio Faria de Oliveira
IBM Linux Technology Center
diff -u b/build/config/ppc64el.cfg b/build/config/ppc64el.cfg
--- b/build/config/ppc64el.cfg
+++ b/build/config/ppc64el.cfg
@@ -3,10 +3,10 @@
MKLIBS = mklibs-copy
KERNELMAJOR = 2.6
-BASEVERSION = 3.14-1
+BASEVERSION = 3.16-1
KERNELVERSION = $(BASEVERSION)-powerpc64le
KERNEL_FLAVOUR = di
-KERNELNAME = vmlinux
+KERNELNAME = vmlinuz
KERNELIMAGEVERSION = $(KERNELVERSION)
GRUB_CFG_CDROM = boot/ppc64el/grub-cdrom.cfg
@@ -26,11 +26,11 @@
$(TEMP_CD_TREE)/ppc/chrp \
$(TEMP_CD_TREE)/install
- cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/install/vmlinux
+ cp $(TEMP_KERNEL) $(TEMP_CD_TREE)/install/vmlinuz
cp $(TEMP_INITRD) $(TEMP_CD_TREE)/install/initrd.gz
bootvars-subst \
- KERNEL /install/vmlinux \
+ KERNEL /install/vmlinuz \
INITRD /install/initrd.gz \
< $(GRUB_CFG_CDROM) > $(TEMP_CD_TREE)/boot/grub/grub.cfg
@@ -47,7 +47,7 @@
$(TEMP_CD_INFO_DIR)/ppc/chrp
bootvars-subst \
- KERNEL /install/vmlinux \
+ KERNEL /install/vmlinuz \
INITRD /install/initrd.gz \
< $(GRUB_CFG_CDROM) > $(TEMP_CD_INFO_DIR)/boot/grub/grub.cfg
grub-mkimage -O powerpc-ieee1275 -p '(ieee1275/cdrom)/boot/grub' \
@@ -65,7 +65,7 @@
cp $(TEMP_KERNEL) $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)
bootvars-subst \
- KERNEL $(NETBOOT_PATH)/vmlinux \
+ KERNEL $(NETBOOT_PATH)/vmlinuz \
INITRD $(NETBOOT_PATH)/initrd.gz \
< $(GRUB_CFG_NETBOOT) > $(TEMP_NETBOOT_DIR)/$(NETBOOT_PATH)/grub.cfg
if [ -n "$(SPLASH_PNG)" ]; then \
diff -Nru debian-installer-20140802/build/boot/ppc64el/grub-cdrom.cfg
debian-installer-20140802ppc64el1/build/boot/ppc64el/grub-cdrom.cfg
--- debian-installer-20140802/build/boot/ppc64el/grub-cdrom.cfg 1970-01-01
00:00:00.0 +
+++ debian-installer-20140802ppc64el1/build/boot/ppc64el/grub-cdrom.cfg
2014-08-26 22:50:39.0 +
@@ -0,0 +1,11 @@
+set timeout=-1
+
+menuentry "Install" {
+ linux ${KERNEL} -- quiet
+ initrd ${INITRD}
+}
+
+menuentry "Rescue mode" {
+ linux ${KERNEL} rescue/enable=true -- quiet
+ initrd ${INITRD}
+}
diff -Nru debian-installer-20140802/build/config/ppc64el/cdrom.cfg
debian-installer-20140802ppc64el1/build/config/ppc64el/cdrom.cfg
--- debian-installer-20140802/build/config/ppc64el/cdrom.cfg1970-01-01
00:00:00.0 +
+++ debian-installer-20140802ppc64el1/build/config/ppc64el/cdrom.cfg
2014-08-26 22:50:39.0 +
@@ -0,0 +1,8 @@
+MEDIA_TYPE = CD-ROM
+
+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-KERNEL = "kernel for use with mkisofs to build a CD"
+MANIFEST-INITRD = "initrd for use with mkisofs to build a CD"
+MANIFEST-DEBIAN_CD_INFO = "mkisofs config files for CD"
diff -Nru debian-installer-20140802/build/config/ppc64el/netboot.cfg
debian-installer-20140802ppc64el1/build/config/ppc64el/netboot.cfg
--- debian-installer-20140802/build/config/ppc64el/netboot.cfg 1970-01-01
00:00:00.0 +
+++ debian-installer-20140802ppc64el1/build/config/ppc64el/netboot.cfg
2014-08-26 22:50:39.0 +
@@ -0,0 +1,9 @@
+MEDIA_TYPE = netboot image
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-NETBOOT_DIR = "boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of boot directory"
+MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
diff -Nru debian-installer-20140802/build/config/ppc64el.cfg
debian-installer-20140802ppc64el1/build/config/ppc64el.cfg
--- debian-installer-20140802/build/config/ppc64el.cfg 1970-01-01
00:00:00.0 +
+++ debian-installer-20140802ppc64el1/build/config/ppc64el.cfg 2014-08-26
22:57:13.0 +
@@ -0,0 +1,76 @@
+MEDIUM_SUPPORTED = netboot cdrom
+
+MKLIBS = mklibs-copy
+
+KERNELMAJOR = 2.6
+BASEVERSION = 3.16-1
+KERNELVERSION = $(BASEVERSION)-pow
