include $(TOPDIR)/rules.mk
PKG_NAME:=ubox
-PKG_VERSION:=2015-03-29
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://nbd.name/luci2/ubox.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=dd338ce30b6158f3f6feda9f01a2f409a8a5832c
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git
+PKG_SOURCE_DATE:=2024-01-15
+PKG_SOURCE_VERSION:=c006dccecb6f1cf694c9fb9efc6727cbd2ab9ae4
+PKG_MIRROR_HASH:=7919d8d6f06fa50342eec805902d17c61d1224d9d35c392d3c5c36fc782a5c75
CMAKE_INSTALL:=1
-PKG_CHECK_FORMAT_SECURITY:=0
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=
-PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
+PKG_MAINTAINER:=John Crispin <john@phrozen.org>
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
-TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
-
define Package/ubox
SECTION:=base
CATEGORY:=Base system
- DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_GLIBC:librt
+ DEPENDS:=+libubox +ubusd +ubus +libubus +libuci
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/ubox/conffiles
+/etc/modules.conf
+endef
+
+define Package/getrandom
+ SECTION:=base
+ CATEGORY:=Base system
+ TITLE:=OpenWrt getrandom system helper
+endef
+
+define Package/logd
+ SECTION:=base
+ CATEGORY:=Base system
+ DEPENDS:=+libubox +libubus +libblobmsg-json +libudebug
+ TITLE:=OpenWrt system log implementation
+ USERID:=logd=514:logd=514
+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)/etc/init.d/
+ $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib $(1)/usr/bin $(1)/etc
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,logd,logread,validate_data} $(1)/sbin/
- $(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib
+ $(INSTALL_DATA) ./files/modules.conf $(1)/etc/modules.conf
+endef
- ln -s /sbin/kmodloader $(1)/usr/sbin/rmmod
- ln -s /sbin/kmodloader $(1)/usr/sbin/insmod
- ln -s /sbin/kmodloader $(1)/usr/sbin/lsmod
- ln -s /sbin/kmodloader $(1)/usr/sbin/modinfo
- ln -s /sbin/kmodloader $(1)/usr/sbin/modprobe
+define Package/logd/install
+ $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/ $(1)/usr/share/acl.d
+
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{logd,logread} $(1)/sbin/
+ $(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
+ $(INSTALL_DATA) ./files/logd.json $(1)/usr/share/acl.d
endef
$(eval $(call BuildPackage,ubox))
+$(eval $(call BuildPackage,getrandom))
+$(eval $(call BuildPackage,logd))