Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* i386 has stopped building because the el-torito boot images were turned 

off (due to size issues). Fix this by not failing if the el-torito images
  arn't there.
This commit is contained in:
Joey Hess 2006-05-24 18:00:58 +00:00
parent 9ce8394fb7
commit 43ff633c0e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -37,8 +37,11 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
isolinux files include .with26+gtk, include gtk initrd along with the isolinux files include .with26+gtk, include gtk initrd along with the
2.4 kernel. If .withgtk, include gtk initrd along with the default 2.4 kernel. If .withgtk, include gtk initrd along with the default
(presumably 2.6) kernel. (presumably 2.6) kernel.
* i386 has stopped building because the el-torito boot images were turned
off (due to size issues). Fix this by not failing if the el-torito images
arn't there.
-- Joey Hess <joeyh@debian.org> Sun, 14 May 2006 12:25:58 -0500 -- Joey Hess <joeyh@debian.org> Wed, 24 May 2006 13:59:59 -0400
debian-cd (2.2.24) unstable; urgency=low debian-cd (2.2.24) unstable; urgency=low

6
tools/boot/etch/boot-i386
View File

@ -50,11 +50,11 @@ KTYPE[10]=""
THISTYPE=${KTYPE[$NN]} THISTYPE=${KTYPE[$NN]}
BOOT_IMAGES="cdrom/boot.img cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz" BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
# Only include disk images on full CDs, not on smaller images. # Only include disk images on full CDs, not on smaller images.
if [ "$INSTALLER_CD" != 1 ] && [ "$INSTALLER_CD" != 2 ]; then if [ "$INSTALLER_CD" != 1 ] && [ "$INSTALLER_CD" != 2 ]; then
DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img" DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img"
EXTRA_DISK_IMAGES="floppy/access/root.img floppy/access/boot.img floppy/access/cd-drivers.img" EXTRA_DISK_IMAGES="cdrom/boot.img floppy/access/root.img floppy/access/boot.img floppy/access/cd-drivers.img"
fi fi
# Download boot images and floppies. # Download boot images and floppies.
@ -75,7 +75,7 @@ for image in $BOOT_IMAGES; do
fi fi
done done
# Floppies that are not really required or may be unavailable. # Images that are not really required or may be unavailable.
for image in $DISK_IMAGES $EXTRA_DISK_IMAGES; do for image in $DISK_IMAGES $EXTRA_DISK_IMAGES; do
if [ ! -e "$image" ]; then if [ ! -e "$image" ]; then
dir=$(dirname $image) dir=$(dirname $image)