Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib use bsd.kernobj.mk to tell us KERNOBJDIR for compile...
details: https://anonhg.NetBSD.org/src/rev/7ceb9acafc2a
branches: trunk
changeset: 485656:7ceb9acafc2a
user: sjg <sjg%NetBSD.org@localhost>
date: Tue May 02 16:06:45 2000 +0000
description:
use bsd.kernobj.mk to tell us KERNOBJDIR for compiled kernels.
diffstat:
distrib/alpha/floppy-GENERIC/Makefile | 7 +++++--
distrib/alpha/instkernel/instkernel/Makefile | 7 +++++--
distrib/alpha/instkernel/ramdisk/Makefile | 3 ++-
distrib/alpha/rz25dist/Makefile | 9 +++++++--
distrib/amiga/floppies/inst-common/Makefile.inc | 3 ++-
distrib/amiga/miniroot/list | 4 ++--
distrib/arm32/floppies/inst-common/Makefile.inc | 3 ++-
distrib/arm32/ramdisk/Makefile | 3 ++-
distrib/bebox/floppies/Makefile.inc | 9 ++++++---
distrib/bebox/floppies/bootfloppy-common/Makefile.inc | 5 ++++-
distrib/bebox/floppies/bootfloppy/Makefile | 4 ++--
distrib/bebox/floppies/ramdisk/Makefile | 3 ++-
distrib/bebox/floppies/ramdisk/Makefile.inc | 3 ++-
distrib/hp300/miniroot/list | 4 ++--
distrib/i386/floppies/Makefile.inc | 8 +++++---
distrib/i386/floppies/bootfloppy-big/Makefile | 4 ++--
distrib/i386/floppies/bootfloppy-common/Makefile.inc | 5 ++++-
distrib/i386/floppies/bootfloppy-small/Makefile | 4 ++--
distrib/i386/floppies/bootfloppy-tiny/Makefile | 4 ++--
distrib/i386/floppies/bootfloppy/Makefile | 4 ++--
distrib/i386/floppies/fdset-common/Makefile.inc | 4 +++-
distrib/i386/floppies/fdset/Makefile | 4 ++--
distrib/i386/floppies/ramdisk/Makefile | 3 ++-
distrib/i386/floppies/ramdisk/Makefile.inc | 3 ++-
distrib/mac68k/instkernel/instkernel/Makefile | 7 +++++--
distrib/mac68k/instkernel/ramdisk/Makefile | 3 ++-
distrib/macppc/floppies/Makefile.inc | 8 +++++---
distrib/macppc/floppies/bootfloppy/Makefile | 6 ++++--
distrib/macppc/floppies/ramdisk/Makefile | 3 ++-
distrib/miniroot/Makefile | 4 ++--
distrib/mvme68k/Makefile.inc | 4 +++-
distrib/mvme68k/miniroot/list | 4 ++--
distrib/mvme68k/ramdisk/Makefile | 6 ++++--
distrib/news68k/floppies/Makefile.inc | 8 +++++---
distrib/news68k/floppies/bootfloppy/Makefile | 6 ++++--
distrib/news68k/floppies/ramdisk/Makefile | 3 ++-
distrib/newsmips/floppies/Makefile.inc | 8 +++++---
distrib/newsmips/floppies/bootfloppy/Makefile | 6 ++++--
distrib/newsmips/floppies/ramdisk/Makefile | 3 ++-
distrib/pc532/floppies/Makefile.inc | 4 +++-
distrib/pc532/floppies/inst-common/Makefile.inc | 8 +++++---
distrib/pmax/Makefile.inc | 8 +++++---
distrib/pmax/instkernel/Makefile | 7 +++++--
distrib/pmax/miniroot/list | 8 ++++----
distrib/pmax/ramdisk/Makefile | 3 ++-
distrib/sparc/bootfs.sysinst/Makefile | 5 +++--
distrib/sparc/bootfs/Makefile | 6 ++++--
distrib/sparc/ramdisk.sysinst/Makefile | 3 ++-
distrib/sparc/ramdisk/Makefile | 3 ++-
distrib/sparc64/miniroot/list | 4 ++--
distrib/sun3/Makefile.inc | 7 ++++---
distrib/vax/Makefile.inc | 4 +++-
distrib/vax/inst-common/Makefile.inc | 3 ++-
distrib/vax/miniroot/Makefile | 8 ++++++--
distrib/vax/ramdisk/Makefile | 3 ++-
distrib/vax/ramdisk/Makefile.inc | 3 ++-
distrib/x68k/floppies/Makefile.inc | 8 +++++---
distrib/x68k/floppies/bootfloppy-common/Makefile.inc | 5 ++++-
distrib/x68k/floppies/bootfloppy.sysinst/Makefile | 3 +--
distrib/x68k/floppies/bootfloppy/Makefile | 3 +--
distrib/x68k/floppies/ramdisk.sysinst/Makefile | 3 ++-
distrib/x68k/floppies/ramdisk/Makefile | 3 ++-
distrib/x68k/floppies/ramdisk/Makefile.inc | 3 ++-
63 files changed, 195 insertions(+), 109 deletions(-)
diffs (truncated from 1211 to 300 lines):
diff -r e45129671508 -r 7ceb9acafc2a distrib/alpha/floppy-GENERIC/Makefile
--- a/distrib/alpha/floppy-GENERIC/Makefile Tue May 02 14:30:14 2000 +0000
+++ b/distrib/alpha/floppy-GENERIC/Makefile Tue May 02 16:06:45 2000 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2000/02/01 05:02:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.11 2000/05/02 16:06:45 sjg Exp $
+
+.include "../../../Makefile.inc"
+.include <bsd.kernobj.mk>
MOUNT_POINT?= /mnt
VND?= vnd0
@@ -7,7 +10,7 @@
VND_CDEV= /dev/${VND}c
VND_CRDEV= /dev/r${VND}c
MDEC?= ${DESTDIR}/usr/mdec
-KERNEL?= ${.CURDIR}/../../../sys/arch/alpha/compile/GENERIC/netbsd
+KERNEL?= ${KERNOBJDIR}/GENERIC/netbsd
STRIP?= strip
GZKERNEL= netbsd
diff -r e45129671508 -r 7ceb9acafc2a distrib/alpha/instkernel/instkernel/Makefile
--- a/distrib/alpha/instkernel/instkernel/Makefile Tue May 02 14:30:14 2000 +0000
+++ b/distrib/alpha/instkernel/instkernel/Makefile Tue May 02 16:06:45 2000 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2000/02/01 05:02:32 tsutsui Exp $
+# $NetBSD: Makefile,v 1.10 2000/05/02 16:06:45 sjg Exp $
+
+.include "../../../../Makefile.inc"
RAMDISK!=cd ${.CURDIR}/../ramdisk; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk.fs\n" | \
${MAKE} -s -f-
-KERNEL?=${.CURDIR}/../../../../sys/arch/alpha/compile/INSTALL/netbsd
+KERNEL?=${KERNOBJDIR}/INSTALL/netbsd
STRIP?= strip # make STRIP=echo can be useful
all:
@@ -19,5 +21,6 @@
# nothing to do here
depend includes lint regress tags:
+.include <bsd.kernobj.mk>
.include <bsd.own.mk>
.include <bsd.obj.mk>
diff -r e45129671508 -r 7ceb9acafc2a distrib/alpha/instkernel/ramdisk/Makefile
--- a/distrib/alpha/instkernel/ramdisk/Makefile Tue May 02 14:30:14 2000 +0000
+++ b/distrib/alpha/instkernel/ramdisk/Makefile Tue May 02 16:06:45 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/06/27 22:37:21 christos Exp $
+# $NetBSD: Makefile,v 1.8 2000/05/02 16:06:46 sjg Exp $
TOP= ${.CURDIR}/..
@@ -29,6 +29,7 @@
mount ${VND_DEV} ${MOUNT_POINT}
mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+ KERNOBJDIR=${KERNOBJDIR} \
TARGDIR=${MOUNT_POINT} sh ${TOP}/src/runlist.sh ${.CURDIR}/${LISTS}
@echo chdir '$${.CURDIR}/../../../notes/alpha; make INSTALL.more'
@chdir ${.CURDIR}/../../../notes/alpha; make INSTALL.more
diff -r e45129671508 -r 7ceb9acafc2a distrib/alpha/rz25dist/Makefile
--- a/distrib/alpha/rz25dist/Makefile Tue May 02 14:30:14 2000 +0000
+++ b/distrib/alpha/rz25dist/Makefile Tue May 02 16:06:45 2000 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.23 1999/04/07 06:47:50 cgd Exp $
+# $NetBSD: Makefile,v 1.24 2000/05/02 16:06:46 sjg Exp $
+
+.include "../../../Makefile.inc"
# Make a distribution for the alpha, on a spare disk.
# This creates a large, gzipped disk image in ${.OBJDIR}
@@ -11,6 +13,8 @@
@false
.else
+KERNEL?= ${KERNOBJDIR}/GENERIC/netbsd
+
SECPERCYL= 343
CYLS= 1189
@@ -41,7 +45,7 @@
else \
true; \
fi
- cp ${.CURDIR}/../../../sys/arch/alpha/compile/GENERIC/netbsd ${DESTDIR}
+ cp ${KERNEL} ${DESTDIR}
ln -s gcc ${DESTDIR}/usr/local/bin/cc
(cd ${DESTDIR}/usr/libexec && ln -s \
../local/lib/gcc-lib/alpha-unknown-netbsd*/*/cpp .)
@@ -97,5 +101,6 @@
/bin/rm -f ${TARGETS}
/bin/rm -f mount-fs build-fs unmount-fs
+.include <bsd.kernobj.mk>
.include <bsd.own.mk>
.include <bsd.obj.mk>
diff -r e45129671508 -r 7ceb9acafc2a distrib/amiga/floppies/inst-common/Makefile.inc
--- a/distrib/amiga/floppies/inst-common/Makefile.inc Tue May 02 14:30:14 2000 +0000
+++ b/distrib/amiga/floppies/inst-common/Makefile.inc Tue May 02 16:06:45 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14 1999/05/11 20:46:58 veego Exp $
+# $NetBSD: Makefile.inc,v 1.15 2000/05/02 16:06:46 sjg Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -26,6 +26,7 @@
mount -t ffs ${VND_DEV} ${MOUNT_POINT}
mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+ KERNOBJDIR=${KERNOBJDIR} \
TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
@echo ""
@df -i ${MOUNT_POINT}
diff -r e45129671508 -r 7ceb9acafc2a distrib/amiga/miniroot/list
--- a/distrib/amiga/miniroot/list Tue May 02 14:30:14 2000 +0000
+++ b/distrib/amiga/miniroot/list Tue May 02 16:06:45 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.8 1999/07/04 11:46:23 mrg Exp $
+# $NetBSD: list,v 1.9 2000/05/02 16:06:46 sjg Exp $
# Amiga extra's
LINK instbin sbin/mount_ados
@@ -52,4 +52,4 @@
SPECIAL rmdir usr/share/zoneinfo
# Generic kernel
-COPY ${CURDIR}/../../sys/arch/amiga/compile/GENERIC/netbsd netbsd
+COPY ${KERNOBJDIR:-${CURDIR}/../../sys/arch/amiga/compile}/GENERIC/netbsd netbsd
diff -r e45129671508 -r 7ceb9acafc2a distrib/arm32/floppies/inst-common/Makefile.inc
--- a/distrib/arm32/floppies/inst-common/Makefile.inc Tue May 02 14:30:14 2000 +0000
+++ b/distrib/arm32/floppies/inst-common/Makefile.inc Tue May 02 16:06:45 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 1999/05/11 20:46:59 veego Exp $
+# $NetBSD: Makefile.inc,v 1.8 2000/05/02 16:06:46 sjg Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -25,6 +25,7 @@
mount ${VND_DEV} ${MOUNT_POINT}
mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+ KERNOBJDIR=${KERNOBJDIR} \
TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
@echo ""
@df -i ${MOUNT_POINT}
diff -r e45129671508 -r 7ceb9acafc2a distrib/arm32/ramdisk/Makefile
--- a/distrib/arm32/ramdisk/Makefile Tue May 02 14:30:14 2000 +0000
+++ b/distrib/arm32/ramdisk/Makefile Tue May 02 16:06:45 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/06/26 06:50:20 cgd Exp $
+# $NetBSD: Makefile,v 1.11 2000/05/02 16:06:47 sjg Exp $
TOP= ${.CURDIR}/..
@@ -43,6 +43,7 @@
mount ${VND_DEV} ${MOUNT_POINT}
mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+ KERNOBJDIR=${KERNOBJDIR} \
TARGDIR=${MOUNT_POINT} sh ${.CURDIR}/runlist.sh ${.CURDIR}/${LISTS}
@echo ""
@df -i ${MOUNT_POINT}
diff -r e45129671508 -r 7ceb9acafc2a distrib/bebox/floppies/Makefile.inc
--- a/distrib/bebox/floppies/Makefile.inc Tue May 02 14:30:14 2000 +0000
+++ b/distrib/bebox/floppies/Makefile.inc Tue May 02 16:06:45 2000 +0000
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.1 1998/11/19 08:58:02 sakamoto Exp $
+# $NetBSD: Makefile.inc,v 1.2 2000/05/02 16:06:47 sjg Exp $
+
+.include "../../../Makefile.inc"
# REV is revision without dots, as in "12C"
# VER is revision with dots, as in "1.2C"
-REV!=sh ${.CURDIR}/../../../../sys/conf/osrelease.sh -s
-VER!=sh ${.CURDIR}/../../../../sys/conf/osrelease.sh
+REV!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh -s
+VER!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh
+
diff -r e45129671508 -r 7ceb9acafc2a distrib/bebox/floppies/bootfloppy-common/Makefile.inc
--- a/distrib/bebox/floppies/bootfloppy-common/Makefile.inc Tue May 02 14:30:14 2000 +0000
+++ b/distrib/bebox/floppies/bootfloppy-common/Makefile.inc Tue May 02 16:06:45 2000 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.3 1999/03/04 20:32:19 wrstuden Exp $
+# $NetBSD: Makefile.inc,v 1.4 2000/05/02 16:06:47 sjg Exp $
# TOP is assumed to be defined by Makefile including this one.
COMMONDIR= ${TOP}/bootfloppy-common
+.include <bsd.kernobj.mk>
+
MOUNT_POINT?= /mnt
VND?= vnd0
VND_DEV= /dev/${VND}a
@@ -38,6 +40,7 @@
newfs -B be -m 0 -o space -i ${INO_BYTES} -c 80 ${VND_RDEV} ${DISKTYPE}
mount ${VND_DEV} ${MOUNT_POINT}
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+ KERNOBJDIR=${KERNOBJDIR} \
TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
@echo ""
@df -i ${MOUNT_POINT}
diff -r e45129671508 -r 7ceb9acafc2a distrib/bebox/floppies/bootfloppy/Makefile
--- a/distrib/bebox/floppies/bootfloppy/Makefile Tue May 02 14:30:14 2000 +0000
+++ b/distrib/bebox/floppies/bootfloppy/Makefile Tue May 02 16:06:45 2000 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 1998/11/19 08:58:03 sakamoto Exp $
+# $NetBSD: Makefile,v 1.2 2000/05/02 16:06:47 sjg Exp $
TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
IMAGE= boot.fs
-KERN= ${.CURDIR}/../../../../sys/arch/bebox/compile/INSTALL/netbsd
+KERN= ${KERNOBJDIR}/INSTALL/netbsd
.include "${TOP}/bootfloppy-common/Makefile.inc"
diff -r e45129671508 -r 7ceb9acafc2a distrib/bebox/floppies/ramdisk/Makefile
--- a/distrib/bebox/floppies/ramdisk/Makefile Tue May 02 14:30:14 2000 +0000
+++ b/distrib/bebox/floppies/ramdisk/Makefile Tue May 02 16:06:45 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/05/11 20:46:59 veego Exp $
+# $NetBSD: Makefile,v 1.4 2000/05/02 16:06:47 sjg Exp $
TOP= ${.CURDIR}/..
@@ -43,6 +43,7 @@
mount ${VND_DEV} ${MOUNT_POINT}
mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+ KERNOBJDIR=${KERNOBJDIR} \
TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${.CURDIR}/${LISTS}
@echo ""
@df -i ${MOUNT_POINT}
diff -r e45129671508 -r 7ceb9acafc2a distrib/bebox/floppies/ramdisk/Makefile.inc
--- a/distrib/bebox/floppies/ramdisk/Makefile.inc Tue May 02 14:30:14 2000 +0000
+++ b/distrib/bebox/floppies/ramdisk/Makefile.inc Tue May 02 16:06:45 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 1999/05/11 20:46:59 veego Exp $
+# $NetBSD: Makefile.inc,v 1.4 2000/05/02 16:06:47 sjg Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -28,6 +28,7 @@
mount ${VND_DEV} ${MOUNT_POINT}
mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+ KERNOBJDIR=${KERNOBJDIR} \
TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
@echo ""
@df -i ${MOUNT_POINT}
diff -r e45129671508 -r 7ceb9acafc2a distrib/hp300/miniroot/list
--- a/distrib/hp300/miniroot/list Tue May 02 14:30:14 2000 +0000
+++ b/distrib/hp300/miniroot/list Tue May 02 16:06:45 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.4 1999/02/14 16:27:42 he Exp $
+# $NetBSD: list,v 1.5 2000/05/02 16:06:48 sjg Exp $
# hp300 extra's
LINK instbin sbin/disklabel
@@ -38,7 +38,7 @@
COPY ${CURDIR}/../../share/termcap/termcap.src usr/share/misc/termcap
# copy the kernel
-COPY ${CURDIR}/../../sys/arch/hp300/compile/GENERIC/netbsd netbsd
+COPY ${KERNOBJDIR:-${CURDIR}/../../sys/arch/hp300/compile}/GENERIC/netbsd netbsd
# various files that we need in /etc for the install
COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
diff -r e45129671508 -r 7ceb9acafc2a distrib/i386/floppies/Makefile.inc
--- a/distrib/i386/floppies/Makefile.inc Tue May 02 14:30:14 2000 +0000
+++ b/distrib/i386/floppies/Makefile.inc Tue May 02 16:06:45 2000 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.10 1997/06/14 18:56:01 perry Exp $
+# $NetBSD: Makefile.inc,v 1.11 2000/05/02 16:06:48 sjg Exp $
+
+.include "../../../Makefile.inc"
# REV is revision without dots, as in "12C"
# VER is revision with dots, as in "1.2C"
-REV!=sh ${.CURDIR}/../../../../sys/conf/osrelease.sh -s
-VER!=sh ${.CURDIR}/../../../../sys/conf/osrelease.sh
+REV!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh -s
+VER!=sh ${BSDSRCDIR}/sys/conf/osrelease.sh
diff -r e45129671508 -r 7ceb9acafc2a distrib/i386/floppies/bootfloppy-big/Makefile
--- a/distrib/i386/floppies/bootfloppy-big/Makefile Tue May 02 14:30:14 2000 +0000
+++ b/distrib/i386/floppies/bootfloppy-big/Makefile Tue May 02 16:06:45 2000 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 1999/03/23 18:10:58 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2000/05/02 16:06:48 sjg Exp $
TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
IMAGE= boot-big.fs
Home |
Main Index |
Thread Index |
Old Index