Module Name: src
Committed By: mlelstv
Date: Sun Jan 13 14:43:24 UTC 2013
Modified Files:
src/distrib/common: Makefile.mdset
src/distrib/evbarm/gzboot/gzimg: Makefile
Log Message:
build.sh lets you build releases with a limited set of kernels by
using the ALL_KERNELS environment variable to override the arch default.
Fix this mechanism for evbarm by limiting the generated boot images
accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/distrib/common/Makefile.mdset
cvs rdiff -u -r1.22 -r1.23 src/distrib/evbarm/gzboot/gzimg/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.mdset
diff -u src/distrib/common/Makefile.mdset:1.35 src/distrib/common/Makefile.mdset:1.36
--- src/distrib/common/Makefile.mdset:1.35 Sat Jan 1 16:56:18 2011
+++ src/distrib/common/Makefile.mdset Sun Jan 13 14:43:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mdset,v 1.35 2011/01/01 16:56:18 jym Exp $
+# $NetBSD: Makefile.mdset,v 1.36 2013/01/13 14:43:23 mlelstv Exp $
#
# Makefile snippet to ${TOOL_MDSETIMAGE} file system images into kernels
#
@@ -69,7 +69,10 @@ _MAKEFILE_MDSET_=1
.include <bsd.kernobj.mk>
+ALL_KERNELS?= "+"
.for _K _I _F in ${MDSETTARGETS} # {
+.for currentsel in ${ALL_KERNELS} # {
+.if ${currentsel} == "+" || ${_K} == ${currentsel}
_KERNEL:=${_K} # (work around obscure issue in make(1))
.if (${_KERNEL:M*/*} != "")
@@ -166,6 +169,8 @@ ${_KERNEL.${_K}.${_F}}.gz: ${_KERNEL.${_
gzip -9nc ${.ALLSRC} > ${.TARGET}
.endif # }
+.endif
+.endfor # }
.endfor # }
CLEANFILES+= ${KERNELS} ${KERNELSYMS}
@@ -174,6 +179,7 @@ realall: ${KERNELS}
.if defined(MDSET_RELEASEDIR)
release:: check_RELEASEDIR .WAIT ${KERNELS}
+ test -z "${KERNELS}" || \
${RELEASE_INSTALL} ${KERNELS} ${KERNELSYMS} \
${RELEASEDIR}/${RELEASEMACHINEDIR}/${MDSET_RELEASEDIR}
.endif
Index: src/distrib/evbarm/gzboot/gzimg/Makefile
diff -u src/distrib/evbarm/gzboot/gzimg/Makefile:1.22 src/distrib/evbarm/gzboot/gzimg/Makefile:1.23
--- src/distrib/evbarm/gzboot/gzimg/Makefile:1.22 Wed Apr 4 07:32:29 2012
+++ src/distrib/evbarm/gzboot/gzimg/Makefile Sun Jan 13 14:43:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/04/04 07:32:29 bsh Exp $
+# $NetBSD: Makefile,v 1.23 2013/01/13 14:43:23 mlelstv Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -62,7 +62,10 @@ TARGETS= ADI_BRH ADI_BRH ADI_BRH_sd0 \
0x00140000 netbsd-wd0
.endif
+ALL_KERNELS?= "+"
.for K G I R W in ${TARGETS} # {
+.for configsel in ${ALL_KERNELS} # {
+.if ${configsel} == "+" || ${configsel} == ${K}
GZB${G}= ${DESTDIR}/usr/mdec/gzboot_${G}_${R}.bin
@@ -86,6 +89,8 @@ GZKERNELS+= $K
.endif
KZ${K}+= gzimg_${I}_flash_${R}.gz
+.endif
+.endfor # }
.endfor # }
.for K in ${GZKERNELS}
