[src/netbsd-6]: src/distrib Pull up following revision(s) (requested by marti...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/39a441e21fd0
branches:  netbsd-6
changeset: 773767:39a441e21fd0
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Feb 17 00:42:27 2012 +0000

description:
Pull up following revision(s) (requested by martin in ticket #6):
        distrib/common/Makefile.distrib: revision 1.9
        distrib/i386/kmod/Makefile: revision 1.11
        distrib/amd64/kmod/Makefile: revision 1.2
Use a new variable, MODULEVER, for kernel modules, tracking what's been
done elsewhere.

diffstat:

 distrib/amd64/kmod/Makefile     |  4 ++--
 distrib/common/Makefile.distrib |  3 ++-
 distrib/i386/kmod/Makefile      |  4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r 8827ac12458e -r 39a441e21fd0 distrib/amd64/kmod/Makefile
--- a/distrib/amd64/kmod/Makefile       Fri Feb 17 00:08:49 2012 +0000
+++ b/distrib/amd64/kmod/Makefile       Fri Feb 17 00:42:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2011/01/18 00:22:56 jym Exp $
+#      $NetBSD: Makefile,v 1.1.8.1 2012/02/17 00:42:28 riz Exp $
 
 .include <bsd.own.mk>
 .include "../../common/Makefile.distrib"
@@ -6,7 +6,7 @@
 MKMAN=         no
 PROG=          miniroot.kmod
 
-SRCMOD=                ${DESTDIR}/stand/${MACHINE}/${DISTRIBVER}/modules/miniroot/miniroot.kmod
+SRCMOD=                ${DESTDIR}/stand/${MACHINE}/${MODULEVER}/modules/miniroot/miniroot.kmod
 DSTMOD=                ${.OBJDIR}/miniroot.kmod
 RAMDISK=       ramdisk
 RAMDISKDIR!=   cd ${.CURDIR}/../ramdisks/${RAMDISK} && ${PRINTOBJDIR}
diff -r 8827ac12458e -r 39a441e21fd0 distrib/common/Makefile.distrib
--- a/distrib/common/Makefile.distrib   Fri Feb 17 00:08:49 2012 +0000
+++ b/distrib/common/Makefile.distrib   Fri Feb 17 00:42:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.distrib,v 1.8 2010/02/07 18:50:49 snj Exp $
+#      $NetBSD: Makefile.distrib,v 1.8.8.1 2012/02/17 00:42:27 riz Exp $
 #
 # Makefile snippet to setup various make variables variables used in distrib/:
 #
@@ -22,6 +22,7 @@
 DISTRIBDIR=    ${NETBSDSRCDIR}/distrib
 DISTRIBREV!=   ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -s
 DISTRIBVER!=   ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
+MODULEVER!=    ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -k
 DISTRIBVERDEP= ${NETBSDSRCDIR}/sys/sys/param.h \
                ${NETBSDSRCDIR}/sys/conf/osrelease.sh
 
diff -r 8827ac12458e -r 39a441e21fd0 distrib/i386/kmod/Makefile
--- a/distrib/i386/kmod/Makefile        Fri Feb 17 00:08:49 2012 +0000
+++ b/distrib/i386/kmod/Makefile        Fri Feb 17 00:42:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2009/04/03 22:36:35 perry Exp $
+#      $NetBSD: Makefile,v 1.10.8.1 2012/02/17 00:42:28 riz Exp $
 
 .include <bsd.own.mk>
 .include "../../common/Makefile.distrib"
@@ -6,7 +6,7 @@
 MKMAN=         no
 PROG=          miniroot.kmod
 
-SRCMOD=                ${DESTDIR}/stand/${MACHINE}/${DISTRIBVER}/modules/miniroot/miniroot.kmod
+SRCMOD=                ${DESTDIR}/stand/${MACHINE}/${MODULEVER}/modules/miniroot/miniroot.kmod
 DSTMOD=                ${.OBJDIR}/miniroot.kmod
 RAMDISK=       ramdisk-big
 RAMDISKDIR!=   cd ${.CURDIR}/../ramdisks/${RAMDISK} && ${PRINTOBJDIR}