Module Name: src
Committed By: martin
Date: Mon Jun 30 15:34:57 UTC 2014
Modified Files:
src/etc: Makefile
src/etc/etc.mac68k: Makefile.inc
Log Message:
Undo the mac68k specific previous change and instead move all mkisofs-based
images into ${RELEASEDIR}/images (just like the makefs ones).
To generate a diff of this commit:
cvs rdiff -u -r1.414 -r1.415 src/etc/Makefile
cvs rdiff -u -r1.21 -r1.22 src/etc/etc.mac68k/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/etc/Makefile
diff -u src/etc/Makefile:1.414 src/etc/Makefile:1.415
--- src/etc/Makefile:1.414 Sat Jun 14 12:26:26 2014
+++ src/etc/Makefile Mon Jun 30 15:34:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.414 2014/06/14 12:26:26 apb Exp $
+# $NetBSD: Makefile,v 1.415 2014/06/30 15:34:57 martin Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -405,7 +405,7 @@ release snapshot: .PHONY .MAKE check_DES
# Note: At least mkisofs 2.0 should be used.
#
CDROM_NAME_ADD?=
-CDROM_IMAGE?=${RELEASEDIR}/iso/NetBSD-${DISTRIBVER}-${MACHINE}.iso
+CDROM_IMAGE?=${RELEASEDIR}/images/NetBSD-${DISTRIBVER}-${MACHINE}.iso
CDROM.dir= ${.OBJDIR}/cdrom.dir
CDROM.pathlist= ${.OBJDIR}/cdrom.pathlist
@@ -413,7 +413,7 @@ iso-image:
.if ${MKISOFS} != true
do-iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post
- ${MAKESUMS} -t ${RELEASEDIR}/iso/ '*.iso'
+ ${MAKESUMS} -t ${RELEASEDIR}/images/ '*.iso'
@echo "iso-image created as: ${CDROM_IMAGE}"
.else
do-iso-image:
@@ -429,12 +429,14 @@ iso-image-setup: .PHONY check_RELEASEDIR
.endfor
echo "${MACHINE}/=${RELEASEDIR}/${RELEASEMACHINEDIR}/" >> ${CDROM.pathlist}
mkdir -p ${CDROM.dir}
- mkdir -p ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom
+
+check_imagedir:
+ mkdir -p ${RELEASEDIR}/images
# iso-image-mi --
# Create the image after the MD operations have completed.
#
-iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre
+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; \
Index: src/etc/etc.mac68k/Makefile.inc
diff -u src/etc/etc.mac68k/Makefile.inc:1.21 src/etc/etc.mac68k/Makefile.inc:1.22
--- src/etc/etc.mac68k/Makefile.inc:1.21 Sun Jun 29 17:49:04 2014
+++ src/etc/etc.mac68k/Makefile.inc Mon Jun 30 15:34:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.21 2014/06/29 17:49:04 martin Exp $
+# $NetBSD: Makefile.inc,v 1.22 2014/06/30 15:34:57 martin Exp $
#
# etc.mac68k/Makefile.inc -- mac68k-specific etc Makefile targets
#
@@ -21,7 +21,4 @@ snap_md_post:
MKISOFS_FLAGS+= -hfs --macbin \
-map ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/extensions.map
-check-iso-dir:
- -mkdir -p ${RELEASEDIR}/iso
-
-iso-image: check-iso-dir .WAIT do-iso-image
+iso-image: do-iso-image
