diff options
| author | Huangbin Zhan <zhanhb88@gmail.com> | 2020-06-03 10:24:52 +0800 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-06-26 23:48:51 +0200 |
| commit | 3d6ac4d20facaae17f944826e1f0234815eb0891 (patch) | |
| tree | 1396a49ec310ea1af98dc134f8a8867d5f0d835e | |
| parent | 67575b64107d39096195aaaa13b2c2986a5ff97f (diff) | |
| download | upstream-3d6ac4d20facaae17f944826e1f0234815eb0891.tar.gz upstream-3d6ac4d20facaae17f944826e1f0234815eb0891.tar.bz2 upstream-3d6ac4d20facaae17f944826e1f0234815eb0891.zip | |
ubox: add ALTERNATIVES
This avoids a conflict with the kmod util from the package feed.
Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
| -rw-r--r-- | package/system/ubox/Makefile | 14 |
1 files 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 |