Module Name: src
Committed By: pgoyette
Date: Thu Jun 30 12:56:27 UTC 2016
Modified Files:
src/distrib/amd64: Makefile
src/distrib/amd64/ramdisks: Makefile
src/distrib/i386: Makefile
src/distrib/i386/ramdisks: Makefile
Log Message:
Omit cgd based ramdisks and miniroot modules if MKCRYPTO=no
Final part of PR kern/51282
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/amd64/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/ramdisks/Makefile
cvs rdiff -u -r1.11 -r1.12 src/distrib/i386/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/i386/ramdisks/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/Makefile
diff -u src/distrib/amd64/Makefile:1.10 src/distrib/amd64/Makefile:1.11
--- src/distrib/amd64/Makefile:1.10 Sun Jul 19 10:16:55 2015
+++ src/distrib/amd64/Makefile Thu Jun 30 12:56:27 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/07/19 10:16:55 martin Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/30 12:56:27 pgoyette Exp $
.include <bsd.own.mk>
@@ -8,8 +8,10 @@ SUBDIR+= .WAIT
SUBDIR+= instkernel
.if ${MKKMOD} != "no"
SUBDIR+= kmod
+.if ${MKCRYPTO} != "no"
SUBDIR+= kmod-cgdroot
.endif
+.endif
SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= liveimage
Index: src/distrib/amd64/ramdisks/Makefile
diff -u src/distrib/amd64/ramdisks/Makefile:1.2 src/distrib/amd64/ramdisks/Makefile:1.3
--- src/distrib/amd64/ramdisks/Makefile:1.2 Mon Jul 15 00:22:10 2013
+++ src/distrib/amd64/ramdisks/Makefile Thu Jun 30 12:56:27 2016
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2013/07/15 00:22:10 khorben Exp $
+# $NetBSD: Makefile,v 1.3 2016/06/30 12:56:27 pgoyette Exp $
SUBDIR=
SUBDIR+= ramdisk
+
+.if ${MKCRYPTO:Uyes} != "no"
SUBDIR+= ramdisk-cgdroot
+.endif
TARGETS+= release
Index: src/distrib/i386/Makefile
diff -u src/distrib/i386/Makefile:1.11 src/distrib/i386/Makefile:1.12
--- src/distrib/i386/Makefile:1.11 Sun Jul 19 10:16:55 2015
+++ src/distrib/i386/Makefile Thu Jun 30 12:56:27 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/07/19 10:16:55 martin Exp $
+# $NetBSD: Makefile,v 1.12 2016/06/30 12:56:27 pgoyette Exp $
.include <bsd.own.mk>
@@ -8,8 +8,10 @@ SUBDIR+= .WAIT
SUBDIR+= instkernel
.if ${MKKMOD} != "no"
SUBDIR+= kmod
+.if ${MKCRYPTO} != "no"
SUBDIR+= kmod-cgdroot
.endif
+.endif
SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= floppies
Index: src/distrib/i386/ramdisks/Makefile
diff -u src/distrib/i386/ramdisks/Makefile:1.4 src/distrib/i386/ramdisks/Makefile:1.5
--- src/distrib/i386/ramdisks/Makefile:1.4 Tue Jul 16 02:10:43 2013
+++ src/distrib/i386/ramdisks/Makefile Thu Jun 30 12:56:27 2016
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2013/07/16 02:10:43 khorben Exp $
+# $NetBSD: Makefile,v 1.5 2016/06/30 12:56:27 pgoyette Exp $
SUBDIR=
SUBDIR+= ramdisk-big
+
+.if ${MKCRYPTO:Uyes} != "no"
SUBDIR+= ramdisk-cgdroot
+.endif
TARGETS+= release
