Module Name: src
Committed By: tsutsui
Date: Sun Mar 29 04:56:17 UTC 2009
Modified Files:
src/distrib/cdrom: Makefile
Log Message:
Use pre-generated boothfs.uue binary to create macppccd.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/distrib/cdrom/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cdrom/Makefile
diff -u src/distrib/cdrom/Makefile:1.47 src/distrib/cdrom/Makefile:1.48
--- src/distrib/cdrom/Makefile:1.47 Wed Mar 25 13:53:05 2009
+++ src/distrib/cdrom/Makefile Sun Mar 29 04:56:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2009/03/25 13:53:05 tsutsui Exp $
+# $NetBSD: Makefile,v 1.48 2009/03/29 04:56:16 tsutsui Exp $
#
# Consult "*.conf" for the configuration variables; this Makefile is typically
# not edited for basic configuration changes.
@@ -60,7 +60,7 @@
SUBDIR=
.if !empty(ALL_PORTS:Mmacppc)
-SUBDIR+= macppc_mkboothfs macppc_installboot
+SUBDIR+= macppc_installboot
.endif
.if !empty(SUBDIR)
@@ -79,7 +79,6 @@
VAX_IBOOT?= ${TOOL_INSTALLBOOT} -m vax -o sunsum,append
.if !empty(ALL_PORTS:Mmacppc)
MACPPC_IBOOTDIR!= cd ${.CURDIR}/macppc_installboot && ${PRINTOBJDIR}
-MACPPC_MKBOOTHFSDIR!= cd ${.CURDIR}/macppc_mkboothfs && ${PRINTOBJDIR}
.endif
.if !empty(ALL_PORTS:Msgimips)
SGIMIPS_SGIVOL?= ${TOOLDIR}/bin/nbsgivol
@@ -290,9 +289,12 @@
# Mac (mac68k, macppc)
.if !empty(ports:Mmacppc)
+BOOTHFS= boothfs
MKISOFS_ARGS.${image}+= -hfs -part -hide-hfs-list ${.CURDIR}/hide-hfs.lst \
--macbin -map ${.CURDIR}/hfsmap.lst \
- -boot-hfs-file ${MACPPC_MKBOOTHFSDIR}/boothfs
+ -boot-hfs-file ${.OBJDIR}/${BOOTHFS}
+UUDECODE_FILES= ${BOOTHFS}
+.include <bsd.files.mk>
.elif defined(USE_APPLE_ISO) || !empty(ports:Mmac68k)
MKISOFS_ARGS.${image}+= -apple --macbin -map ${.CURDIR}/hfsmap.lst
.endif
@@ -418,6 +420,10 @@
${file:C/^.*://}: .PHONY
.endfor # }
+.if !empty(BASE_PORTS.${image}:Mmacppc)
+fileprep-${image}: ${BOOTHFS}
+.endif
+
# Size the CD image. This is done via the following formula:
# 1. Size the image produced by mkisofs.
# 2. Add images added by distrib/common/sunbootcd.sh by rounding to a 320k
@@ -425,16 +431,9 @@
# 3. Add bootfile sizes rounded up to 512 bytes for pmax and vax.
# 4. Round up to a 32k boundary, then add another 32k for TAO padding.
-.if !empty(BASE_PORTS.${image}:Mmacppc)
-size-${image}: all-macppc_mkboothfs all-macppc_installboot
-.endif
-
SGIVOLHDR.size= 4096
size-${image}: stage-${image} extfileprep fileprep-${image} check_mkisofs
-.if !empty(BASE_PORTS.${image}:Mmacppc)
- ${MACPPC_MKBOOTHFSDIR}/macppc_mkboothfs ${MACPPC_MKBOOTHFSDIR}/boothfs
-.endif
@size=$$((`cd ${STAGEDIR}/${image} && \
${MKISOFS} ${MKISOFS_ARGS} ${MKISOFS_ARGS.${image}} \
-print-size . 2>&1 \
@@ -465,6 +464,10 @@
# Actually build the image with all the bootstrap goo....
+.if !empty(BASE_PORTS.${image}:Mmacppc)
+${IMAGEDIR}/${image}.iso: all-macppc_installboot
+.endif
+
${IMAGEDIR}/${image}.iso: size-${image} check_mkisofs
@sort -o ${contents.${image}} ${contents.${image}}
.if defined(LOG_MKISOFS)
