AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2024-11-23 23:10:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools: Hide new commands behind experimental flag

Browse Source 
Hide the commands behind a flag so we can continue doing releases while
the commands aren't ready.
This commit is contained in:
Lucas De Marchi 2015-06-06 23:26:31 -03:00
parent 23603f1f83
commit 013e855043
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.am
View File

@ -127,9 +127,14 @@ tools_kmod_SOURCES = \
tools/rmmod.c tools/insmod.c \
tools/modinfo.c tools/modprobe.c \
tools/depmod.c tools/log.h tools/log.c \
tools/insert.c \
tools/remove.c \
tools/static-nodes.c
if BUILD_EXPERIMENTAL
tools_kmod_SOURCES += \
tools/insert.c \
tools/remove.c
endif
tools_kmod_LDADD = \
shared/libshared.la \
libkmod/libkmod-internal.la
@ -323,8 +328,12 @@ TESTSUITE = \
testsuite/test-modinfo testsuite/test-util testsuite/test-new-module \
testsuite/test-modprobe testsuite/test-blacklist \
testsuite/test-dependencies testsuite/test-depmod \
testsuite/test-list \
testsuite/test-list
if BUILD_EXPERIMENTAL
TESTSUITE += \
testsuite/test-tools
endif
check_PROGRAMS = $(TESTSUITE)
TESTS = $(TESTSUITE)
@ -364,8 +373,11 @@ testsuite_test_depmod_LDADD = $(TESTSUITE_LDADD)
testsuite_test_depmod_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
testsuite_test_list_LDADD = $(TESTSUITE_LDADD)
testsuite_test_list_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
if BUILD_EXPERIMENTAL
testsuite_test_tools_LDADD = $(TESTSUITE_LDADD)
testsuite_test_tools_CPPFLAGS = $(TESTSUITE_CPPFLAGS)
endif
testsuite-distclean:
$(RM) -r $(ROOTFS)

9
configure.ac
View File

@ -117,6 +117,14 @@ AC_SUBST([bashcompletiondir], [$with_bashcompletiondir])
# --enable-
#####################################################################
AC_ARG_ENABLE([experimental],
AS_HELP_STRING([--enable-experimental], [enable experimental tools and features. Do not enable it unless you know what you are doing. @<:@default=disabled@:>@]),
[], enable_experimental=no)
AM_CONDITIONAL([BUILD_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
AS_IF([test "x$enable_experimental" = "xyes"], [
AC_DEFINE(ENABLE_EXPERIMENTAL, [1], [Experimental features.])
])
AC_ARG_ENABLE([tools],
AS_HELP_STRING([--disable-tools], [disable building tools that provide same functionality as module-init-tools @<:@default=enabled@:>@]),
[], enable_tools=yes)
@ -279,6 +287,7 @@ AC_MSG_RESULT([
cflags: ${with_cflags} ${CFLAGS}
ldflags: ${with_ldflags} ${LDFLAGS}
experimental features: ${enable_experimental}
tools: ${enable_tools}
python bindings: ${enable_python}
logging: ${enable_logging}

7
tools/kmod.c
View File

@ -40,10 +40,13 @@ static const struct kmod_cmd kmod_cmd_help;
static const struct kmod_cmd *kmod_cmds[] = {
&kmod_cmd_help,
&kmod_cmd_insert,
&kmod_cmd_list,
&kmod_cmd_remove,
&kmod_cmd_static_nodes,
#ifdef ENABLE_EXPERIMENTAL
&kmod_cmd_insert,
&kmod_cmd_remove,
#endif
};
static const struct kmod_cmd *kmod_compat_cmds[] = {