ubox: import kmodloader fixes

[openwrt/openwrt.git] / package / system / ubox / Makefile

diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
index 88322246f2f4000f7abf9cf5120135a11a9ee5c8..1b22e01f5975ade862fa47e33c3e46f32538fb67 100644 (file)
--- a/package/system/ubox/Makefile
+++ b/package/system/ubox/Makefile
@@ -1,14 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ubox
-PKG_VERSION:=2016-07-19
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(LEDE_GIT)/project/ubox.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=aead2c0cbffdda9b46d74a998a4c6aeef423b21a
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_DATE:=2017-01-26
+PKG_SOURCE_VERSION:=14839f0acc15197e360299b7f714b8f9ff97ba17
+PKG_MIRROR_HASH:=6a69c9af17bfe18988c3984478c1ee4041795af9345267d6f1262a09f3386cb0
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0
@@ -29,24 +28,24 @@ define Package/ubox
 endef
 
 define Package/logd
-  SECTION:=base
+SECTION:=base
   CATEGORY:=Base system
   DEPENDS:=+libubox +libubus +libblobmsg-json +USE_GLIBC:librt
   TITLE:=OpenWrt system log implementation
 endef
 
 define Package/ubox/install
-       $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib/ $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib $(1)/usr/bin
 
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/getrandom $(1)/usr/bin/
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib
 
-       $(LN) ../../sbin/kmodloader $(1)/usr/sbin/rmmod
-       $(LN) ../../sbin/kmodloader $(1)/usr/sbin/insmod
-       $(LN) ../../sbin/kmodloader $(1)/usr/sbin/lsmod
-       $(LN) ../../sbin/kmodloader $(1)/usr/sbin/modinfo
-       $(LN) ../../sbin/kmodloader $(1)/usr/sbin/modprobe
+       $(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