Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/sets try to match sys/kern/kern_module.c module path...
details: https://anonhg.NetBSD.org/src/rev/848e2c296e49
branches: trunk
changeset: 770551:848e2c296e49
user: jmcneill <jmcneill%NetBSD.org@localhost>
date: Sat Oct 22 00:05:17 2011 +0000
description:
try to match sys/kern/kern_module.c module path logic: for release branches,
use X.Y version (instead of eg. X.Y.0_PATCH or X.Y_STABLE) and for -current use X.Y.Z.
ok zafer@
diffstat:
distrib/sets/sets.subr | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diffs (31 lines):
diff -r 45a85b66674f -r 848e2c296e49 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr Fri Oct 21 23:47:11 2011 +0000
+++ b/distrib/sets/sets.subr Sat Oct 22 00:05:17 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.132 2011/05/20 16:02:22 plunky Exp $
+# $NetBSD: sets.subr,v 1.133 2011/10/22 00:05:17 jmcneill Exp $
#
#
@@ -159,7 +159,11 @@
xlists="xbase xcomp xetc xfont xserver"
extlists="extbase extcomp extetc"
-OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
+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
MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules"
SUBST="s#@MODULEDIR@#${MODULEDIR}#g"
SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g"
@@ -172,7 +176,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.132 2011/05/20 16:02:22 plunky Exp $
+# # $NetBSD: sets.subr,v 1.133 2011/10/22 00:05:17 jmcneill Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
Home |
Main Index |
Thread Index |
Old Index