Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib - don't pull in <bsd.prog.mk> in Makefile.mdset; do ...
details: https://anonhg.NetBSD.org/src/rev/60d001cdcdf4
branches: trunk
changeset: 525487:60d001cdcdf4
user: lukem <lukem%NetBSD.org@localhost>
date: Fri Apr 12 05:33:58 2002 +0000
description:
- don't pull in <bsd.prog.mk> in Makefile.mdset; do that in the caller instead
- renamed optional post-strip action variable from ${KERNEL}.post to
netbsd.${KERNEL}.post
diffstat:
distrib/acorn32/kernels/Makefile | 6 ++++--
distrib/alpha/instkernel/instkernel/Makefile | 6 ++++--
distrib/cats/instkernel/Makefile | 10 ++++++----
distrib/common/Makefile.mdset | 13 +++++--------
distrib/hp300/instkernel/Makefile | 4 +++-
distrib/hpcmips/Makefile | 4 +++-
distrib/i386/floppies/kernel-ramdisk/Makefile | 4 +++-
distrib/i386/floppies/kernel-rescue/Makefile | 4 +++-
distrib/mac68k/instkernel/instkernel/Makefile | 4 +++-
distrib/macppc/floppies/md-kernel/Makefile | 4 +++-
distrib/mvme68k/instkernel/Makefile | 4 +++-
distrib/news68k/floppies/ramdisk-kernel/Makefile | 6 ++++--
distrib/playstation2/Makefile | 6 ++++--
distrib/prep/floppies/kernel-ramdisk/Makefile | 6 ++++--
distrib/sandpoint/floppies/md-kernel/Makefile | 6 ++++--
distrib/shark/instkernel/instkernel/Makefile | 12 +++++++-----
distrib/vax/ramdisk-kernel/Makefile | 6 ++++--
17 files changed, 67 insertions(+), 38 deletions(-)
diffs (truncated from 335 to 300 lines):
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/acorn32/kernels/Makefile
--- a/distrib/acorn32/kernels/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/acorn32/kernels/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2002/04/11 15:34:59 lukem Exp $
+# $NetBSD: Makefile,v 1.11 2002/04/12 05:34:01 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
-TARGETS= INSTALL ${RAMDISK}
+TARGETS= INSTALL ${RAMDISK}
MDSETDIR= binary/kernel
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/alpha/instkernel/instkernel/Makefile
--- a/distrib/alpha/instkernel/instkernel/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/alpha/instkernel/instkernel/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2002/04/11 15:34:52 lukem Exp $
+# $NetBSD: Makefile,v 1.21 2002/04/12 05:33:58 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
-TARGETS= INSTALL ${RAMDISK}
+TARGETS= INSTALL ${RAMDISK}
MDSETDIR= binary/kernel
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/cats/instkernel/Makefile
--- a/distrib/cats/instkernel/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/cats/instkernel/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/04/11 22:53:02 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2002/04/12 05:33:59 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
@@ -7,10 +7,12 @@
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
TARGETS= INSTALL ${RAMDISK}
-INSTALL.post= OBJCOPY=${OBJCOPY:Q} SIZE=${SIZE:Q} \
- ${KERNSRCDIR}/arch/arm/conf/elf2aout.sh \
- netbsd.tmp netbsd.tmp
+netbsd.INSTALL.post= OBJCOPY=${OBJCOPY:Q} SIZE=${SIZE:Q} \
+ ${KERNSRCDIR}/arch/arm/conf/elf2aout.sh \
+ netbsd.tmp netbsd.tmp
MDSETDIR= binary/kernel
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/common/Makefile.mdset
--- a/distrib/common/Makefile.mdset Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/common/Makefile.mdset Fri Apr 12 05:33:58 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mdset,v 1.1 2002/04/11 15:28:14 lukem Exp $
+# $NetBSD: Makefile.mdset,v 1.2 2002/04/12 05:34:01 lukem Exp $
#
# Makefile snippet to ${MDSETIMAGE} file system images into kernels
#
@@ -10,9 +10,8 @@
# KERNEL IMAGE
#
# Optional variables:
-# MDSETDIR where to install kernels
-# ${IMAGE}.post run on netbsd.tmp after ${MDSETIMAGE},${NM},${STRIP}
-#
+# MDSETDIR where to install kernels with "release" target
+# netbsd.${KERNEL}.post run after ${STRIP}; kernel is netbsd.tmp
#
.include <bsd.kernobj.mk>
@@ -29,8 +28,8 @@
${MDSETIMAGE} -v netbsd.tmp ${_IMAGE}
${NM} netbsd.tmp | gzip -9 > netbsd.${_KERNEL}.symbols.gz
${STRIP} netbsd.tmp
-.if defined(${_KERNEL}.post)
- ${${_KERNEL}.post}
+.if defined(netbsd.${_KERNEL}.post)
+ ${netbsd.${_KERNEL}.post}
.endif
gzip -9 netbsd.tmp
mv netbsd.tmp.gz ${.TARGET}
@@ -46,5 +45,3 @@
-mkdir -p ${RELEASEDIR}/${MDSETDIR}
${RELINSTALL} ${KERNELS} ${KERNELSYMS} ${RELEASEDIR}/${MDSETDIR}
.endif
-
-.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/hp300/instkernel/Makefile
--- a/distrib/hp300/instkernel/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/hp300/instkernel/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/04/11 15:34:54 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2002/04/12 05:33:59 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
@@ -10,3 +10,5 @@
MDSETDIR= binary/kernel
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/hpcmips/Makefile
--- a/distrib/hpcmips/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/hpcmips/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/04/11 15:34:54 lukem Exp $
+# $NetBSD: Makefile,v 1.15 2002/04/12 05:33:59 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
@@ -30,3 +30,5 @@
${MAKESUMS} -t ${ITARGET} '*.gz' '*.exe'
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/i386/floppies/kernel-ramdisk/Makefile
--- a/distrib/i386/floppies/kernel-ramdisk/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/i386/floppies/kernel-ramdisk/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/04/11 15:34:55 lukem Exp $
+# $NetBSD: Makefile,v 1.18 2002/04/12 05:33:59 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
@@ -23,3 +23,5 @@
MDSETDIR= binary/kernel
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/i386/floppies/kernel-rescue/Makefile
--- a/distrib/i386/floppies/kernel-rescue/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/i386/floppies/kernel-rescue/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/04/11 15:34:55 lukem Exp $
+# $NetBSD: Makefile,v 1.11 2002/04/12 05:33:59 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
@@ -17,3 +17,5 @@
INSTALL_TINY ${RAMDISK_T}
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/mac68k/instkernel/instkernel/Makefile
--- a/distrib/mac68k/instkernel/instkernel/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/mac68k/instkernel/instkernel/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/04/11 15:34:56 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2002/04/12 05:34:00 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
@@ -11,3 +11,5 @@
MDSETDIR= installation/instkernel
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/macppc/floppies/md-kernel/Makefile
--- a/distrib/macppc/floppies/md-kernel/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/macppc/floppies/md-kernel/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/04/11 15:34:56 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2002/04/12 05:34:00 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
@@ -11,3 +11,5 @@
MDSETDIR= binary/kernel
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/mvme68k/instkernel/Makefile
--- a/distrib/mvme68k/instkernel/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/mvme68k/instkernel/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/04/11 15:34:57 lukem Exp $
+# $NetBSD: Makefile,v 1.4 2002/04/12 05:34:00 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
@@ -10,3 +10,5 @@
MDSETDIR= installation/tapeimage
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/news68k/floppies/ramdisk-kernel/Makefile
--- a/distrib/news68k/floppies/ramdisk-kernel/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/news68k/floppies/ramdisk-kernel/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2002/04/11 15:34:57 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2002/04/12 05:34:00 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
-TARGETS= INSTALL ${RAMDISK}
+TARGETS= INSTALL ${RAMDISK}
MDSETDIR= binary/kernel
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/playstation2/Makefile
--- a/distrib/playstation2/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/playstation2/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2002/04/11 15:34:59 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2002/04/12 05:34:01 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
MINIROOTDIR!= cd ${.CURDIR}/../miniroot && ${PRINTOBJDIR}
MINIROOT= ${MINIROOTDIR}/ramdisk.fs
-TARGETS= RAMDISK ${MINIROOT}
+TARGETS= RAMDISK ${MINIROOT}
MDSETDIR= installation
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/prep/floppies/kernel-ramdisk/Makefile
--- a/distrib/prep/floppies/kernel-ramdisk/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/prep/floppies/kernel-ramdisk/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2002/04/11 15:34:58 lukem Exp $
+# $NetBSD: Makefile,v 1.4 2002/04/12 05:34:00 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
-TARGETS= INSTALL ${RAMDISK}
+TARGETS= INSTALL ${RAMDISK}
MDSETDIR= binary/kernel
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/sandpoint/floppies/md-kernel/Makefile
--- a/distrib/sandpoint/floppies/md-kernel/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/sandpoint/floppies/md-kernel/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2002/04/11 15:34:59 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2002/04/12 05:34:01 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
-TARGETS= INSTALL ${RAMDISK}
+TARGETS= INSTALL ${RAMDISK}
MDSETDIR= binary/kernel
.include "${DISTRIBDIR}/common/Makefile.mdset"
+
+.include <bsd.prog.mk>
diff -r dc19369cb310 -r 60d001cdcdf4 distrib/shark/instkernel/instkernel/Makefile
--- a/distrib/shark/instkernel/instkernel/Makefile Fri Apr 12 05:15:18 2002 +0000
+++ b/distrib/shark/instkernel/instkernel/Makefile Fri Apr 12 05:33:58 2002 +0000
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.5 2002/04/11 15:40:01 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2002/04/12 05:34:02 lukem Exp $
.include <bsd.own.mk>
.include "${_SRC_TOP_}/distrib/Makefile.inc"
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
Home |
Main Index |
Thread Index |
Old Index