Module Name: src
Committed By: apb
Date: Tue Oct 16 08:23:21 UTC 2012
Modified Files:
src/distrib/amd64/ramdisks/common: Makefile.ramdisk
src/distrib/i386/ramdisks/common: Makefile.ramdisk
src/distrib/ofppc/ramdisks/common: Makefile.ramdisk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.10 -r1.11 src/distrib/i386/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.7 -r1.8 src/distrib/ofppc/ramdisks/common/Makefile.ramdisk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.9 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.10
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.9 Thu Feb 11 09:06:47 2010
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Tue Oct 16 08:23:20 2012
@@ -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 @@ DBG= -Os -fno-asynchronous-unwind-table
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} \
Index: src/distrib/i386/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.10 src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.11
--- src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.10 Sun Apr 10 16:45:52 2011
+++ src/distrib/i386/ramdisks/common/Makefile.ramdisk Tue Oct 16 08:23:21 2012
@@ -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 @@ WARNS= 1
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} \
Index: src/distrib/ofppc/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/ofppc/ramdisks/common/Makefile.ramdisk:1.7 src/distrib/ofppc/ramdisks/common/Makefile.ramdisk:1.8
--- src/distrib/ofppc/ramdisks/common/Makefile.ramdisk:1.7 Thu Feb 11 09:06:49 2010
+++ src/distrib/ofppc/ramdisks/common/Makefile.ramdisk Tue Oct 16 08:23:21 2012
@@ -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 @@ DBG= -Os -fno-asynchronous-unwind-table
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} \
