[src/trunk]: src/usr.sbin/sysinst PR 55769: avoid the module set if we do not...

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

details:   https://anonhg.NetBSD.org/src/rev/73fbcdb2d48c
branches:  trunk
changeset: 1015695:73fbcdb2d48c
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Oct 30 18:47:38 2020 +0000

description:
PR 55769: avoid the module set if we do not build any

diffstat:

 usr.sbin/sysinst/Makefile.inc |   6 +++++-
 usr.sbin/sysinst/defs.h       |  11 ++++++++---
 usr.sbin/sysinst/util.c       |   4 +++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diffs (67 lines):

diff -r 3212780301cf -r 73fbcdb2d48c usr.sbin/sysinst/Makefile.inc
--- a/usr.sbin/sysinst/Makefile.inc     Fri Oct 30 17:55:10 2020 +0000
+++ b/usr.sbin/sysinst/Makefile.inc     Fri Oct 30 18:47:38 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.35 2020/05/18 21:19:36 jmcneill Exp $
+#      $NetBSD: Makefile.inc,v 1.36 2020/10/30 18:47:38 martin Exp $
 #
 # Makefile for sysinst
 
@@ -76,6 +76,10 @@
 CPPFLAGS+=     -DHAVE_DTB
 .endif
 
+.if ${MKKMOD:Uno} != "no"
+CPPFLAGS+=     -DHAVE_MODULES
+.endif
+
 CATALOGDIR=    /usr/share/sysinst/catalog
 CPPFLAGS+=     -I. -I${.CURDIR}/../.. -I${.CURDIR} \
                -I${.CURDIR}/../../../../sbin/fsck \
diff -r 3212780301cf -r 73fbcdb2d48c usr.sbin/sysinst/defs.h
--- a/usr.sbin/sysinst/defs.h   Fri Oct 30 17:55:10 2020 +0000
+++ b/usr.sbin/sysinst/defs.h   Fri Oct 30 18:47:38 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.67 2020/10/13 17:26:28 martin Exp $ */
+/*     $NetBSD: defs.h,v 1.68 2020/10/30 18:47:38 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -178,11 +178,16 @@
 /* All kernels */
 #define SET_KERNEL SET_KERNEL_1, SET_KERNEL_2, SET_KERNEL_3, SET_KERNEL_4, \
                    SET_KERNEL_5, SET_KERNEL_6, SET_KERNEL_7, SET_KERNEL_8
+#ifdef HAVE_MODULES
+#define        WITH_MODULES    SET_MODULES,
+#else
+#define        WITH_MODULES
+#endif
 /* Core system sets */
 #ifdef HAVE_DTB
-#define SET_CORE SET_MODULES, SET_BASE, SET_DTB, SET_ETC
+#define SET_CORE WITH_MODULES SET_BASE, SET_DTB, SET_ETC
 #else
-#define SET_CORE SET_MODULES, SET_BASE, SET_ETC
+#define SET_CORE WITH_MODULES SET_BASE, SET_ETC
 #endif
 /* All system sets */
 #define SET_SYSTEM SET_CORE, SET_COMPILER, SET_GAMES, \
diff -r 3212780301cf -r 73fbcdb2d48c usr.sbin/sysinst/util.c
--- a/usr.sbin/sysinst/util.c   Fri Oct 30 17:55:10 2020 +0000
+++ b/usr.sbin/sysinst/util.c   Fri Oct 30 18:47:38 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.52 2020/10/27 15:28:01 martin Exp $ */
+/*     $NetBSD: util.c,v 1.53 2020/10/30 18:47:38 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -114,7 +114,9 @@
        {SET_KERNEL_9_NAME,     SET_KERNEL_9,           false, MSG_set_kernel_9, NULL},
 #endif
 
+#ifdef HAVE_MODULES
        {"modules",             SET_MODULES,            false, MSG_set_modules, NULL},
+#endif
        {"base",                SET_BASE,               false, MSG_set_base, NULL},
 #ifdef HAVE_DTB
        {"dtb",                 SET_DTB,                false, MSG_set_dtb, NULL},