Re: Adding ppc64el support in debian-cd

[Aurelien Jarno <aurel32@debian.org>]

Hi,

On Sat, Oct 04, 2014 at 10:58:11AM +0200, Thomas Schmitt wrote:
> Hi,
> 
> the ISO
>  http://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/ppc64el/iso-cd/debian-testing-ppc64el-netinst.iso
> of 2014-10-04 10:17 (CEST) still has no CHRP partition table
> and was not produced with -as mkisofs option -chrp-boot-part.
> 
> It contains the data file /ppc/bootinfo.txt which should have
> triggered the use of the option in tools/boot/jessie/boot-ppc64el
> 
>   if [ -f CD$N/ppc/bootinfo.txt ] ; then
>       add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-chrp-boot-part"
>   fi

Thanks for the notice. The problem is that the test is still using -d
instead of -f. You will find attached a patch to fix that.

I have also notice that the first CD doesn't include the kernel due a
typo. I have also attached a patch to fix that.

Thanks,
Aurelien

-- 
Aurelien Jarno                          GPG: 4096R/1DDD8C9B
aurelien@aurel32.net                 http://www.aurel32.net

>From 87f1295a408dea99cbe1d0b4d8a63233aafd8478 Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 4 Oct 2014 13:36:33 +0200
Subject: [PATCH 1/2] Enable CHRP partition table on ppc64el boot CD

The test is on a file, so it should use -f instead of -d.
---
 tools/boot/jessie/boot-ppc64el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/boot/jessie/boot-ppc64el b/tools/boot/jessie/boot-ppc64el
index bc1320c..6f90e45 100755
--- a/tools/boot/jessie/boot-ppc64el
+++ b/tools/boot/jessie/boot-ppc64el
@@ -68,7 +68,7 @@ cp -lf cdrom/vmlinux $INSTALLDIR/
 cp -lf cdrom/initrd.gz $INSTALLDIR/
 
 # Add CHRP boot header
-if [ -d CD$N/ppc/bootinfo.txt ] ; then
+if [ -f CD$N/ppc/bootinfo.txt ] ; then
     add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-chrp-boot-part"
 fi
 
-- 
2.1.1

>From abb1cd44daf7898c165eb0e591fe42cf5ebff62b Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 4 Oct 2014 13:36:42 +0200
Subject: [PATCH 2/2] Add the ppc64el kernel on the first CD

Due to a typo the ppc64el kernel wan't present on the first CD.
---
 tools/generate_di+k_list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 2ecea4e..0bf8681 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -238,7 +238,7 @@ grub-ieee1275
 busybox
 powerpc-utils
 powerpc-ibm-utils
-linux-image-powerpc64el
+linux-image-powerpc64le
 #endif
 
 #ifdef ARCH_alpha
-- 
2.1.1