Module Name: src
Committed By: riz
Date: Fri Feb 17 00:08:38 UTC 2012
Modified Files:
src/distrib/sets [netbsd-6]: sets.subr
src/share/mk [netbsd-6]: bsd.kmodule.mk
src/sys/conf [netbsd-6]: osrelease.sh
Log Message:
Pull up following revision(s) (requested by christos in ticket #6):
distrib/sets/sets.subr: revision 1.136
share/mk/bsd.kmodule.mk: revision 1.34
sys/conf/osrelease.sh: revision 1.122
Add new -k (for kernel modules) flag to return MM.99.pp for current and MM.mm
for the release branch.
use osrelease -k to avoid that the path is 6.0_BETA
use osrelease.sh -k instead of hand-rolled logic.
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.135.2.1 src/distrib/sets/sets.subr
cvs rdiff -u -r1.33 -r1.33.4.1 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.120.18.1 -r1.120.18.2 src/sys/conf/osrelease.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.135 src/distrib/sets/sets.subr:1.135.2.1
--- src/distrib/sets/sets.subr:1.135 Tue Feb 7 19:13:24 2012
+++ src/distrib/sets/sets.subr Fri Feb 17 00:08:37 2012
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.135 2012/02/07 19:13:24 joerg Exp $
+# $NetBSD: sets.subr,v 1.135.2.1 2012/02/17 00:08:37 riz Exp $
#
#
@@ -159,11 +159,7 @@ nlists="base comp etc games man misc $mo
xlists="xbase xcomp xetc xfont xserver"
extlists="extbase extcomp extetc"
-OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -n`
-# for release branches, use X.Y version, for -current use X.Y.Z
-if [ ! "${OSRELEASE%.99}" = "${OSRELEASE}" ]; then
- OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
-fi
+OSRELEASE=$(${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -k)
MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules"
SUBST="s#@MODULEDIR@#${MODULEDIR}#g"
SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g"
@@ -176,7 +172,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.135 2012/02/07 19:13:24 joerg Exp $
+# # $NetBSD: sets.subr,v 1.135.2.1 2012/02/17 00:08:37 riz Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -500,7 +496,7 @@ echo_if_exist_foreach()
print_set_lists()
{
for setname; do
- list=`list_set_lists $setname`
+ list=$(list_set_lists $setname)
for l in $list; do
echo $l
if $verbose; then
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.33 src/share/mk/bsd.kmodule.mk:1.33.4.1
--- src/share/mk/bsd.kmodule.mk:1.33 Sun Sep 11 18:38:03 2011
+++ src/share/mk/bsd.kmodule.mk Fri Feb 17 00:08:37 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.33 2011/09/11 18:38:03 mbalmer Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.33.4.1 2012/02/17 00:08:37 riz Exp $
# We are not building this with PIE
MKPIE=no
@@ -85,7 +85,7 @@ ${PROG}: ${OBJS} ${DPADD}
##### Install rules
.if !target(kmodinstall)
.if !defined(KMODULEDIR)
-_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
+_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh -k
# Ensure these are recorded properly in METALOG on unprived installes:
KMODULEARCHDIR?= ${MACHINE}
_INST_DIRS= ${DESTDIR}/stand/${KMODULEARCHDIR}
Index: src/sys/conf/osrelease.sh
diff -u src/sys/conf/osrelease.sh:1.120.18.1 src/sys/conf/osrelease.sh:1.120.18.2
--- src/sys/conf/osrelease.sh:1.120.18.1 Thu Feb 16 18:59:42 2012
+++ src/sys/conf/osrelease.sh Fri Feb 17 00:08:38 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: osrelease.sh,v 1.120.18.1 2012/02/16 18:59:42 riz Exp $
+# $NetBSD: osrelease.sh,v 1.120.18.2 2012/02/17 00:08:38 riz Exp $
#
# Copyright (c) 1997 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -54,6 +54,7 @@ done
# return the next major number (e.g. for 5.99.nn, return 6)
# -n: return MM.mm
# -s: return MMmmpp (no dots)
+# -k: return MM.mm on release branch, MM.mm.pp on current.
option="$1"
@@ -74,6 +75,16 @@ IFS=' '
set -- $rel_MM ${rel_mm#0}$beta $*
case "$option" in
+-k)
+ if [ ${rel_mm#0} = 99 ]
+ then
+ IFS=.
+ echo "$*"
+ else
+ echo "${rel_MM}.${rel_mm#0}"
+ fi
+ ;;
+
-m)
echo "$(((${rel_MMmm}+1)/100))"
;;
