aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2019-02-19 15:15:54 +0100
committerHans Dedecker <dedeckeh@gmail.com>2019-02-19 15:22:28 +0100
commit1bdd3b5f7dde6ed5f81816237dda03371b32276c (patch)
tree68f49e2b16e3e4de5f595fc0a285202375db7638 /package
parentde14f4301e7c40050a23a254bd62ed2edb496e09 (diff)
downloadupstream-1bdd3b5f7dde6ed5f81816237dda03371b32276c.tar.gz
upstream-1bdd3b5f7dde6ed5f81816237dda03371b32276c.tar.bz2
upstream-1bdd3b5f7dde6ed5f81816237dda03371b32276c.zip
Revert "iproute2: use tc package variant to limit other package sizes"
This reverts commit e6d84fa8864e7bbbcec139dd09a2922a06f5b2a0 as it breaks the installation of the iproute2 utilities ip-bridge, ss, nstat, devlink and rdma for the ip-full variant Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'package')
-rw-r--r--package/network/utils/iproute2/Makefile9
1 files changed, 0 insertions, 9 deletions
diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index 56a16d095c..e7fa6e479d 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -37,7 +37,6 @@ define Package/ip-tiny
$(call Package/iproute2/Default)
TITLE:=Routing control utility (Minimal)
VARIANT:=tiny
- DEFAULT_VARIANT:=1
PROVIDES:=ip
ALTERNATIVES:=200:/sbin/ip:/usr/libexec/ip-tiny
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
@@ -55,8 +54,6 @@ endef
define Package/tc
$(call Package/iproute2/Default)
TITLE:=Traffic control utility
- VARIANT:=tc
- PROVIDES:=tc
DEPENDS:=+kmod-sched-core +libxtables +libelf +(PACKAGE_devlink||PACKAGE_rdma):libmnl
endef
@@ -130,15 +127,12 @@ define Build/Compile
+$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
endef
-# use minimal functionality for dev libraries
-ifeq ($(BUILD_VARIANT),tiny)
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_BUILD_DIR)/include/{libgenl,libnetlink}.h $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/lib/libnetlink.a $(1)/usr/lib/
endef
-endif
define Package/ip-tiny/install
$(INSTALL_DIR) $(1)/usr/libexec
@@ -157,8 +151,6 @@ define Package/tc/install
$(INSTALL_BIN) ./files/15-teql $(1)/etc/hotplug.d/iface/
endef
-# ensure other packages are only saved during 'tiny' builds.
-ifeq ($(BUILD_VARIANT),tiny)
define Package/genl/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/genl/genl $(1)/usr/sbin/
@@ -188,7 +180,6 @@ define Package/rdma/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/rdma/rdma $(1)/usr/sbin/
endef
-endif
$(eval $(call BuildPackage,ip-tiny))
$(eval $(call BuildPackage,ip-full))