Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib In distrib/*/ramdisks/common/Makefile.ramdisk, allow...
details: https://anonhg.NetBSD.org/src/rev/7cbe3d63f47e
branches: trunk
changeset: 782106:7cbe3d63f47e
user: apb <apb%NetBSD.org@localhost>
date: Tue Oct 16 08:23:20 2012 +0000
description:
In distrib/*/ramdisks/common/Makefile.ramdisk, allow the caller to
pre-define the LISTS variable if they do not want it to include
${.CURDIR}/lists. This opens the possibility of making some of the
many distrib/*/ramdisks/*/lists files shared in the future.
XXX: Some of the differences between these files seem to be unnecessary.
diffstat:
distrib/amd64/ramdisks/common/Makefile.ramdisk | 7 +++++--
distrib/i386/ramdisks/common/Makefile.ramdisk | 8 +++++---
distrib/ofppc/ramdisks/common/Makefile.ramdisk | 7 +++++--
3 files changed, 15 insertions(+), 7 deletions(-)
diffs (64 lines):
diff -r e201f76a495f -r 7cbe3d63f47e distrib/amd64/ramdisks/common/Makefile.ramdisk
--- a/distrib/amd64/ramdisks/common/Makefile.ramdisk Tue Oct 16 08:19:36 2012 +0000
+++ b/distrib/amd64/ramdisks/common/Makefile.ramdisk Tue Oct 16 08:23:20 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.9 2010/02/11 09:06:47 roy Exp $
+# $NetBSD: Makefile.ramdisk,v 1.10 2012/10/16 08:23:20 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,7 +12,10 @@
CRUNCHGEN_FLAGS= -d "${DBG}"
CRUNCHBIN= ramdiskbin
-LISTS= ${.CURDIR}/list ${AMD64COMMON}/list.ramdisk
+
+# Use ${.CURDIR}/list only if LISTS was not already defined by the caller.
+LISTS?= ${.CURDIR}/list
+LISTS+= ${AMD64COMMON}/list.ramdisk
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= le
IMAGEDEPENDS+= ${CRUNCHBIN} \
diff -r e201f76a495f -r 7cbe3d63f47e distrib/i386/ramdisks/common/Makefile.ramdisk
--- a/distrib/i386/ramdisks/common/Makefile.ramdisk Tue Oct 16 08:19:36 2012 +0000
+++ b/distrib/i386/ramdisks/common/Makefile.ramdisk Tue Oct 16 08:23:20 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.10 2011/04/10 16:45:52 joerg Exp $
+# $NetBSD: Makefile.ramdisk,v 1.11 2012/10/16 08:23:21 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -11,8 +11,10 @@
DBG= -Os
CRUNCHBIN= ramdiskbin
-LISTS= ${I386COMMON}/list.ramdisk
-LISTS+= ${.CURDIR}/list
+
+# Use ${.CURDIR}/list only if LISTS was not already defined by the caller.
+LISTS?= ${.CURDIR}/list
+LISTS+= ${I386COMMON}/list.ramdisk
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= le
IMAGEDEPENDS+= ${CRUNCHBIN} \
diff -r e201f76a495f -r 7cbe3d63f47e distrib/ofppc/ramdisks/common/Makefile.ramdisk
--- a/distrib/ofppc/ramdisks/common/Makefile.ramdisk Tue Oct 16 08:19:36 2012 +0000
+++ b/distrib/ofppc/ramdisks/common/Makefile.ramdisk Tue Oct 16 08:23:20 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.7 2010/02/11 09:06:49 roy Exp $
+# $NetBSD: Makefile.ramdisk,v 1.8 2012/10/16 08:23:21 apb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -12,7 +12,10 @@
CRUNCHGEN_FLAGS= -d "${DBG}"
CRUNCHBIN= ramdiskbin
-LISTS= ${.CURDIR}/list ${OFPPCCOMMON}/list.ramdisk
+
+# Use ${.CURDIR}/list only if LISTS was not already defined by the caller.
+LISTS?= ${.CURDIR}/list
+LISTS+= ${OFPPCCOMMON}/list.ramdisk
MTREECONF= ${DISTRIBDIR}/common/mtree.common ${.CURDIR}/../common/mtree.ramdisk
IMAGEENDIAN= le
IMAGEDEPENDS+= ${CRUNCHBIN} \
Home |
Main Index |
Thread Index |
Old Index