Module Name: src
Committed By: he
Date: Thu Apr 22 11:58:59 UTC 2010
Modified Files:
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Change use of ${CP} and ${CHMOD} to ${INSTALL_FILE}, so that if the
target is made un-writeable, the build won't bomb out during an
UPDATE build. OK'ed by mar...@.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.5 -r1.6 src/distrib/sparc64/cdroms/installcd/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/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.18 src/distrib/i386/cdroms/Makefile.cdrom:1.19
--- src/distrib/i386/cdroms/Makefile.cdrom:1.18 Mon Apr 19 04:41:36 2010
+++ src/distrib/i386/cdroms/Makefile.cdrom Thu Apr 22 11:58:59 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.18 2010/04/19 04:41:36 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.19 2010/04/22 11:58:59 he Exp $
.include <bsd.own.mk>
@@ -58,10 +58,9 @@
${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
- ${CP} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
- ${CP} ${.CURDIR}/../etc.rc cdrom/etc/rc
- ${CP} ${.CURDIR}/../install.sh cdrom/install.sh
- ${CHMOD} 0555 cdrom/install.sh
+ ${INSTALL_FILE} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
+ ${INSTALL_FILE} ${.CURDIR}/../etc.rc cdrom/etc/rc
+ ${INSTALL_FILE} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
${MKDIR} cdrom/mnt2 cdrom/targetroot
${CP} ${SYSINSTDIR}/sysinst cdrom
${CHMOD} ugo+rx cdrom/sysinst
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.5 src/distrib/sparc64/cdroms/installcd/Makefile:1.6
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.5 Sun Apr 18 16:10:03 2010
+++ src/distrib/sparc64/cdroms/installcd/Makefile Thu Apr 22 11:58:59 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/04/18 16:10:03 martin Exp $
+# $NetBSD: Makefile,v 1.6 2010/04/22 11:58:59 he Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -60,14 +60,14 @@
${CP} ${.CURDIR}/../../../common/99-print-sysinst cdrom/libexec/dhcpcd-hooks
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
- ${CP} ${.CURDIR}/etc.ttys cdrom/etc/ttys
- ${CP} ${.CURDIR}/etc.rc cdrom/etc/rc
- ${CP} ${.CURDIR}/install.sh cdrom/install.sh
- ${CHMOD} 0555 cdrom/install.sh
+ ${INSTALL_FILE} ${.CURDIR}/etc.ttys cdrom/etc/ttys
+ ${INSTALL_FILE} ${.CURDIR}/etc.rc cdrom/etc/rc
+ ${INSTALL_FILE} -m 0555 ${.CURDIR}/install.sh cdrom/install.sh
${MKDIR} cdrom/mnt2 cdrom/targetroot
- ${CP} ${SYSINSTDIR}/sysinst cdrom
- ${CHMOD} ugo+rx cdrom/sysinst
- ${CP} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
+ ${INSTALL_FILE} -m 0555 ${SYSINSTDIR}/sysinst cdrom
+ for f in ${SYSINSTDIR}/sysinstmsgs.??; do \
+ ${INSTALL_FILE} $$f cdrom; \
+ done
${MKDIR} cdrom/var
${MKDIR} cdrom/kern
${CP} ${RELEASEDIR}/sparc64/binary/kernel/netbsd-GENERIC.gz cdrom/netbsd
