ubox: move getrandom into separate getrandom package

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

diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
index b0cd1906b9f0e6813ba8aef716ebbbc07469f399..ab79731a561a448d85c9829423f1b0b09b52e33b 100644 (file)
--- a/package/system/ubox/Makefile
+++ b/package/system/ubox/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ubox
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=$(LEDE_GIT)/project/ubox.git
-PKG_SOURCE_DATE:=2017-01-29
-PKG_SOURCE_VERSION:=ac2d43e7c84fa3041ee2bf5709fdf69352189317
-PKG_MIRROR_HASH:=f793550b6164f519a08ff2d8cb7c5ca74e8d573c03f0d7ee6473db3cbb90ee3a
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git
+PKG_SOURCE_DATE:=2019-04-07
+PKG_SOURCE_VERSION:=5130fa4d9c5d15d643506f906927b209d7690a83
+PKG_MIRROR_HASH:=58b19e4b4e4ba7cdaf7359222dc8e53781a7804d3349dc5a5f08eb72e6a47deb
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0
@@ -27,18 +27,28 @@ define Package/ubox
   TITLE:=OpenWrt system helper toolbox
 endef
 
+define Package/getrandom
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=OpenWrt getrandom system helper
+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/getrandom/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/getrandom $(1)/usr/bin/
+endef
+
 define Package/ubox/install
        $(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) kmodloader $(1)/sbin/rmmod
@@ -56,4 +66,5 @@ define Package/logd/install
 endef
 
 $(eval $(call BuildPackage,ubox))
+$(eval $(call BuildPackage,getrandom))
 $(eval $(call BuildPackage,logd))