From: Christian Brauner Date: Sun, 31 Jul 2016 10:40:49 +0000 (+0200) Subject: tools, tests: reorganize repo X-Git-Tag: lxc-2.1.0~366^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1109%2Fhead;p=thirdparty%2Flxc.git tools, tests: reorganize repo - tools: move lxc commands to common subfolder - tests: adapt include search path Signed-off-by: Christian Brauner --- diff --git a/configure.ac b/configure.ac index 13820ef88..2af073546 100644 --- a/configure.ac +++ b/configure.ac @@ -842,9 +842,9 @@ AC_CONFIG_FILES([ src/Makefile src/lxc/Makefile - src/lxc/lxc-checkconfig - src/lxc/lxc-start-ephemeral src/lxc/lxc.functions + src/lxc/tools/lxc-checkconfig + src/lxc/tools/lxc-start-ephemeral src/lxc/version.h src/python-lxc/Makefile diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am index 9a87c152a..73a097193 100644 --- a/src/lxc/Makefile.am +++ b/src/lxc/Makefile.am @@ -192,14 +192,14 @@ liblxc_so_LDADD += $(CGMANAGER_LIBS) $(DBUS_LIBS) $(NIH_LIBS) $(NIH_DBUS_LIBS) liblxc_so_CFLAGS += $(CGMANAGER_CFLAGS) $(DBUS_CFLAGS) $(NIH_CFLAGS) $(NIH_DBUS_CFLAGS) endif -bin_SCRIPTS = lxc-checkconfig +bin_SCRIPTS = tools/lxc-checkconfig EXTRA_DIST = \ - lxc-top.lua + tools/lxc-top.lua if ENABLE_DEPRECATED if ENABLE_PYTHON -bin_SCRIPTS += lxc-start-ephemeral +bin_SCRIPTS += tools/lxc-start-ephemeral endif endif @@ -243,35 +243,35 @@ AM_LDFLAGS += -Wl,-rpath -Wl,$(libdir) endif LDADD=liblxc.so @CAP_LIBS@ @APPARMOR_LIBS@ @SELINUX_LIBS@ @SECCOMP_LIBS@ -lxc_attach_SOURCES = lxc_attach.c -lxc_autostart_SOURCES = lxc_autostart.c -lxc_cgroup_SOURCES = lxc_cgroup.c -lxc_config_SOURCES = lxc_config.c -lxc_console_SOURCES = lxc_console.c -lxc_destroy_SOURCES = lxc_destroy.c -lxc_device_SOURCES = lxc_device.c -lxc_execute_SOURCES = lxc_execute.c -lxc_freeze_SOURCES = lxc_freeze.c -lxc_info_SOURCES = lxc_info.c -init_lxc_SOURCES = lxc_init.c -lxc_monitor_SOURCES = lxc_monitor.c -lxc_monitord_SOURCES = lxc_monitord.c -lxc_ls_SOURCES = lxc_ls.c -lxc_copy_SOURCES = lxc_copy.c -lxc_start_SOURCES = lxc_start.c -lxc_stop_SOURCES = lxc_stop.c -lxc_top_SOURCES = lxc_top.c -lxc_unfreeze_SOURCES = lxc_unfreeze.c -lxc_unshare_SOURCES = lxc_unshare.c -lxc_wait_SOURCES = lxc_wait.c -lxc_create_SOURCES = lxc_create.c -lxc_snapshot_SOURCES = lxc_snapshot.c -lxc_usernsexec_SOURCES = lxc_usernsexec.c +lxc_attach_SOURCES = tools/lxc_attach.c +lxc_autostart_SOURCES = tools/lxc_autostart.c +lxc_cgroup_SOURCES = tools/lxc_cgroup.c +lxc_config_SOURCES = tools/lxc_config.c +lxc_console_SOURCES = tools/lxc_console.c +lxc_destroy_SOURCES = tools/lxc_destroy.c +lxc_device_SOURCES = tools/lxc_device.c +lxc_execute_SOURCES = tools/lxc_execute.c +lxc_freeze_SOURCES = tools/lxc_freeze.c +lxc_info_SOURCES = tools/lxc_info.c +init_lxc_SOURCES = tools/lxc_init.c +lxc_monitor_SOURCES = tools/lxc_monitor.c +lxc_ls_SOURCES = tools/lxc_ls.c +lxc_copy_SOURCES = tools/lxc_copy.c +lxc_start_SOURCES = tools/lxc_start.c +lxc_stop_SOURCES = tools/lxc_stop.c +lxc_top_SOURCES = tools/lxc_top.c +lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c +lxc_unshare_SOURCES = tools/lxc_unshare.c +lxc_wait_SOURCES = tools/lxc_wait.c +lxc_create_SOURCES = tools/lxc_create.c +lxc_snapshot_SOURCES = tools/lxc_snapshot.c +lxc_usernsexec_SOURCES = tools/lxc_usernsexec.c +lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c lxc_user_nic_SOURCES = lxc_user_nic.c network.c network.h -lxc_checkpoint_SOURCES = lxc_checkpoint.c +lxc_monitord_SOURCES = lxc_monitord.c if ENABLE_DEPRECATED -lxc_clone_SOURCES = lxc_clone.c +lxc_clone_SOURCES = tools/lxc_clone.c endif if !HAVE_GETSUBOPT @@ -281,7 +281,7 @@ endif if HAVE_STATIC_LIBCAP sbin_PROGRAMS += init.lxc.static -init_lxc_static_SOURCES = lxc_init.c error.c log.c initutils.c caps.c +init_lxc_static_SOURCES = tools/lxc_init.c error.c log.c initutils.c caps.c if !HAVE_GETLINE if HAVE_FGETLN diff --git a/src/lxc/lxc-checkconfig.in b/src/lxc/tools/lxc-checkconfig.in similarity index 100% rename from src/lxc/lxc-checkconfig.in rename to src/lxc/tools/lxc-checkconfig.in diff --git a/src/lxc/lxc-start-ephemeral.in b/src/lxc/tools/lxc-start-ephemeral.in similarity index 100% rename from src/lxc/lxc-start-ephemeral.in rename to src/lxc/tools/lxc-start-ephemeral.in diff --git a/src/lxc/lxc-top.lua b/src/lxc/tools/lxc-top.lua similarity index 100% rename from src/lxc/lxc-top.lua rename to src/lxc/tools/lxc-top.lua diff --git a/src/lxc/lxc_attach.c b/src/lxc/tools/lxc_attach.c similarity index 100% rename from src/lxc/lxc_attach.c rename to src/lxc/tools/lxc_attach.c diff --git a/src/lxc/lxc_autostart.c b/src/lxc/tools/lxc_autostart.c similarity index 100% rename from src/lxc/lxc_autostart.c rename to src/lxc/tools/lxc_autostart.c diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/tools/lxc_cgroup.c similarity index 100% rename from src/lxc/lxc_cgroup.c rename to src/lxc/tools/lxc_cgroup.c diff --git a/src/lxc/lxc_checkpoint.c b/src/lxc/tools/lxc_checkpoint.c similarity index 100% rename from src/lxc/lxc_checkpoint.c rename to src/lxc/tools/lxc_checkpoint.c diff --git a/src/lxc/lxc_clone.c b/src/lxc/tools/lxc_clone.c similarity index 100% rename from src/lxc/lxc_clone.c rename to src/lxc/tools/lxc_clone.c diff --git a/src/lxc/lxc_config.c b/src/lxc/tools/lxc_config.c similarity index 100% rename from src/lxc/lxc_config.c rename to src/lxc/tools/lxc_config.c diff --git a/src/lxc/lxc_console.c b/src/lxc/tools/lxc_console.c similarity index 100% rename from src/lxc/lxc_console.c rename to src/lxc/tools/lxc_console.c diff --git a/src/lxc/lxc_copy.c b/src/lxc/tools/lxc_copy.c similarity index 100% rename from src/lxc/lxc_copy.c rename to src/lxc/tools/lxc_copy.c diff --git a/src/lxc/lxc_create.c b/src/lxc/tools/lxc_create.c similarity index 100% rename from src/lxc/lxc_create.c rename to src/lxc/tools/lxc_create.c diff --git a/src/lxc/lxc_destroy.c b/src/lxc/tools/lxc_destroy.c similarity index 100% rename from src/lxc/lxc_destroy.c rename to src/lxc/tools/lxc_destroy.c diff --git a/src/lxc/lxc_device.c b/src/lxc/tools/lxc_device.c similarity index 100% rename from src/lxc/lxc_device.c rename to src/lxc/tools/lxc_device.c diff --git a/src/lxc/lxc_execute.c b/src/lxc/tools/lxc_execute.c similarity index 100% rename from src/lxc/lxc_execute.c rename to src/lxc/tools/lxc_execute.c diff --git a/src/lxc/lxc_freeze.c b/src/lxc/tools/lxc_freeze.c similarity index 100% rename from src/lxc/lxc_freeze.c rename to src/lxc/tools/lxc_freeze.c diff --git a/src/lxc/lxc_info.c b/src/lxc/tools/lxc_info.c similarity index 100% rename from src/lxc/lxc_info.c rename to src/lxc/tools/lxc_info.c diff --git a/src/lxc/lxc_init.c b/src/lxc/tools/lxc_init.c similarity index 100% rename from src/lxc/lxc_init.c rename to src/lxc/tools/lxc_init.c diff --git a/src/lxc/lxc_ls.c b/src/lxc/tools/lxc_ls.c similarity index 100% rename from src/lxc/lxc_ls.c rename to src/lxc/tools/lxc_ls.c diff --git a/src/lxc/lxc_monitor.c b/src/lxc/tools/lxc_monitor.c similarity index 100% rename from src/lxc/lxc_monitor.c rename to src/lxc/tools/lxc_monitor.c diff --git a/src/lxc/lxc_snapshot.c b/src/lxc/tools/lxc_snapshot.c similarity index 100% rename from src/lxc/lxc_snapshot.c rename to src/lxc/tools/lxc_snapshot.c diff --git a/src/lxc/lxc_start.c b/src/lxc/tools/lxc_start.c similarity index 100% rename from src/lxc/lxc_start.c rename to src/lxc/tools/lxc_start.c diff --git a/src/lxc/lxc_stop.c b/src/lxc/tools/lxc_stop.c similarity index 100% rename from src/lxc/lxc_stop.c rename to src/lxc/tools/lxc_stop.c diff --git a/src/lxc/lxc_top.c b/src/lxc/tools/lxc_top.c similarity index 100% rename from src/lxc/lxc_top.c rename to src/lxc/tools/lxc_top.c diff --git a/src/lxc/lxc_unfreeze.c b/src/lxc/tools/lxc_unfreeze.c similarity index 100% rename from src/lxc/lxc_unfreeze.c rename to src/lxc/tools/lxc_unfreeze.c diff --git a/src/lxc/lxc_unshare.c b/src/lxc/tools/lxc_unshare.c similarity index 100% rename from src/lxc/lxc_unshare.c rename to src/lxc/tools/lxc_unshare.c diff --git a/src/lxc/lxc_usernsexec.c b/src/lxc/tools/lxc_usernsexec.c similarity index 100% rename from src/lxc/lxc_usernsexec.c rename to src/lxc/tools/lxc_usernsexec.c diff --git a/src/lxc/lxc_wait.c b/src/lxc/tools/lxc_wait.c similarity index 100% rename from src/lxc/lxc_wait.c rename to src/lxc/tools/lxc_wait.c diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 68141f92b..26beedad4 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -24,13 +24,17 @@ lxc_test_attach_SOURCES = attach.c lxc_test_device_add_remove_SOURCES = device_add_remove.c lxc_test_apparmor_SOURCES = aa.c -AM_CFLAGS=-I$(top_srcdir)/src \ - -DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \ +AM_CFLAGS=-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \ -DLXCPATH=\"$(LXCPATH)\" \ -DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \ -DLXCINITDIR=\"$(LXCINITDIR)\" \ -DLXC_DEFAULT_CONFIG=\"$(LXC_DEFAULT_CONFIG)\" \ - -DRUNTIME_PATH=\"$(RUNTIME_PATH)\" + -DRUNTIME_PATH=\"$(RUNTIME_PATH)\" \ + -I $(top_srcdir)/src \ + -I $(top_srcdir)/src/lxc \ + -I $(top_srcdir)/src/lxc/bdev \ + -I $(top_srcdir)/src/lxc/cgroups \ + -I $(top_srcdir)/src/lxc/tools if ENABLE_APPARMOR AM_CFLAGS += -DHAVE_APPARMOR diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c index c8a09e84a..fb755cdf1 100644 --- a/src/tests/cgpath.c +++ b/src/tests/cgpath.c @@ -28,9 +28,10 @@ #include #include #include -#include "lxc/cgroup.h" -#include "lxc/lxc.h" -#include "lxc/commands.h" + +#include "cgroup.h" +#include "lxc.h" +#include "commands.h" #define MYNAME "lxctest1"