Module Name: src
Committed By: riz
Date: Thu Nov 3 17:55:16 UTC 2011
Modified Files:
src/distrib/sets [netbsd-5-1]: sets.subr
src/doc [netbsd-5-1]: CHANGES-5.1.1
src/sys/conf [netbsd-5-1]: osrelease.sh
Log Message:
Back out ticket #1681 - needs to be rethought, was causing build failures.
To generate a diff of this commit:
cvs rdiff -u -r1.71.2.5.6.1 -r1.71.2.5.6.2 src/distrib/sets/sets.subr
cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/doc/CHANGES-5.1.1
cvs rdiff -u -r1.115.14.1 -r1.115.14.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.71.2.5.6.1 src/distrib/sets/sets.subr:1.71.2.5.6.2
--- src/distrib/sets/sets.subr:1.71.2.5.6.1 Wed Nov 2 20:24:10 2011
+++ src/distrib/sets/sets.subr Thu Nov 3 17:55:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.71.2.5.6.1 2011/11/02 20:24:10 riz Exp $
+# $NetBSD: sets.subr,v 1.71.2.5.6.2 2011/11/03 17:55:15 riz Exp $
#
#
@@ -215,11 +215,7 @@ if [ "${MACHINE_ARCH}" = "m68000" ]; the
shlib=no # Turn off shlibs for some ports.
fi
-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`
MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules"
SUBST="s#@MODULEDIR@#${MODULEDIR}#g"
SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g"
@@ -232,7 +228,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.71.2.5.6.1 2011/11/02 20:24:10 riz Exp $
+# # $NetBSD: sets.subr,v 1.71.2.5.6.2 2011/11/03 17:55:15 riz Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
Index: src/doc/CHANGES-5.1.1
diff -u src/doc/CHANGES-5.1.1:1.1.2.37 src/doc/CHANGES-5.1.1:1.1.2.38
--- src/doc/CHANGES-5.1.1:1.1.2.37 Wed Nov 2 20:31:52 2011
+++ src/doc/CHANGES-5.1.1 Thu Nov 3 17:55:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1.1,v 1.1.2.37 2011/11/02 20:31:52 riz Exp $
+# $NetBSD: CHANGES-5.1.1,v 1.1.2.38 2011/11/03 17:55:15 riz Exp $
A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.1.1
release:
@@ -2540,12 +2540,6 @@ share/zoneinfo/zone.tab patch
Update to tzdata2011n.
[apb, ticket #1684]
-distrib/sets/sets.subr 1.133
-sys/conf/osrelease.sh 1.116-1.117
-
- Fix module path logic for release branches.
- [jmcneill, ticket #1681]
-
sys/arch/xen/xen/xbdback_xenbus.c 1.45 via patch
Guard against spurious xbdback_backend_changed() calls which
Index: src/sys/conf/osrelease.sh
diff -u src/sys/conf/osrelease.sh:1.115.14.1 src/sys/conf/osrelease.sh:1.115.14.2
--- src/sys/conf/osrelease.sh:1.115.14.1 Wed Nov 2 20:24:11 2011
+++ src/sys/conf/osrelease.sh Thu Nov 3 17:55:15 2011
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: osrelease.sh,v 1.115.14.1 2011/11/02 20:24:11 riz Exp $
+# $NetBSD: osrelease.sh,v 1.115.14.2 2011/11/03 17:55:15 riz Exp $
#
# Copyright (c) 1997 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -38,18 +38,13 @@ PARAMH="`dirname $0`"/../sys/param.h
release=`$AWK '/^#define[ ]*__NetBSD_Version__/ { print $6 }' $PARAMH`
# default: return nn.nn.nn
-# -m: return nn, representing only the major number; however, for -current,
-# return the next major number (e.g. for 5.99.nn, return 6)
-# -n: return nn.nn
+# -m: return the major number -- -current is the number of the next release
# -s: return nnnnnn (no dots)
case $1 in
-m)
echo $release | $AWK -F. '{print int($1+$2/100+0.01)}'
;;
--n)
- echo $release | $AWK -F. '{print $1 "." $2}'
- ;;
-s)
echo $release | $SED -e 's,\.,,g'
;;
