Bug#328274: debian-cd: Please apply following patch to fix d-i etch/sid builds on powerpc.
Package: debian-cd
Version: 2.2.23
Severity: important
Tags: d-i patch
The attached patch does two things :
1) hopefully fixes debian-cd to produce powerpc isos that again contain
powerp64 kernels.
2) add the needed stuff to make IBM chrp box recognize the CDs.
I have not tested them, as i am unable to build debian-cd images, but i guess
this will only affect powerpc, and there the situation cannot really be more
broken than it is now.
So, it would be nice to have this patch included in svn (or to give me access
so i could commit them), and to install them on the right machine so the next
run of isos are built using them.
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: powerpc (ppc)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.12-1-powerpc
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Versions of packages debian-cd depends on:
ii apt 0.6.41 Advanced front-end for dpkg
ii apt-utils 0.6.41 APT utility programs
ii bc 1.06-17 The GNU bc arbitrary precision cal
ii cpp 4:4.0.1-3 The GNU C preprocessor (cpp)
ii debootstrap 0.3.1.6 Bootstrap a basic Debian system
ii grep-dctrl 2.6.7 Grep Debian package information
ii lynx 2.8.5-2 Text-mode WWW Browser
ii make 3.80-11 The GNU version of the "make" util
ii mkisofs 4:2.01+01a01-4 Creates ISO-9660 CD-ROM filesystem
ii perl [libdigest-md5-perl] 5.8.7-5 Larry Wall's Practical Extraction
ii sysutils 1.3.8.5.1 Miscellaneous small system utiliti
Versions of packages debian-cd recommends:
ii debianutils 2.14.3 Miscellaneous utilities specific t
ii hfsutils 3.2.6-9 Tools for reading and writing Maci
ii jigdo-file 0.7.2-2 Download Debian CD images from any
Index: tools/boot/etch/boot-powerpc
===================================================================
--- tools/boot/etch/boot-powerpc (révision 914)
+++ tools/boot/etch/boot-powerpc (copie de travail)
@@ -88,7 +88,7 @@
| sed "s/CODENAME/${CODENAME}/g" > yaboot.conf
cp $BASEDIR/data/etch/yaboot/ofboot.b ofboot.b
-for subarch in powerpc power3 power4
+for subarch in powerpc powerpc64
do
if [ ! "$DI_WWW_HOME" ];then
if [ ! "$DI_DIR" ];then
@@ -105,23 +105,12 @@
fi
else
wget -r -nd --no-parent --level=1 -P "$subarch" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom/"
- if [ $subarch = powerpc ]; then
- wget -r -nd --no-parent --level=1 -P "$subarch/2.4" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom/2.4/"
- wget -r -nd --no-parent --level=1 -P "$subarch/minimal" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom-minimal/"
- wget -r -nd --no-parent --level=1 -P "$subarch/minimal/2.4" -R 'index*' "$DI_WWW_HOME/$subarch/cdrom-minimal/2.4/"
- else
+ if [ $subarch != powerpc ]; then
# POWER3 and POWER4 PReP machines do not exist.
rm -f "$subarch/vmlinuz-prep.initrd"
fi
fi
- # Save some space with hardlinks; these kernels are identical.
- if [ -e powerpc/vmlinux ] && [ -e powerpc/minimal/vmlinux ]; then
- ln -f powerpc/vmlinux powerpc/minimal/vmlinux
- fi
- if [ -e powerpc/2.4/vmlinux ] && [ -e powerpc/minimal/2.4/vmlinux ]; then
- ln -f powerpc/2.4/vmlinux powerpc/minimal/2.4/vmlinux
- fi
done
# Copy pegasos forth script, since pegasos machines don't support yaboot yet.
@@ -132,4 +121,12 @@
| sed "s/\${BUILD_DATE}/${BUILD_DATE}/g" \
> pegasos
+# Let's copy the IBM CHRP stuff into place now.
+cd $CDDIR
+mkdir ppc
+mkdir ppc/chrp
+cp $BASEDIR/data/etch/chrp/bootinfo.txt ppc
+mkdir etc
+cp $INSTALLDIR/yaboot.conf etc
+
exit 0
Index: data/etch/chrp/bootinfo.txt
===================================================================
--- data/etch/chrp/bootinfo.txt (révision 0)
+++ data/etch/chrp/bootinfo.txt (révision 0)
@@ -0,0 +1,5 @@
+<chrp-boot>
+<description>Debian/GNU Linux Installation on IBM CHRP hardware</description>
+<os-name>Debian/GNU Linux for PowerPC</os-name>
+<boot-script>boot &device;:\install\yaboot</boot-script>
+
Reply to: