ubox: support quiet modprobe, support millisecond log timestamp accuracy

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

diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
index 537f380aad88a1b6d9b6669377fdc9f1af0a2697..b0cd1906b9f0e6813ba8aef716ebbbc07469f399 100644 (file)
--- a/package/system/ubox/Makefile
+++ b/package/system/ubox/Makefile
@@ -1,15 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ubox
-PKG_VERSION:=2016-09-26
-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:=5649c028c426060616e2bd4e7ea83271cd333d21
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=44d45a90b55146479b8a949e5498de675054200e1f6c48459d73b0ea70fcdcff
+PKG_SOURCE_DATE:=2017-01-29
+PKG_SOURCE_VERSION:=ac2d43e7c84fa3041ee2bf5709fdf69352189317
+PKG_MIRROR_HASH:=f793550b6164f519a08ff2d8cb7c5ca74e8d573c03f0d7ee6473db3cbb90ee3a
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0
@@ -29,21 +27,33 @@ define Package/ubox
   TITLE:=OpenWrt system helper toolbox
 endef
 
+define Package/logd
+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 $(1)/etc/init.d
+       $(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
+       $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/
 
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{logd,logread} $(1)/sbin/
        $(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
 endef
 
 $(eval $(call BuildPackage,ubox))
+$(eval $(call BuildPackage,logd))