[src/trunk]: src/distrib Omit cgd based ramdisks and miniroot modules if MKCR...

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

details:   https://anonhg.NetBSD.org/src/rev/645d5d971e43
branches:  trunk
changeset: 816326:645d5d971e43
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Thu Jun 30 12:56:27 2016 +0000

description:
Omit cgd based ramdisks and miniroot modules if MKCRYPTO=no

Final part of PR kern/51282

diffstat:

 distrib/amd64/Makefile          |  4 +++-
 distrib/amd64/ramdisks/Makefile |  5 ++++-
 distrib/i386/Makefile           |  4 +++-
 distrib/i386/ramdisks/Makefile  |  5 ++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diffs (72 lines):

diff -r 56ca2f1694f6 -r 645d5d971e43 distrib/amd64/Makefile
--- a/distrib/amd64/Makefile    Thu Jun 30 09:44:58 2016 +0000
+++ b/distrib/amd64/Makefile    Thu Jun 30 12:56:27 2016 +0000
@@ -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+=       instkernel
 .if ${MKKMOD} != "no"
 SUBDIR+=       kmod
+.if ${MKCRYPTO} != "no"
 SUBDIR+=       kmod-cgdroot
 .endif
+.endif
 SUBDIR+=       .WAIT
 SUBDIR+=       cdroms
 SUBDIR+=       liveimage
diff -r 56ca2f1694f6 -r 645d5d971e43 distrib/amd64/ramdisks/Makefile
--- a/distrib/amd64/ramdisks/Makefile   Thu Jun 30 09:44:58 2016 +0000
+++ b/distrib/amd64/ramdisks/Makefile   Thu Jun 30 12:56:27 2016 +0000
@@ -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
 
diff -r 56ca2f1694f6 -r 645d5d971e43 distrib/i386/Makefile
--- a/distrib/i386/Makefile     Thu Jun 30 09:44:58 2016 +0000
+++ b/distrib/i386/Makefile     Thu Jun 30 12:56:27 2016 +0000
@@ -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+=       instkernel
 .if ${MKKMOD} != "no"
 SUBDIR+=       kmod
+.if ${MKCRYPTO} != "no"
 SUBDIR+=       kmod-cgdroot
 .endif
+.endif
 SUBDIR+=       .WAIT
 SUBDIR+=       cdroms
 SUBDIR+=       floppies
diff -r 56ca2f1694f6 -r 645d5d971e43 distrib/i386/ramdisks/Makefile
--- a/distrib/i386/ramdisks/Makefile    Thu Jun 30 09:44:58 2016 +0000
+++ b/distrib/i386/ramdisks/Makefile    Thu Jun 30 12:56:27 2016 +0000
@@ -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