[src/netbsd-2-0]: src/sys/arch Pull up revision 1.15 (requested by jmc in tic...

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

details:   https://anonhg.NetBSD.org/src/rev/c5ce2c6ce069
branches:  netbsd-2-0
changeset: 561558:c5ce2c6ce069
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 22 07:54:31 2004 +0000

description:
Pull up revision 1.15 (requested by jmc in ticket #531):
Ignore errors on some rm -rf's for platforms that aren't quite
POSIX compliant
and return errors on r/o source (FreeBSD) for -rf. Fixes PR#25022

diffstat:

 sys/arch/hpc/stand/Makefile            |  4 ++--
 sys/arch/i386/stand/boot/Makefile.boot |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 444325e8cbd6 -r c5ce2c6ce069 sys/arch/hpc/stand/Makefile
--- a/sys/arch/hpc/stand/Makefile       Tue Jun 22 07:54:06 2004 +0000
+++ b/sys/arch/hpc/stand/Makefile       Tue Jun 22 07:54:31 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2004/03/19 08:07:22 jmc Exp $
+#      $NetBSD: Makefile,v 1.13.2.1 2004/06/22 07:54:31 tron Exp $
 #
 
 .include <bsd.sys.mk>          # for HOST_SH
@@ -55,7 +55,7 @@
        rm -f hpc_stand.dsw hpc_stand.ncb hpc_stand.opt
        rm -f hpcboot/hpcboot.plg
 # compile directory
-       rm -rf compile/ARMDebug compile/ARMRelease                      \
+       -rm -rf compile/ARMDebug compile/ARMRelease                     \
        compile/SH*Debug compile/SH*Release                             \
        compile/MIPSDebug compile/MIPSRelease
        find . -name "hpcboot.exe" -print |xargs rm -f
diff -r 444325e8cbd6 -r c5ce2c6ce069 sys/arch/i386/stand/boot/Makefile.boot
--- a/sys/arch/i386/stand/boot/Makefile.boot    Tue Jun 22 07:54:06 2004 +0000
+++ b/sys/arch/i386/stand/boot/Makefile.boot    Tue Jun 22 07:54:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.14 2004/03/13 22:41:37 dsl Exp $
+# $NetBSD: Makefile.boot,v 1.14.2.1 2004/06/22 07:54:31 tron Exp $
 
 S=     ${.CURDIR}/../../../../../
 
@@ -130,7 +130,7 @@
 cleandir distclean: cleanlibdir
 
 cleanlibdir:
-       rm -rf lib
+       -rm -rf lib
 
 LIBLIST= ${LIBI386} ${LIBSA} ${LIBZ} ${LIBKERN} ${LIBI386} ${LIBSA}
 # LIBLIST= ${LIBSA} ${LIBKERN} ${LIBI386} ${LIBSA} ${LIBZ} ${LIBKERN}