From: Daniel Dickinson <open...@daniel.thecshore.com>
Allow to use dependencies on 'ip' command without forcing a
particular version by having ip-full and busybox (if ip
applet enabled), as well as renamed ip package
(to ip-tiny) all provides the ip virtual package.
Signed-off-by: Daniel Dickinson <open...@daniel.thecshore.com>
---
package/network/utils/iproute2/Makefile | 10 +++++++---
package/utils/busybox/Makefile | 1 +
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/package/network/utils/iproute2/Makefile
b/package/network/utils/iproute2/Makefile
index af56577..24d8956 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -32,12 +32,16 @@ define Package/iproute2/Default
VARIANT:=$(1)
endef
-define Package/ip
+define Package/ip-tiny
$(call Package/iproute2/Default,tiny,Minimal)
CONFLICTS:=ip-full
+ PROVIDES:=ip
endef
-Package/ip-full=$(call Package/iproute2/Default,full,Full)
+define Package/ip-full
+$(call Package/iproute2/Default,full,Full)
+ PROVIDES:=ip
+endef
define Package/tc
$(call Package/iproute2/Default)
@@ -128,7 +132,7 @@ define Package/ss/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/ss $(1)/usr/sbin/
endef
-$(eval $(call BuildPackage,ip))
+$(eval $(call BuildPackage,ip-tiny))
$(eval $(call BuildPackage,ip-full))
$(eval $(call BuildPackage,tc))
$(eval $(call BuildPackage,genl))
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index 5ca4363..16e37e6 100644
--- a/package/utils/busybox/Makefile
+++ b/package/utils/busybox/Makefile
@@ -43,6 +43,7 @@ define Package/busybox
TITLE:=Core utilities for embedded Linux
URL:=http://busybox.net/
DEPENDS:=+BUSYBOX_USE_LIBRPC:librpc +BUSYBOX_CONFIG_PAM:libpam
+ PROVIDES:=$(if $(CONFIG_BUSYBOX_DEFAULT_IP),ip)
MENU:=1
endef
--
2.4.3
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
