Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/distrib Apply patch (requested by he):
details: https://anonhg.NetBSD.org/src/rev/3b2900248e4b
branches: netbsd-1-5
changeset: 492988:3b2900248e4b
user: he <he%NetBSD.org@localhost>
date: Mon Mar 25 17:32:42 2002 +0000
description:
Apply patch (requested by he):
Introduce dependency between ramdisk/miniroot construction and
osrelease.sh, to better support UPDATE builds of releases.
diffstat:
distrib/alpha/instkernel/Makefile.inc | 3 ++-
distrib/alpha/instkernel/ramdisk/Makefile | 4 ++--
distrib/amiga/floppies/Makefile.inc | 3 ++-
distrib/amiga/floppies/inst-common/Makefile.inc | 4 ++--
distrib/arm32/Makefile.inc | 3 ++-
distrib/arm32/ramdisk/Makefile | 4 ++--
distrib/bebox/floppies/Makefile.inc | 3 ++-
distrib/bebox/floppies/ramdisk/Makefile | 10 +++++-----
distrib/bebox/floppies/ramdisk/Makefile.inc | 4 ++--
distrib/i386/floppies/Makefile.inc | 3 ++-
distrib/i386/floppies/ramdisk-big/Makefile | 4 ++--
distrib/i386/floppies/ramdisk-small/Makefile | 4 ++--
distrib/i386/floppies/ramdisk-tiny/Makefile | 4 ++--
distrib/mac68k/instkernel/Makefile.inc | 3 ++-
distrib/mac68k/instkernel/ramdisk/Makefile | 4 ++--
distrib/macppc/floppies/Makefile.inc | 3 ++-
distrib/macppc/floppies/ramdisk/Makefile | 4 ++--
distrib/miniroot/Makefile | 5 +++--
distrib/mvme68k/ramdisk/Makefile | 4 ++--
distrib/news68k/floppies/Makefile.inc | 3 ++-
distrib/news68k/floppies/ramdisk/Makefile | 4 ++--
distrib/newsmips/floppies/Makefile.inc | 3 ++-
distrib/newsmips/floppies/ramdisk/Makefile | 4 ++--
distrib/pc532/floppies/Makefile.inc | 3 ++-
distrib/pc532/floppies/inst-common/Makefile.inc | 4 ++--
distrib/pmax/Makefile.inc | 3 ++-
distrib/pmax/ramdisk/Makefile | 4 ++--
distrib/sparc/Makefile.inc | 3 ++-
distrib/sparc/ramdisk/Makefile | 4 ++--
distrib/sparc64/xminiroot/Makefile | 6 ++++--
distrib/sun3/Makefile.inc | 3 ++-
distrib/sun3/common/Make.crunch | 4 ++--
distrib/vax/Makefile.inc | 3 ++-
distrib/vax/ramdisk/Makefile | 4 ++--
distrib/x68k/floppies/Makefile.inc | 3 ++-
distrib/x68k/floppies/ramdisk-common/Makefile.inc | 4 ++--
36 files changed, 78 insertions(+), 60 deletions(-)
diffs (truncated from 603 to 300 lines):
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/alpha/instkernel/Makefile.inc
--- a/distrib/alpha/instkernel/Makefile.inc Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/alpha/instkernel/Makefile.inc Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.1 1998/02/01 01:58:49 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.1.10.1 2002/03/25 17:32:42 he Exp $
REV!=sh ${.CURDIR}/../../../../sys/conf/osrelease.sh -s
VER!=sh ${.CURDIR}/../../../../sys/conf/osrelease.sh
+VERDEP= ${.CURDIR}/../../../../sys/conf/osrelease.sh
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/alpha/instkernel/ramdisk/Makefile
--- a/distrib/alpha/instkernel/ramdisk/Makefile Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/alpha/instkernel/ramdisk/Makefile Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/05/02 16:06:46 sjg Exp $
+# $NetBSD: Makefile,v 1.8.4.1 2002/03/25 17:32:45 he Exp $
TOP= ${.CURDIR}/..
@@ -49,7 +49,7 @@
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c ${VERDEP}
make -f ${CBIN}.mk all
clean cleandir distclean:
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/amiga/floppies/Makefile.inc
--- a/distrib/amiga/floppies/Makefile.inc Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/amiga/floppies/Makefile.inc Mon Mar 25 17:32:42 2002 +0000
@@ -1,3 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 1998/01/06 04:44:59 perry Exp $
+# $NetBSD: Makefile.inc,v 1.6.10.1 2002/03/25 17:32:51 he Exp $
REV!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh -s
+VERDEP= ${BSDSRCDIR}/sys/conf/osrelease.sh
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/amiga/floppies/inst-common/Makefile.inc
--- a/distrib/amiga/floppies/inst-common/Makefile.inc Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/amiga/floppies/inst-common/Makefile.inc Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.15 2000/05/02 16:06:46 sjg Exp $
+# $NetBSD: Makefile.inc,v 1.15.4.1 2002/03/25 17:32:52 he Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -42,7 +42,7 @@
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c ${VERDEP}
make -f ${CBIN}.mk all
clean cleandir distclean:
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/arm32/Makefile.inc
--- a/distrib/arm32/Makefile.inc Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/arm32/Makefile.inc Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.2 2000/06/16 19:28:26 matt Exp $
+# $NetBSD: Makefile.inc,v 1.2.2.1 2002/03/25 17:32:45 he Exp $
.include <bsd.own.mk>
REV!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh -s
+VERDEP= ${BSDSRCDIR}/sys/conf/osrelease.sh
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/arm32/ramdisk/Makefile
--- a/distrib/arm32/ramdisk/Makefile Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/arm32/ramdisk/Makefile Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11.4.2 2000/11/13 19:18:13 tv Exp $
+# $NetBSD: Makefile,v 1.11.4.3 2002/03/25 17:32:46 he Exp $
TOP= ${.CURDIR}/..
@@ -60,7 +60,7 @@
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -D ${TOP}/../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c ${VERDEP}
make -f ${CBIN}.mk all
clean cleandir distclean:
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/bebox/floppies/Makefile.inc
--- a/distrib/bebox/floppies/Makefile.inc Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/bebox/floppies/Makefile.inc Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2000/05/02 16:06:47 sjg Exp $
+# $NetBSD: Makefile.inc,v 1.2.4.1 2002/03/25 17:32:52 he Exp $
.include "../../../Makefile.inc"
@@ -6,4 +6,5 @@
# VER is revision with dots, as in "1.2C"
REV!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh -s
VER!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh
+VERDEP= ${BSDSRCDIR}/sys/conf/osrelease.sh
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/bebox/floppies/ramdisk/Makefile
--- a/distrib/bebox/floppies/ramdisk/Makefile Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/bebox/floppies/ramdisk/Makefile Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/05/02 16:06:47 sjg Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2002/03/25 17:32:53 he Exp $
TOP= ${.CURDIR}/..
@@ -26,13 +26,13 @@
DISKTYPE= floppy3
-install.sh: install.tmpl
+install.sh: install.tmpl ${VERDEP}
sed "s/@@VERSION@@/${VER}/" < ${.ALLSRC} > ${.TARGET}
-upgrade.sh: upgrade.tmpl
+upgrade.sh: upgrade.tmpl ${VERDEP}
sed "s/@@VERSION@@/${VER}/" < ${.ALLSRC} > ${.TARGET}
-start.sh: start.tmpl
+start.sh: start.tmpl ${VERDEP}
sed "s/@@VERSION@@/${VER}/" < ${.ALLSRC} > ${.TARGET}
all: ${AUXTARGETS} ${CBIN}
@@ -59,7 +59,7 @@
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c ${VERDEP}
make -f ${CBIN}.mk all
clean cleandir:
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/bebox/floppies/ramdisk/Makefile.inc
--- a/distrib/bebox/floppies/ramdisk/Makefile.inc Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/bebox/floppies/ramdisk/Makefile.inc Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2000/05/02 16:06:47 sjg Exp $
+# $NetBSD: Makefile.inc,v 1.4.4.1 2002/03/25 17:32:53 he Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -44,7 +44,7 @@
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c ${VERDEP}
make -f ${CBIN}.mk all
clean cleandir:
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/i386/floppies/Makefile.inc
--- a/distrib/i386/floppies/Makefile.inc Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/i386/floppies/Makefile.inc Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2000/05/29 05:37:06 matt Exp $
+# $NetBSD: Makefile.inc,v 1.12.2.1 2002/03/25 17:32:47 he Exp $
.include "../../../Makefile.inc"
@@ -6,3 +6,4 @@
# VER is revision with dots, as in "1.2C"
REV!=sh ${.CURDIR}/../../../../sys/conf/osrelease.sh -s
VER!=sh ${.CURDIR}/../../../../sys/conf/osrelease.sh
+VERDEP= ${.CURDIR}/../../../../sys/conf/osrelease.sh
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/i386/floppies/ramdisk-big/Makefile
--- a/distrib/i386/floppies/ramdisk-big/Makefile Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-big/Makefile Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.4 2001/08/06 21:27:15 he Exp $
+# $NetBSD: Makefile,v 1.1.2.5 2002/03/25 17:32:48 he Exp $
TOP= ${.CURDIR}/..
WARNS=1
@@ -58,7 +58,7 @@
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c ${VERDEP}
${MAKE} -f ${CBIN}.mk all
# This is listed in ramdiskbin.conf but is built here.
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/i386/floppies/ramdisk-small/Makefile
--- a/distrib/i386/floppies/ramdisk-small/Makefile Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-small/Makefile Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.2.4 2001/05/02 22:21:37 he Exp $
+# $NetBSD: Makefile,v 1.2.2.5 2002/03/25 17:32:48 he Exp $
TOP= ${.CURDIR}/..
WARNS=1
@@ -57,7 +57,7 @@
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c ${VERDEP}
${MAKE} -f ${CBIN}.mk all
# This is listed in ramdiskbin.conf but is built here.
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/i386/floppies/ramdisk-tiny/Makefile
--- a/distrib/i386/floppies/ramdisk-tiny/Makefile Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-tiny/Makefile Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.2 2002/02/09 20:33:58 he Exp $
+# $NetBSD: Makefile,v 1.1.2.3 2002/03/25 17:32:49 he Exp $
TOP= ${.CURDIR}/..
WARNS=1
@@ -57,7 +57,7 @@
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c ${VERDEP}
${MAKE} -f ${CBIN}.mk all
# This is listed in ramdiskbin.conf but is built here.
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/mac68k/instkernel/Makefile.inc
--- a/distrib/mac68k/instkernel/Makefile.inc Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/mac68k/instkernel/Makefile.inc Mon Mar 25 17:32:42 2002 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.2 2000/06/17 03:16:54 matt Exp $
+# $NetBSD: Makefile.inc,v 1.2.2.1 2002/03/25 17:32:54 he Exp $
.include <bsd.own.mk>
REV!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh -s
VER!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh
+VERDEP= ${BSDSRCDIR}/sys/conf/osrelease.sh
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/mac68k/instkernel/ramdisk/Makefile
--- a/distrib/mac68k/instkernel/ramdisk/Makefile Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/mac68k/instkernel/ramdisk/Makefile Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/06/11 11:06:24 fredb Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2002/03/25 17:32:54 he Exp $
.ifndef NOTESOBJDIR
NOTESOBJDIR!=cd ${.CURDIR}/../../../notes/mac68k; ${MAKE} ${MAKEFLAGS} -V .OBJDIR
@@ -52,7 +52,7 @@
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c ${VERDEP}
make -f ${CBIN}.mk all
clean cleandir distclean:
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/macppc/floppies/Makefile.inc
--- a/distrib/macppc/floppies/Makefile.inc Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/macppc/floppies/Makefile.inc Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2000/06/01 06:56:12 matt Exp $
+# $NetBSD: Makefile.inc,v 1.3.2.1 2002/03/25 17:32:55 he Exp $
.include "../../../Makefile.inc"
.include <bsd.own.mk>
@@ -7,3 +7,4 @@
# VER is revision with dots, as in "1.2C"
REV!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh -s
VER!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh
+VERDEP= ${BSDSRCDIR}/sys/conf/osrelease.sh
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/macppc/floppies/ramdisk/Makefile
--- a/distrib/macppc/floppies/ramdisk/Makefile Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/macppc/floppies/ramdisk/Makefile Mon Mar 25 17:32:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10.4.1 2001/05/02 23:06:35 he Exp $
+# $NetBSD: Makefile,v 1.10.4.2 2002/03/25 17:32:55 he Exp $
TOP= ${.CURDIR}/..
@@ -44,7 +44,7 @@
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c libhack.o
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c libhack.o ${VERDEP}
make -f ${CBIN}.mk all
HACKSRC=${TOP}/../../utils/libhack
diff -r 4154e0f96fdb -r 3b2900248e4b distrib/miniroot/Makefile
--- a/distrib/miniroot/Makefile Mon Mar 25 17:26:16 2002 +0000
+++ b/distrib/miniroot/Makefile Mon Mar 25 17:32:42 2002 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.32 2000/05/18 02:12:45 matt Exp $
+# $NetBSD: Makefile,v 1.32.4.1 2002/03/25 17:32:56 he Exp $
.include "../../Makefile.inc"
.include <bsd.own.mk>
.include <bsd.kernobj.mk>
REV!=sh ${.CURDIR}/../../sys/conf/osrelease.sh -s
+VERDEP= ${.CURDIR}/../../sys/conf/osrelease.sh
CBIN= instbin
ARCHDIR= ${.CURDIR}/../${MACHINE}/miniroot
@@ -69,7 +70,7 @@
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -D ${.CURDIR}/../.. -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
Home |
Main Index |
Thread Index |
Old Index