From 4b9c819b022e505ad72f3bf375e8d52c601c19a3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 20 May 2020 16:28:05 -0700 Subject: [PATCH] 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 1d69a21cef..acb827f8b6 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) \ -- 2.30.2