From a826bc17eb7a11309a6022ee3edbb727d6acd3b0 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Fri, 22 May 2020 10:26:21 -0300 Subject: [PATCH] lxc: group everything under lxc menu This makes every lxc-* package depend on lxc so that they are grouped under the lxc menu. Signed-off-by: Eneas U de Queiroz --- utils/lxc/Makefile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile index 1762b849cf..f31c5f3b83 100644 --- a/utils/lxc/Makefile +++ b/utils/lxc/Makefile @@ -46,24 +46,25 @@ define Package/lxc/Default CATEGORY:=Utilities TITLE:=LXC userspace tools URL:=https://linuxcontainers.org/ - DEPENDS:=@!arc + DEPENDS:=lxc endef define Package/lxc $(call Package/lxc/Default) + DEPENDS:=@!arc MENU:=1 endef define Package/lxc-auto $(call Package/lxc/Default) TITLE:= (initscript) - DEPENDS+=lxc-start +lxc-stop + DEPENDS+=+lxc-start +lxc-stop endef define Package/lxc-auto/description LXC is the userspace control package for Linux Containers, a lightweight virtual system mechanism sometimes described as "chroot on steroids". - This package adds and initscript for starting and stopping the containers + This package adds an initscript for starting and stopping the containers on boot and shutdown. endef @@ -99,25 +100,21 @@ endef define Package/lxc-common $(call Package/lxc/Default) TITLE:=LXC common files - DEPENDS+= lxc endef define Package/lxc-hooks $(call Package/lxc/Default) TITLE:=LXC virtual machine hooks - DEPENDS+= lxc endef define Package/lxc-templates $(call Package/lxc/Default) TITLE:=LXC virtual machine templates - DEPENDS+= lxc endef define Package/lxc-configs $(call Package/lxc/Default) TITLE:=LXC virtual machine common config files - DEPENDS+= lxc endef define Package/liblxc @@ -125,13 +122,13 @@ define Package/liblxc SECTION:=libs CATEGORY:=Libraries TITLE:=LXC userspace library - DEPENDS+= lxc +libcap +libpthread +LXC_SECCOMP:libseccomp +libopenssl + DEPENDS+= +libcap +libpthread +LXC_SECCOMP:libseccomp +libopenssl endef define Package/lxc-init $(call Package/lxc/Default) TITLE:=LXC Lua bindings - DEPENDS+= lxc +liblxc + DEPENDS+= +liblxc endef CONFIGURE_ARGS += \ @@ -246,7 +243,7 @@ define GenPlugin define Package/lxc-$(1) $(call Package/lxc/Default) TITLE:=Utility lxc-$(1) from the LXC userspace tools - DEPENDS+= lxc +lxc-common $(2) $(DEPENDS_$(1)) + DEPENDS+= +lxc-common $(2) $(DEPENDS_$(1)) endef define Package/lxc-$(1)/install