PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=$(LEDE_GIT)/project/ubox.git
-PKG_SOURCE_DATE:=2017-11-06
-PKG_SOURCE_VERSION:=2c0d9cfe05e9712d44622c6bb4558e97359bfb76
-PKG_MIRROR_HASH:=e545a29959a310fd7243ee2e799bf9f759894ea4e872010a781c3a65290377b6
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git
+PKG_SOURCE_DATE:=2024-03-02
+PKG_SOURCE_VERSION:=d413903016c4dc9190926e38ff72fbf7d3d69115
+PKG_MIRROR_HASH:=51f529b8b686725954bd8ea17b6734c1b5bb3ad8eb0bc57d19c89694a78d651c
CMAKE_INSTALL:=1
PKG_LICENSE:=GPL-2.0
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
+ SECTION:=base
CATEGORY:=Base system
- DEPENDS:=+libubox +libubus +libblobmsg-json +USE_GLIBC:librt
+ DEPENDS:=+libubox +libubus +libblobmsg-json +libudebug
TITLE:=OpenWrt system log implementation
+ USERID:=logd=514:logd=514
+ ALTERNATIVES:=200:/sbin/logread:/usr/libexec/logread-ubox
+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_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib $(1)/usr/bin $(1)/etc
$(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
- $(LN) kmodloader $(1)/sbin/insmod
- $(LN) kmodloader $(1)/sbin/lsmod
- $(LN) kmodloader $(1)/sbin/modinfo
- $(LN) kmodloader $(1)/sbin/modprobe
+ $(INSTALL_DATA) ./files/modules.conf $(1)/etc/modules.conf
endef
define Package/logd/install
- $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/
+ $(INSTALL_DIR) $(1)/sbin $(1)/usr/libexec/ $(1)/etc/init.d/ $(1)/usr/share/acl.d
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{logd,logread} $(1)/sbin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/logd $(1)/sbin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/logread $(1)/usr/libexec/logread-ubox
$(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))