Module Name: src
Committed By: pooka
Date: Thu Nov 12 14:38:21 UTC 2015
Modified Files:
src/usr.bin/config: defs.h mkioconf.c
Log Message:
In ioconfname mode, #define IOCONF as the ioconf token.
Avoids having to retype the name to call config_init/fini_component().
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/usr.bin/config/defs.h
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/config/mkioconf.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.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.93 src/usr.bin/config/defs.h:1.94
--- src/usr.bin/config/defs.h:1.93 Fri Sep 4 10:16:35 2015
+++ src/usr.bin/config/defs.h Thu Nov 12 14:38:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.93 2015/09/04 10:16:35 uebayasi Exp $ */
+/* $NetBSD: defs.h,v 1.94 2015/11/12 14:38:21 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -107,7 +107,7 @@ extern const char *progname;
* The next two lines define the current version of the config(1) binary,
* and the minimum version of the configuration files it supports.
*/
-#define CONFIG_VERSION 20150846
+#define CONFIG_VERSION 20151112
#define CONFIG_MINVERSION 0
/*
Index: src/usr.bin/config/mkioconf.c
diff -u src/usr.bin/config/mkioconf.c:1.32 src/usr.bin/config/mkioconf.c:1.33
--- src/usr.bin/config/mkioconf.c:1.32 Thu Sep 3 13:53:36 2015
+++ src/usr.bin/config/mkioconf.c Thu Nov 12 14:38:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mkioconf.c,v 1.32 2015/09/03 13:53:36 uebayasi Exp $ */
+/* $NetBSD: mkioconf.c,v 1.33 2015/11/12 14:38:21 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mkioconf.c,v 1.32 2015/09/03 13:53:36 uebayasi Exp $");
+__RCSID("$NetBSD: mkioconf.c,v 1.33 2015/11/12 14:38:21 pooka Exp $");
#include <sys/param.h>
#include <err.h>
@@ -93,6 +93,8 @@ mkioconf(void)
}
fprintf(fp, "#include \"ioconf.h\"\n");
+ if (ioconfname)
+ fprintf(fp, "#define IOCONF %s\n", ioconfname);
emithdr(fp);
emitcfdrivers(fp);
