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

Use tools/mkhybrid as MKISOFS for mac68k and future macppc.

This commit is contained in:
tsutsui 2024-05-31 20:58:52 +00:00
parent 1fe42822fe
commit fbc71c25d4
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
etc/Makefile
View File

@ -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 # from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values: # Environment variables without default values:
@ -48,13 +48,9 @@ DISTRIBVER!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
GZIP_FLAGS= -9 ${GZIP_N_FLAG} GZIP_FLAGS= -9 ${GZIP_N_FLAG}
# Flags for creating ISO CDROM image # Flags for creating ISO CDROM image for mac68k and macppc that require
# mkisofs is expected to be in $PATH, install via pkgsrc/sysutils/cdrtools # tools mkhybrid(8) to create hybrid ISO9660/HFS images.
# Note: At least mkisofs 2.0 should be used. MKISOFS?= ${TOOL_MKHYBRID}
#
.if !defined(MKISOFS)
MKISOFS!= (which mkisofs || echo true) 2>/dev/null
.endif
DISTRIBREV!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh -s DISTRIBREV!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh -s
# ISO 9660 volume ID. Note that this can only contain [A-Z0-9_]. # ISO 9660 volume ID. Note that this can only contain [A-Z0-9_].
ISO_VOLID!= echo NETBSD_${DISTRIBREV} | tr a-z A-Z ISO_VOLID!= echo NETBSD_${DISTRIBREV} | tr a-z A-Z
@ -442,14 +438,9 @@ CDROM.pathlist= ${.OBJDIR}/cdrom.pathlist
iso-image: iso-image:
.if ${MKISOFS} != true
do-iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post do-iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post
${MAKESUMS} -t ${RELEASEDIR}/images/ '*.iso' ${MAKESUMS} -t ${RELEASEDIR}/images/ '*.iso'
@echo "iso-image created as: ${CDROM_IMAGE}" @echo "iso-image created as: ${CDROM_IMAGE}"
.else
do-iso-image:
@echo iso-image: mkisofs not found
.endif
iso-image-setup: .PHONY check_RELEASEDIR iso-image-setup: .PHONY check_RELEASEDIR
rm -f ${CDROM.pathlist} rm -f ${CDROM.pathlist}
@ -468,10 +459,6 @@ check_imagedir:
# Create the image after the MD operations have completed. # Create the image after the MD operations have completed.
# #
iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre check_imagedir 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} \ ${MKISOFS} ${MKISOFS_FLAGS} -graft-points -path-list ${CDROM.pathlist} \
-o ${CDROM_IMAGE} ${CDROM.dir} -o ${CDROM_IMAGE} ${CDROM.dir}