Module Name: src Committed By: riz Date: Fri Feb 17 00:33:25 UTC 2012
Modified Files: src/distrib/amd64/kmod: Makefile src/distrib/common: Makefile.distrib src/distrib/i386/kmod: Makefile Log Message: Use a new variable, MODULEVER, for kernel modules, tracking what's been done elsewhere. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/kmod/Makefile cvs rdiff -u -r1.8 -r1.9 src/distrib/common/Makefile.distrib cvs rdiff -u -r1.10 -r1.11 src/distrib/i386/kmod/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/amd64/kmod/Makefile diff -u src/distrib/amd64/kmod/Makefile:1.1 src/distrib/amd64/kmod/Makefile:1.2 --- src/distrib/amd64/kmod/Makefile:1.1 Tue Jan 18 00:22:56 2011 +++ src/distrib/amd64/kmod/Makefile Fri Feb 17 00:33:24 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/01/18 00:22:56 jym Exp $ +# $NetBSD: Makefile,v 1.2 2012/02/17 00:33:24 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} Index: src/distrib/common/Makefile.distrib diff -u src/distrib/common/Makefile.distrib:1.8 src/distrib/common/Makefile.distrib:1.9 --- src/distrib/common/Makefile.distrib:1.8 Sun Feb 7 18:50:49 2010 +++ src/distrib/common/Makefile.distrib Fri Feb 17 00:33:25 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.distrib,v 1.8 2010/02/07 18:50:49 snj Exp $ +# $NetBSD: Makefile.distrib,v 1.9 2012/02/17 00:33:25 riz Exp $ # # Makefile snippet to setup various make variables variables used in distrib/: # @@ -22,6 +22,7 @@ _MAKEFILE_DISTRIB_=1 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 Index: src/distrib/i386/kmod/Makefile diff -u src/distrib/i386/kmod/Makefile:1.10 src/distrib/i386/kmod/Makefile:1.11 --- src/distrib/i386/kmod/Makefile:1.10 Fri Apr 3 22:36:35 2009 +++ src/distrib/i386/kmod/Makefile Fri Feb 17 00:33:25 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2009/04/03 22:36:35 perry Exp $ +# $NetBSD: Makefile,v 1.11 2012/02/17 00:33:25 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}