From 50f17d3cf5cb02cb654c328a3bb976556b0c0266 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 20 May 2020 16:23:13 -0700 Subject: [PATCH 1/4] lxc: remove lua Lua support seems to be gone from LXC 4. Signed-off-by: Rosen Penev --- utils/lxc/Makefile | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile index 3c758379d..1d69a21ce 100644 --- a/utils/lxc/Makefile +++ b/utils/lxc/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lxc PKG_VERSION:=4.0.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/ @@ -19,7 +19,6 @@ PKG_HASH:=ca336dcdf303fea5ff231d89a9b6278b061c4cffb14f0db0a71a15bdd95a5cb0 PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0 PKG_MAINTAINER:=Marko Ratkaj -PKG_BUILD_DEPENDS:=lua PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 @@ -128,12 +127,6 @@ define Package/liblxc DEPENDS:= lxc +libcap +libpthread +LXC_SECCOMP:libseccomp +libopenssl endef -define Package/lxc-lua - $(call Package/lxc/Default) - TITLE:=LXC Lua bindings - DEPENDS:= lxc +liblua +liblxc -endef - define Package/lxc-init $(call Package/lxc/Default) TITLE:=LXC Lua bindings @@ -147,9 +140,7 @@ CONFIGURE_ARGS += \ --disable-examples \ --disable-gnutls \ --disable-selinux \ - --disable-python \ - --enable-lua=yes \ - --with-lua-pc="$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc" + --disable-python TARGET_CFLAGS += -Wno-format-nonliteral TARGET_LDFLAGS += -lgcc_eh @@ -160,11 +151,6 @@ else CONFIGURE_ARGS += --disable-seccomp endif -MAKE_FLAGS += \ - LUA_INSTALL_CMOD="/usr/lib/lua" \ - LUA_INSTALL_LMOD="/usr/lib/lua" - - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/lxc/ $(CP) \ @@ -252,17 +238,6 @@ define Package/liblxc/install $(1)/usr/lib/ endef -define Package/lxc-lua/install - $(INSTALL_DIR) $(1)/usr/lib/lua - $(CP) \ - $(PKG_INSTALL_DIR)/usr/share/lua/5.1/lxc.lua \ - $(1)/usr/lib/lua/ - $(INSTALL_DIR) $(1)/usr/lib/lua/lxc - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/lua/5.1/lxc/core.so \ - $(1)/usr/lib/lua/lxc/ -endef - define Package/lxc-init/install $(INSTALL_DIR) $(1)/sbin $(CP) \ @@ -294,7 +269,6 @@ $(eval $(call BuildPackage,lxc-hooks)) $(eval $(call BuildPackage,lxc-configs)) $(eval $(call BuildPackage,lxc-templates)) $(eval $(call BuildPackage,liblxc)) -$(eval $(call BuildPackage,lxc-lua)) $(eval $(call BuildPackage,lxc-init)) $(eval $(call BuildPackage,lxc-auto)) $(eval $(call BuildPackage,lxc-unprivileged)) From 4b9c819b022e505ad72f3bf375e8d52c601c19a3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 20 May 2020 16:28:05 -0700 Subject: [PATCH 2/4] lxc: cleanup Makefile and outdated configure options Added PKG_NO_MIPS16 as MIPS16 is no longer supported. Signed-off-by: Rosen Penev --- utils/lxc/Makefile | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile index 1d69a21ce..acb827f8b 100644 --- a/utils/lxc/Makefile +++ b/utils/lxc/Makefile @@ -16,13 +16,13 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/ PKG_HASH:=ca336dcdf303fea5ff231d89a9b6278b061c4cffb14f0db0a71a15bdd95a5cb0 -PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0 PKG_MAINTAINER:=Marko Ratkaj +PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause GPL-2.0 -PKG_BUILD_PARALLEL:=1 - -PKG_INSTALL:=1 PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 +PKG_USE_MIPS16:=0 include $(INCLUDE_DIR)/package.mk @@ -134,23 +134,19 @@ define Package/lxc-init endef CONFIGURE_ARGS += \ - --disable-apparmor \ - --disable-cgmanager \ + --disable-werror \ + --disable-rpath \ --disable-doc \ - --disable-examples \ - --disable-gnutls \ + --disable-api-docs \ + --disable-apparmor \ --disable-selinux \ - --disable-python + --$(if $(CONFIG_LXC_SECCOMP),en,dis)able-seccomp \ + --enable-capabilities \ + --disable-examples -TARGET_CFLAGS += -Wno-format-nonliteral +TARGET_CFLAGS += -minterlink-mips16 TARGET_LDFLAGS += -lgcc_eh -ifeq ($(CONFIG_LXC_SECCOMP),y) -CONFIGURE_ARGS += --enable-seccomp -else -CONFIGURE_ARGS += --disable-seccomp -endif - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/lxc/ $(CP) \ From 29dd78c6fc6c9131b1407efc2cce617f9c782d1f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 20 May 2020 12:25:44 -0700 Subject: [PATCH 3/4] lxc: don't build for ARC Similar to libseccomp, ARC is completely unsupported. Signed-off-by: Rosen Penev --- utils/lxc/Makefile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile index acb827f8b..1762b849c 100644 --- a/utils/lxc/Makefile +++ b/utils/lxc/Makefile @@ -46,6 +46,7 @@ define Package/lxc/Default CATEGORY:=Utilities TITLE:=LXC userspace tools URL:=https://linuxcontainers.org/ + DEPENDS:=@!arc endef define Package/lxc @@ -56,7 +57,7 @@ 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 @@ -73,7 +74,7 @@ endef define Package/lxc-unprivileged $(call Package/lxc/Default) TITLE:=Helper script for unprivileged containers support - DEPENDS:=+shadow-utils +shadow-newuidmap +shadow-newgidmap + DEPENDS+=+shadow-utils +shadow-newuidmap +shadow-newgidmap endef define Package/lxc-unprivileged/description @@ -98,25 +99,25 @@ endef define Package/lxc-common $(call Package/lxc/Default) TITLE:=LXC common files - DEPENDS:= lxc + DEPENDS+= lxc endef define Package/lxc-hooks $(call Package/lxc/Default) TITLE:=LXC virtual machine hooks - DEPENDS:= lxc + DEPENDS+= lxc endef define Package/lxc-templates $(call Package/lxc/Default) TITLE:=LXC virtual machine templates - DEPENDS:= lxc + DEPENDS+= lxc endef define Package/lxc-configs $(call Package/lxc/Default) TITLE:=LXC virtual machine common config files - DEPENDS:= lxc + DEPENDS+= lxc endef define Package/liblxc @@ -124,13 +125,13 @@ define Package/liblxc SECTION:=libs CATEGORY:=Libraries TITLE:=LXC userspace library - DEPENDS:= lxc +libcap +libpthread +LXC_SECCOMP:libseccomp +libopenssl + DEPENDS+= lxc +libcap +libpthread +LXC_SECCOMP:libseccomp +libopenssl endef define Package/lxc-init $(call Package/lxc/Default) TITLE:=LXC Lua bindings - DEPENDS:= lxc +liblxc + DEPENDS+= lxc +liblxc endef CONFIGURE_ARGS += \ @@ -245,7 +246,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 +lxc-common $(2) $(DEPENDS_$(1)) endef define Package/lxc-$(1)/install 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 4/4] 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 1762b849c..f31c5f3b8 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