[openwrt/openwrt] ubox: add ALTERNATIVES

LEDE Commits lede-commits at lists.infradead.org
Fri Jun 26 18:19:24 EDT 2020


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/3d6ac4d20facaae17f944826e1f0234815eb0891

commit 3d6ac4d20facaae17f944826e1f0234815eb0891
Author: Huangbin Zhan <zhanhb88 at gmail.com>
AuthorDate: Wed Jun 3 10:24:52 2020 +0800

    ubox: add ALTERNATIVES
    
    This avoids a conflict with the kmod util from the package feed.
    
    Signed-off-by: Huangbin Zhan <zhanhb88 at gmail.com>
---
 package/system/ubox/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
index cfa0b594e4..e1269ca6ce 100644
--- a/package/system/ubox/Makefile
+++ b/package/system/ubox/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ubox
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git
@@ -25,6 +25,12 @@ define Package/ubox
   CATEGORY:=Base system
   DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_GLIBC:librt
   TITLE:=OpenWrt system helper toolbox
+  ALTERNATIVES:=\
+    100:/sbin/rmmod:/sbin/kmodloader \
+    100:/sbin/insmod:/sbin/kmodloader \
+    100:/sbin/lsmod:/sbin/kmodloader \
+    100:/sbin/modinfo:/sbin/kmodloader \
+    100:/sbin/modprobe:/sbin/kmodloader
 endef
 
 define Package/getrandom
@@ -50,12 +56,6 @@ define Package/ubox/install
 
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib
-
-	$(LN) kmodloader $(1)/sbin/rmmod
-	$(LN) kmodloader $(1)/sbin/insmod
-	$(LN) kmodloader $(1)/sbin/lsmod
-	$(LN) kmodloader $(1)/sbin/modinfo
-	$(LN) kmodloader $(1)/sbin/modprobe
 endef
 
 define Package/logd/install



More information about the lede-commits mailing list