On Thu, Mar 08, 2007 at 02:14:08AM +1100, Steffen Joeris wrote:
>Package: debian-cd
>Severity: normal
>Tags: patch
>
>Hi mates
>
>When I tried to build one of our amd64 daily builds I did not quite get
>it working, which was due to an error in the path. Attached you find a
>patch which solved the problem for me.
>
>Cheers
>Steffen
>
>--- debian-cd.unpatched/tools/boot/etch/boot-amd64 2007-03-05 22:48:45.000000000 +1100
>+++ debian-cd/tools/boot/etch/boot-amd64 2007-03-08 01:59:29.000000000 +1100
>@@ -163,8 +163,13 @@
> # Insert our own splash screen. Color index 0 is
> # background, and index 7 is foreground. Set to black and
> # white respecively
>- pngtopnm < $SPLASHPNG | ppmquant 16 | \
>- ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux-amd64/splash.rle
>+ if [ -d "boot$N/isolinux-amd64" ] ; then
>+ pngtopnm < $SPLASHPNG | ppmquant 16 | \
>+ ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux-amd64/splash.rle
>+ else
>+ pngtopnm < $SPLASHPNG | ppmquant 16 | \
>+ ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux/splash.rle
>+ fi
> fi
>
> rm -rf cdrom
Looking at the code, the contents of boot$N/isolinux-amd64 have
already been moved across to boot$N/isolinux and the directory itself
deleted. A simpler change to make things work is just like this, I
think. Yes?
Index: tools/boot/etch/boot-amd64
===================================================================
--- tools/boot/etch/boot-amd64 (revision 1371)
+++ tools/boot/etch/boot-amd64 (working copy)
@@ -164,7 +164,7 @@
# background, and index 7 is foreground. Set to black and
# white respecively
pngtopnm < $SPLASHPNG | ppmquant 16 | \
- ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux-amd64/splash.rle
+ ppmtolss16 "#ffffff=7" "#000000=0" > boot$N/isolinux/splash.rle
fi
rm -rf cdrom
--
Steve McIntyre, Cambridge, UK. steve@einval.com
"This dress doesn't reverse." -- Alden Spiess
Attachment:
signature.asc
Description: Digital signature