Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Recent versions of mkisofs (I've tested starting with cdrtools-2.01.01a20) 

can't find the el-torito boot image with the old syntax. This can be
fixed by removed the leading "i386/" from the -b argument, but then
the mkisofs from the current cdrtools-2.01 package won't find the boot image.

Change the graf-point specifications so that a trailing / terminates
the grafted directories. This way both versions of mkisofs can find the
boot loader.
This commit is contained in:
bad 2007-03-16 21:12:17 +00:00
parent 868ef0036d
commit ae77ae0ca1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.341 2007/03/06 21:59:40 bouyer Exp $
# $NetBSD: Makefile,v 1.342 2007/03/16 21:12:17 bad Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@ -436,7 +436,7 @@ iso-image-setup: .PHONY check_RELEASEDIR
echo "${extra}=${RELEASEDIR}/${extra}" >> ${CDROM.pathlist}
.endif
.endfor
echo "${MACHINE}=${RELEASEDIR}/${RELEASEMACHINEDIR}" >> ${CDROM.pathlist}
echo "${MACHINE}/=${RELEASEDIR}/${RELEASEMACHINEDIR}/" >> ${CDROM.pathlist}
mkdir -p ${CDROM.dir}
mkdir -p ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom

6
etc/etc.sgimips/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.14 2005/10/04 16:11:15 martin Exp $
# $NetBSD: Makefile.inc,v 1.15 2007/03/16 21:12:19 bad Exp $
#
# etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets
#
@ -16,8 +16,8 @@ INSTALLATION_DIRS+= installation/netboot \
iso-image-md-pre:
cp ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-INSTALL32_IP2x.gz ${RELEASEDIR}/ip2x
cp ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-INSTALL32_IP3x.gz ${RELEASEDIR}/ip3x
echo "ip2x=${RELEASEDIR}/ip2x" >> ${CDROM.pathlist}
echo "ip3x=${RELEASEDIR}/ip3x" >> ${CDROM.pathlist}
echo "ip2x/=${RELEASEDIR}/ip2x/" >> ${CDROM.pathlist}
echo "ip3x/=${RELEASEDIR}/ip3x/" >> ${CDROM.pathlist}
SGI.image= ${RELEASEDIR}/${MACHINE}/installation/cdrom/netbsd-sgimips.img