[src/trunk]: src/distrib Change use of ${CP} and ${CHMOD} to ${INSTALL_FILE}, ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/11e424d9803c
branches:  trunk
changeset: 754161:11e424d9803c
user:      he <he%NetBSD.org@localhost>
date:      Thu Apr 22 11:58:59 2010 +0000

description:
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 martin@.

diffstat:

 distrib/i386/cdroms/Makefile.cdrom        |   9 ++++-----
 distrib/sparc64/cdroms/installcd/Makefile |  16 ++++++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diffs (54 lines):

diff -r 3ee655da95fc -r 11e424d9803c distrib/i386/cdroms/Makefile.cdrom
--- a/distrib/i386/cdroms/Makefile.cdrom        Thu Apr 22 08:45:55 2010 +0000
+++ b/distrib/i386/cdroms/Makefile.cdrom        Thu Apr 22 11:58:59 2010 +0000
@@ -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
diff -r 3ee655da95fc -r 11e424d9803c distrib/sparc64/cdroms/installcd/Makefile
--- a/distrib/sparc64/cdroms/installcd/Makefile Thu Apr 22 08:45:55 2010 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile Thu Apr 22 11:58:59 2010 +0000
@@ -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