Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iproute2: revert add libcap support, enabled in ip-full

Browse source 
This reverts commit a6da3f9ef7.

The libcap isn't as optional as the commit messages suggests. A hard
dependency to the libcap package is added, which is only available in
the external packages feed. Therefore it is impossible to package
ip-full without having the external packages feed up and running, which
is a regression to the former behaviour.

Signed-off-by: Mathias Kresin <dev@kresin.me>
Acked-by: Hans Dedecker <dedeckeh@gmail.com>
This commit is contained in:
Mathias Kresin 2020-03-05 20:34:27 +01:00
parent 6de7406d54
commit 1a9408281b
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
package/network/utils/iproute2/Makefile
View file

@ -47,7 +47,7 @@ $(call Package/iproute2/Default)
VARIANT:=full VARIANT:=full
PROVIDES:=ip PROVIDES:=ip
ALTERNATIVES:=300:/sbin/ip:/usr/libexec/ip-full ALTERNATIVES:=300:/sbin/ip:/usr/libexec/ip-full
DEPENDS:=+libnl-tiny +libelf +(PACKAGE_devlink||PACKAGE_rdma):libmnl +libcap DEPENDS:=+libnl-tiny +libelf +(PACKAGE_devlink||PACKAGE_rdma):libmnl
endef endef
define Package/tc define Package/tc
@ -55,43 +55,43 @@ $(call Package/iproute2/Default)
TITLE:=Traffic control utility TITLE:=Traffic control utility
VARIANT:=tc VARIANT:=tc
PROVIDES:=tc PROVIDES:=tc
DEPENDS:=+kmod-sched-core +libxtables +libelf +(PACKAGE_devlink||PACKAGE_rdma):libmnl +PACKAGE_ip-full:libcap DEPENDS:=+kmod-sched-core +libxtables +libelf +(PACKAGE_devlink||PACKAGE_rdma):libmnl
endef endef
define Package/genl define Package/genl
$(call Package/iproute2/Default) $(call Package/iproute2/Default)
TITLE:=General netlink utility frontend TITLE:=General netlink utility frontend
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf
endef endef
define Package/ip-bridge define Package/ip-bridge
$(call Package/iproute2/Default) $(call Package/iproute2/Default)
TITLE:=Bridge configuration utility from iproute2 TITLE:=Bridge configuration utility from iproute2
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf
endef endef
define Package/ss define Package/ss
$(call Package/iproute2/Default) $(call Package/iproute2/Default)
TITLE:=Socket statistics utility TITLE:=Socket statistics utility
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf
endef endef
define Package/nstat define Package/nstat
$(call Package/iproute2/Default) $(call Package/iproute2/Default)
TITLE:=Network statistics utility TITLE:=Network statistics utility
DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf
endef endef
define Package/devlink define Package/devlink
$(call Package/iproute2/Default) $(call Package/iproute2/Default)
TITLE:=Network devlink utility TITLE:=Network devlink utility
DEPENDS:=+libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap DEPENDS:=+libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf
endef endef
define Package/rdma define Package/rdma
$(call Package/iproute2/Default) $(call Package/iproute2/Default)
TITLE:=Network rdma utility TITLE:=Network rdma utility
DEPENDS:=+libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf +PACKAGE_ip-full:libcap DEPENDS:=+libmnl +(PACKAGE_tc||PACKAGE_ip-full):libelf
endef endef
ifeq ($(BUILD_VARIANT),tiny) ifeq ($(BUILD_VARIANT),tiny)
@ -100,7 +100,7 @@ endif
ifeq ($(BUILD_VARIANT),full) ifeq ($(BUILD_VARIANT),full)
HAVE_ELF:=y HAVE_ELF:=y
HAVE_CAP:=y HAVE_CAP:=n
endif endif
ifeq ($(BUILD_VARIANT),tc) ifeq ($(BUILD_VARIANT),tc)