diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index c62278adc5..076cb37e53 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git -PKG_MIRROR_HASH:=f22de22a784a0135cc2869fe81ff30e52136dca36863ee713503b4be5be01869 -PKG_SOURCE_DATE:=2023-05-23 -PKG_SOURCE_VERSION:=75a3b870cace1171faf57bd55e5a9a2f1564f757 +PKG_MIRROR_HASH:=ec4487b5edc071a127b21a63666c20ac1ad516cd48629ee600a679040c709faf +PKG_SOURCE_DATE:=2023-11-28 +PKG_SOURCE_VERSION:=e80dc00ee90c29ef56ae28f414b0e5bb361206e7 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE)) CMAKE_INSTALL:=1 diff --git a/package/libs/udebug/Makefile b/package/libs/udebug/Makefile index 04fd741957..2c25eb72fd 100644 --- a/package/libs/udebug/Makefile +++ b/package/libs/udebug/Makefile @@ -11,9 +11,9 @@ PKG_NAME:=udebug CMAKE_INSTALL:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/udebug.git -PKG_MIRROR_HASH:=baf437fb12b1faaf6c7eea3fea253c6d87c31b85f768b48d3984fe398e5b20b8 -PKG_SOURCE_DATE:=2023-11-20 -PKG_SOURCE_VERSION:=759d9404034b7da97b3950c806ace7296a0f7a12 +PKG_MIRROR_HASH:=c0d3701516dcbe0fe2badbeda50076e4f07ec054c4a80621c7aaf4e83ea75d0c +PKG_SOURCE_DATE:=2023-11-27 +PKG_SOURCE_VERSION:=d4b99820afd03a726ea50687d4393007da0fd0df PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE)) PKG_LICENSE:=GPL-2.0 @@ -26,14 +26,14 @@ define Package/libudebug SECTION:=libs CATEGORY:=Libraries TITLE:=udebug client library - DEPENDS:=+libubox + DEPENDS:=+libubox +libubus endef define Package/udebugd SECTION:=utils CATEGORY:=Utilities TITLE:=OpenWrt debug service - DEPENDS:=+libudebug +libubus + DEPENDS:=+libudebug endef define Package/udebugd/conffiles diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index e91763b074..17bade25e4 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -63,10 +63,11 @@ define Package/ubox/install endef define Package/logd/install - $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/ + $(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)) diff --git a/package/system/ubox/files/logd.json b/package/system/ubox/files/logd.json new file mode 100644 index 0000000000..f0b2fb1e12 --- /dev/null +++ b/package/system/ubox/files/logd.json @@ -0,0 +1,4 @@ +{ + "user": "logd", + "publish": [ "log" ] +} diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile index 42737ff470..fdf16cfeee 100644 --- a/package/system/ubus/Makefile +++ b/package/system/ubus/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git -PKG_SOURCE_DATE:=2023-11-14 -PKG_SOURCE_VERSION:=b3e8c4ef07ebb6f0f34a5c1f0dc1539068363619 -PKG_MIRROR_HASH:=bb7296b17d5a59b9080d4c9ae188dee49f49c0ce88a5cbe0317102123583d663 +PKG_SOURCE_DATE:=2023-11-28 +PKG_SOURCE_VERSION:=f84eb5998c6ea2d34989ca2d3254e56c66139313 +PKG_MIRROR_HASH:=d0c15a0275fa3d35accddb84611700bf601745ad68462bc18905bb65da931f21 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE)) CMAKE_INSTALL:=1