EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ubox: add ALTERNATIVES

Browse Source 
This avoids a conflict with the kmod util from the package feed.

Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
This commit is contained in:
Huangbin Zhan 2020-06-03 10:24:52 +08:00 committed by Hauke Mehrtens
parent 67575b6410
commit 3d6ac4d20f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/system/ubox/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ubox PKG_NAME:=ubox
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git
@ -25,6 +25,12 @@ define Package/ubox
CATEGORY:=Base system CATEGORY:=Base system
DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_GLIBC:librt DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_GLIBC:librt
TITLE:=OpenWrt system helper toolbox 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 endef
define Package/getrandom define Package/getrandom
@ -50,12 +56,6 @@ define Package/ubox/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib $(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 endef
define Package/logd/install define Package/logd/install