Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Introduce .WAIT into the cleandir rule for blasting...



details:   https://anonhg.NetBSD.org/src/rev/3d5a726da679
branches:  trunk
changeset: 755195:3d5a726da679
user:      dholland <dholland%NetBSD.org@localhost>
date:      Thu May 27 06:58:12 2010 +0000

description:
Introduce .WAIT into the cleandir rule for blasting the libsa/libkern/etc.
trees, because it can race with the libsa/libkern/etc. makefiles' own
cleandir rules. I think I've found all of the uses of the offending idiom...
Closes PR 43360.

diffstat:

 sys/arch/arc/stand/boot/Makefile             |  4 ++--
 sys/arch/atari/stand/libsa/Makefile          |  4 ++--
 sys/arch/bebox/stand/common/Makefile         |  4 ++--
 sys/arch/cobalt/stand/boot/Makefile          |  4 ++--
 sys/arch/evbarm/stand/gzboot/Makefile.gzboot |  4 ++--
 sys/arch/ews4800mips/stand/Makefile.bootxx   |  4 ++--
 sys/arch/ews4800mips/stand/boot/Makefile     |  4 ++--
 sys/arch/i386/stand/Makefile.booters         |  4 ++--
 sys/arch/i386/stand/boot/Makefile            |  4 ++--
 sys/arch/i386/stand/boot/Makefile.boot       |  4 ++--
 sys/arch/i386/stand/bootxx/Makefile          |  4 ++--
 sys/arch/i386/stand/bootxx/Makefile.bootxx   |  4 ++--
 sys/arch/i386/stand/netboot/Makefile         |  4 ++--
 sys/arch/ia64/stand/ia64/Makefile.booters    |  4 ++--
 sys/arch/landisk/stand/Makefile.bootprogs    |  4 ++--
 sys/arch/landisk/stand/boot/Makefile         |  4 ++--
 sys/arch/landisk/stand/bootxx/Makefile       |  4 ++--
 sys/arch/macppc/stand/ofwboot/Makefile       |  4 ++--
 sys/arch/mipsco/stand/Makefile.booters       |  4 ++--
 sys/arch/news68k/stand/common/Makefile       |  4 ++--
 sys/arch/pmax/stand/Makefile.booters         |  4 ++--
 sys/arch/prep/stand/common/Makefile          |  4 ++--
 sys/arch/rs6000/stand/common/Makefile        |  4 ++--
 sys/arch/sandpoint/stand/netboot/Makefile    |  4 ++--
 sys/arch/sgimips/stand/boot/Makefile         |  4 ++--
 sys/arch/sgimips/stand/boot64/Makefile       |  4 ++--
 sys/arch/sparc/stand/Makefile.buildboot      |  4 ++--
 sys/arch/sparc/stand/ofwboot/Makefile        |  4 ++--
 sys/arch/sun68k/stand/libsa/Makefile         |  4 ++--
 sys/arch/zaurus/stand/zboot/Makefile         |  4 ++--
 30 files changed, 60 insertions(+), 60 deletions(-)

diffs (truncated from 539 to 300 lines):

diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/arc/stand/boot/Makefile
--- a/sys/arch/arc/stand/boot/Makefile  Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/arc/stand/boot/Makefile  Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/04/03 10:38:12 tsutsui Exp $
+# $NetBSD: Makefile,v 1.9 2010/05/27 06:58:12 dholland Exp $
 
 .include <bsd.own.mk>
 .include <bsd.sys.mk>  # for ${HOST_SH}
@@ -59,7 +59,7 @@
 
 LIBS=  ${LIBSA} ${LIBKERN} ${LIBZ}
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 cleanlibdir:
        -rm -rf lib
 
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/atari/stand/libsa/Makefile
--- a/sys/arch/atari/stand/libsa/Makefile       Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/atari/stand/libsa/Makefile       Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.30 2009/03/31 11:42:07 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.31 2010/05/27 06:58:13 dholland Exp $
 
 # Logically src/sys
 S!=    cd ${.CURDIR}/../../../..; pwd
@@ -24,7 +24,7 @@
 
 realall: ${LIBS}
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/bebox/stand/common/Makefile
--- a/sys/arch/bebox/stand/common/Makefile      Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/bebox/stand/common/Makefile      Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2008/05/26 16:36:09 kiyohara Exp $
+#      $NetBSD: Makefile,v 1.2 2010/05/27 06:58:13 dholland Exp $
 
 S= ${.CURDIR}/../../../..
 
@@ -46,7 +46,7 @@
 
 realall: machine-links ${LIBS}
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/cobalt/stand/boot/Makefile
--- a/sys/arch/cobalt/stand/boot/Makefile       Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/cobalt/stand/boot/Makefile       Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.20 2010/01/19 15:28:51 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.21 2010/05/27 06:58:13 dholland Exp $
 
 NOMAN= # defined
 
@@ -107,7 +107,7 @@
 
 CLEANFILES+=   ${PROG}.map ${PROG}.elf ${PROG}.gz
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/evbarm/stand/gzboot/Makefile.gzboot
--- a/sys/arch/evbarm/stand/gzboot/Makefile.gzboot      Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/evbarm/stand/gzboot/Makefile.gzboot      Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.gzboot,v 1.15 2009/01/12 07:45:24 tsutsui Exp $
+#      $NetBSD: Makefile.gzboot,v 1.16 2010/05/27 06:58:13 dholland Exp $
 
 NOMAN=  # defined
 
@@ -85,7 +85,7 @@
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=         ${SALIB}
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/ews4800mips/stand/Makefile.bootxx
--- a/sys/arch/ews4800mips/stand/Makefile.bootxx        Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/ews4800mips/stand/Makefile.bootxx        Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bootxx,v 1.4 2009/03/15 06:17:02 tsutsui Exp $
+#      $NetBSD: Makefile.bootxx,v 1.5 2010/05/27 06:58:13 dholland Exp $
 
 NOMAN          =
 
@@ -53,7 +53,7 @@
        ls -al ${PROG}
 #      -rm -f ${BASE}.tmp
 
-clean cleandir distclean: cleanlibdir
+clean cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/ews4800mips/stand/boot/Makefile
--- a/sys/arch/ews4800mips/stand/boot/Makefile  Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/ews4800mips/stand/boot/Makefile  Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2009/04/03 10:38:12 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.11 2010/05/27 06:58:13 dholland Exp $
 
 WARNS          ?= 1
 NOMAN          =
@@ -99,7 +99,7 @@
 coffhdrfix:    ${COMMON}/coffhdrfix.c
        ${HOST_CC} -o ${COFFHDRFIX} ${COMMON}/coffhdrfix.c
 
-clean cleandir distclean: cleanlibdir
+clean cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/i386/stand/Makefile.booters
--- a/sys/arch/i386/stand/Makefile.booters      Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/i386/stand/Makefile.booters      Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.booters,v 1.78 2009/03/30 09:22:52 tsutsui Exp $
+#      $NetBSD: Makefile.booters,v 1.79 2010/05/27 06:58:13 dholland Exp $
 
 .include <bsd.own.mk>
 
@@ -91,7 +91,7 @@
 .include "${I386DIR}/Makefile.inc"
 LIBI386=               ${I386LIB}
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/i386/stand/boot/Makefile
--- a/sys/arch/i386/stand/boot/Makefile Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/i386/stand/boot/Makefile Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/11/14 14:03:12 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2010/05/27 06:58:13 dholland Exp $
 
 SUBDIR= biosboot
 
@@ -8,7 +8,7 @@
 .include <bsd.subdir.mk>
 .include <bsd.obj.mk>
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/i386/stand/boot/Makefile.boot
--- a/sys/arch/i386/stand/boot/Makefile.boot    Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/i386/stand/boot/Makefile.boot    Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.43 2010/05/23 13:59:12 veego Exp $
+# $NetBSD: Makefile.boot,v 1.44 2010/05/27 06:58:14 dholland Exp $
 
 S=     ${.CURDIR}/../../../../..
 
@@ -127,7 +127,7 @@
 LIBZ= ${ZLIB}
 
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/i386/stand/bootxx/Makefile
--- a/sys/arch/i386/stand/bootxx/Makefile       Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/i386/stand/bootxx/Makefile       Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/11/14 14:03:12 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2010/05/27 06:58:14 dholland Exp $
 
 SUBDIR=        bootxx_cd9660 bootxx_ffsv1 .WAIT bootxx_ffsv2 bootxx_lfsv1 bootxx_lfsv2
 SUBDIR+=bootxx_msdos bootxx_ustarfs
@@ -9,7 +9,7 @@
 .include <bsd.subdir.mk>
 .include <bsd.obj.mk>
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/i386/stand/bootxx/Makefile.bootxx
--- a/sys/arch/i386/stand/bootxx/Makefile.bootxx        Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/i386/stand/bootxx/Makefile.bootxx        Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.38 2009/11/30 21:40:35 dsl Exp $
+# $NetBSD: Makefile.bootxx,v 1.39 2010/05/27 06:58:14 dholland Exp $
 
 S=     ${.CURDIR}/../../../../..
 
@@ -124,7 +124,7 @@
 LIBKERN=        ${KERNLIB}
 
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/i386/stand/netboot/Makefile
--- a/sys/arch/i386/stand/netboot/Makefile      Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/i386/stand/netboot/Makefile      Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.30 2005/12/11 12:17:49 christos Exp $
+#      $NetBSD: Makefile,v 1.31 2010/05/27 06:58:14 dholland Exp $
 
 SUBDIR+=       3c509
 SUBDIR+=       .WAIT
@@ -16,7 +16,7 @@
 .include <bsd.subdir.mk>
 .include <bsd.obj.mk>
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/ia64/stand/ia64/Makefile.booters
--- a/sys/arch/ia64/stand/ia64/Makefile.booters Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/ia64/stand/ia64/Makefile.booters Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.booters,v 1.3 2009/07/20 04:59:03 kiyohara Exp $
+#      $NetBSD: Makefile.booters,v 1.4 2010/05/27 06:58:14 dholland Exp $
 
 .include <bsd.own.mk>
 
@@ -63,7 +63,7 @@
 LIBSA=         ${SALIB}
 
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/landisk/stand/Makefile.bootprogs
--- a/sys/arch/landisk/stand/Makefile.bootprogs Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/landisk/stand/Makefile.bootprogs Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.3 2009/05/03 15:12:12 tsutsui Exp $
+# $NetBSD: Makefile.bootprogs,v 1.4 2010/05/27 06:58:14 dholland Exp $
 
 S=             ${.CURDIR}/../../../../..
 
@@ -57,7 +57,7 @@
 .include "${S}/lib/libz/Makefile.inc"
 LIBZ= ${ZLIB}
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/landisk/stand/boot/Makefile
--- a/sys/arch/landisk/stand/boot/Makefile      Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/landisk/stand/boot/Makefile      Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/11/14 14:09:54 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2010/05/27 06:58:14 dholland Exp $
 
 SUBDIR= boot
 
@@ -8,7 +8,7 @@
 .include <bsd.subdir.mk>
 .include <bsd.obj.mk>
 
-cleandir distclean: cleanlibdir
+cleandir distclean: .WAIT cleanlibdir
 
 cleanlibdir:
        -rm -rf lib
diff -r 19bb306ad08c -r 3d5a726da679 sys/arch/landisk/stand/bootxx/Makefile
--- a/sys/arch/landisk/stand/bootxx/Makefile    Thu May 27 05:53:35 2010 +0000
+++ b/sys/arch/landisk/stand/bootxx/Makefile    Thu May 27 06:58:12 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/13 14:55:20 tsutsui Exp $
+# $NetBSD: Makefile,v 1.6 2010/05/27 06:58:14 dholland Exp $
 
 SUBDIR=        bootxx_ffsv1 .WAIT bootxx_ffsv2 bootxx_ustarfs
 
@@ -8,7 +8,7 @@
 .include <bsd.subdir.mk>
 .include <bsd.obj.mk>



Home | Main Index | Thread Index | Old Index