Module Name: src
Committed By: tsutsui
Date: Sat Jun 8 13:07:48 UTC 2024
Modified Files:
src/distrib/macppc: Makefile
src/etc/etc.macppc: Makefile.inc
Log Message:
Build macppc iso with TOOL_MKHYBRID via "iso-image" target in src/etc.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/macppc/Makefile
cvs rdiff -u -r1.12 -r1.13 src/etc/etc.macppc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/macppc/Makefile
diff -u src/distrib/macppc/Makefile:1.17 src/distrib/macppc/Makefile:1.18
--- src/distrib/macppc/Makefile:1.17 Tue May 25 11:55:40 2021
+++ src/distrib/macppc/Makefile Sat Jun 8 13:07:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/05/25 11:55:40 martin Exp $
+# $NetBSD: Makefile,v 1.18 2024/06/08 13:07:48 tsutsui Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -18,6 +18,9 @@ release: check_RELEASEDIR .WAIT ${OWFBOO
${RELEASE_INSTALL} ${OFWBOOTERS} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
iso_image:
- ${MAKEDIRTARGET} cdroms iso_image
+# macppc installcd is now created via "do-isa-image" target in
+# etc/Makefile using ${TOOLS_MKHYBRID} for ISO9660/HFS hybrid image
+# with bootable special Apple partition map
+# ${MAKEDIRTARGET} cdroms iso_image
.include <bsd.subdir.mk>
Index: src/etc/etc.macppc/Makefile.inc
diff -u src/etc/etc.macppc/Makefile.inc:1.12 src/etc/etc.macppc/Makefile.inc:1.13
--- src/etc/etc.macppc/Makefile.inc:1.12 Tue Sep 15 08:14:31 2020
+++ src/etc/etc.macppc/Makefile.inc Sat Jun 8 13:07:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2020/09/15 08:14:31 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.13 2024/06/08 13:07:48 tsutsui Exp $
#
# etc.macppc/Makefile.inc -- macppc-specific etc Makefile targets
#
@@ -14,3 +14,41 @@ BUILD_KERNELS+= INSTALL INSTALL_601 GEN
INSTALLATION_DIRS+= installation/floppy
.endif
+
+# For "make iso-image"
+# mkisofs arguments to create a hybrid (HFS/Rockridge) CD-ROM image.
+# XXX: files in ${DISTRIB_CDROMDIR} should be moved under distrib/macppc/cdrom?
+DISTRIB_CDROMDIR= ${NETBSDSRCDIR}/distrib/cdrom
+
+BOOTHFS= boothfs
+UUDECODE_FILES= ${BOOTHFS}
+.SUFFIXES: .uue
+.PATH.uue: ${DISTRIB_CDROMDIR}
+
+MKISOFS_FLAGS+= -hide-rr-moved \
+ -hfs -part -hide-hfs-list ${DISTRIB_CDROMDIR}/hide-hfs.lst \
+ --macbin -map ${DISTRIB_CDROMDIR}/hfsmap.lst \
+ -hide-joliet-list ${DISTRIB_CDROMDIR}/hide-jol.lst \
+ -boot-hfs-file ${.OBJDIR}/${BOOTHFS}
+# exclude large debug sets to avoid 700MB overflow
+MKISOFS_FLAGS+= -m debug.tgz -m xdebug.tgz
+
+MD_DISTRIBDIR= ${NETBSDSRCDIR}/distrib/${MACHINE}
+CDINSTKERNEL= ${MD_DISTRIBDIR}/floppies/md-kernel
+_INSTKERNELNOBJDIR!= cd ${CDINSTKERNEL} && ${PRINTOBJDIR}
+CDKERNELS= netbsd-INSTALL.gz netbsd
+CDKERNELS+= netbsd-INSTALL_601.gz netbsd.601
+
+iso-image-md-pre: ${BOOTHFS}
+.for kernel target in ${CDKERNELS}
+ ${INSTALL} ${COPY} -m 0644 \
+ ${_INSTKERNELNOBJDIR}/${kernel} ${CDROM.dir}/${target}
+.endfor
+ ${INSTALL} ${COPY} -m 0644 ${DESTDIR}/usr/mdec/ofwboot ${CDROM.dir}
+ ${INSTALL} ${COPY} -m 0644 ${DESTDIR}/usr/mdec/ofwboot.xcf ${CDROM.dir}
+
+iso-image: do-iso-image
+
+iso-image-md-post:
+ ${TOOL_MACPPCINSTALLBOOT} ${CDROM_IMAGE} \
+ ${DESTDIR}/usr/mdec/bootxx /ofwboot
