aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2019-05-20 16:41:43 +0200
committerPetr Štetiar <ynezz@true.cz>2019-06-11 08:06:28 +0200
commit9b4de712cae9b3d745ea4331a804242505f58619 (patch)
treefc6650242c9394e5b08d1a5f7dbec6b7c0e3c497
parent714bd89fceee494282984d0ed76e4a3acde419e0 (diff)
downloadupstream-9b4de712cae9b3d745ea4331a804242505f58619.tar.gz
upstream-9b4de712cae9b3d745ea4331a804242505f58619.tar.bz2
upstream-9b4de712cae9b3d745ea4331a804242505f58619.zip
ubox: move getrandom into separate getrandom package
So it's possible to install or remove it as needed. Tested-by: Lucian Cristian <lucian.cristian@gmail.com> Signed-off-by: Petr Štetiar <ynezz@true.cz>
-rw-r--r--package/system/ubox/Makefile17
1 files changed, 14 insertions, 3 deletions
diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
index 268fab9d74..ab79731a56 100644
--- a/package/system/ubox/Makefile
+++ b/package/system/ubox/Makefile
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ubox
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git
@@ -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))