Module Name: src
Committed By: tsutsui
Date: Fri May 31 20:58:52 UTC 2024
Modified Files:
src/etc: Makefile
Log Message:
Use tools/mkhybrid as MKISOFS for mac68k and future macppc.
To generate a diff of this commit:
cvs rdiff -u -r1.470 -r1.471 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.470 src/etc/Makefile:1.471
--- src/etc/Makefile:1.470 Fri Apr 26 18:06:02 2024
+++ src/etc/Makefile Fri May 31 20:58:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.470 2024/04/26 18:06:02 christos Exp $
+# $NetBSD: Makefile,v 1.471 2024/05/31 20:58:52 tsutsui Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -48,13 +48,9 @@ DISTRIBVER!= ${HOST_SH} ${NETBSDSRCDIR}/
GZIP_FLAGS= -9 ${GZIP_N_FLAG}
-# Flags for creating ISO CDROM image
-# mkisofs is expected to be in $PATH, install via pkgsrc/sysutils/cdrtools
-# Note: At least mkisofs 2.0 should be used.
-#
-.if !defined(MKISOFS)
-MKISOFS!= (which mkisofs || echo true) 2>/dev/null
-.endif
+# Flags for creating ISO CDROM image for mac68k and macppc that require
+# tools mkhybrid(8) to create hybrid ISO9660/HFS images.
+MKISOFS?= ${TOOL_MKHYBRID}
DISTRIBREV!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh -s
# ISO 9660 volume ID. Note that this can only contain [A-Z0-9_].
ISO_VOLID!= echo NETBSD_${DISTRIBREV} | tr a-z A-Z
@@ -442,14 +438,9 @@ CDROM.pathlist= ${.OBJDIR}/cdrom.pathlis
iso-image:
-.if ${MKISOFS} != true
do-iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post
${MAKESUMS} -t ${RELEASEDIR}/images/ '*.iso'
@echo "iso-image created as: ${CDROM_IMAGE}"
-.else
-do-iso-image:
- @echo iso-image: mkisofs not found
-.endif
iso-image-setup: .PHONY check_RELEASEDIR
rm -f ${CDROM.pathlist}
@@ -468,10 +459,6 @@ check_imagedir:
# Create the image after the MD operations have completed.
#
iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre check_imagedir
- @if ! ${MKISOFS} --version; then \
- echo "install pkgsrc/sysutils/cdrtools and run 'make iso-image'." ; \
- false; \
- fi
${MKISOFS} ${MKISOFS_FLAGS} -graft-points -path-list ${CDROM.pathlist} \
-o ${CDROM_IMAGE} ${CDROM.dir}
