Module Name: src
Committed By: martin
Date: Fri Oct 30 18:47:38 UTC 2020
Modified Files:
src/usr.sbin/sysinst: Makefile.inc defs.h util.c
Log Message:
PR 55769: avoid the module set if we do not build any
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.67 -r1.68 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.52 -r1.53 src/usr.sbin/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.35 src/usr.sbin/sysinst/Makefile.inc:1.36
--- src/usr.sbin/sysinst/Makefile.inc:1.35 Mon May 18 21:19:36 2020
+++ src/usr.sbin/sysinst/Makefile.inc Fri Oct 30 18:47:38 2020
@@ -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+= -DUSING_PAXASTAR
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 \
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.67 src/usr.sbin/sysinst/defs.h:1.68
--- src/usr.sbin/sysinst/defs.h:1.67 Tue Oct 13 17:26:28 2020
+++ src/usr.sbin/sysinst/defs.h Fri Oct 30 18:47:38 2020
@@ -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 @@ enum {
/* 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, \
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.52 src/usr.sbin/sysinst/util.c:1.53
--- src/usr.sbin/sysinst/util.c:1.52 Tue Oct 27 15:28:01 2020
+++ src/usr.sbin/sysinst/util.c Fri Oct 30 18:47:38 2020
@@ -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 @@ distinfo dist_list[] = {
{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},
