Przeglądaj źródła

package/libubox: bump version to git ecddb31dc3

This bump includes patches which add cmake4 compatibility.

json-c is now a mandatory dependency due to upstream commit:
https://git.openwrt.org/?p=project/libubox.git;a=commitdiff;h=b7acc8e6fd5e13611ad90a593e98f9589af4009a

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
Bernd Kuhls 1 miesiąc temu
rodzic
commit
9e9fb09380

+ 3 - 0
package/libubox/Config.in

@@ -1,6 +1,8 @@
 config BR2_PACKAGE_LIBUBOX
 config BR2_PACKAGE_LIBUBOX
 	bool "libubox"
 	bool "libubox"
 	depends on !BR2_STATIC_LIBS
 	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
+	select BR2_PACKAGE_JSON_C
 	help
 	help
 	  This library originates from the OpenWrt project to
 	  This library originates from the OpenWrt project to
 	  handle the configuration file infrastructure, but can
 	  handle the configuration file infrastructure, but can
@@ -11,3 +13,4 @@ config BR2_PACKAGE_LIBUBOX
 
 
 comment "libubox needs a toolchain w/ dynamic library"
 comment "libubox needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
 	depends on BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4

+ 1 - 1
package/libubox/libubox.hash

@@ -1,2 +1,2 @@
 # Locally calculated
 # Locally calculated
-sha256  df6e1350fd11016ef30242a279cec195d91e6748c11c40e0991593718c46fa52  libubox-3868f47c8f6c6570e62a3cdf8a7f26ffb1a67e6a-git4.tar.gz
+sha256  c4432d4f902bd0a2974d3fe76620bbb5e04b9d52e55701829aa12507651bc4d9  libubox-ecddb31dc34d89be5c9dc4595a4c58070eb090e4-git4.tar.gz

+ 2 - 2
package/libubox/libubox.mk

@@ -4,12 +4,12 @@
 #
 #
 ################################################################################
 ################################################################################
 
 
-LIBUBOX_VERSION = 3868f47c8f6c6570e62a3cdf8a7f26ffb1a67e6a
+LIBUBOX_VERSION = ecddb31dc34d89be5c9dc4595a4c58070eb090e4
 LIBUBOX_SITE = https://git.openwrt.org/project/libubox.git
 LIBUBOX_SITE = https://git.openwrt.org/project/libubox.git
 LIBUBOX_SITE_METHOD = git
 LIBUBOX_SITE_METHOD = git
 LIBUBOX_LICENSE = ISC, BSD-3-Clause
 LIBUBOX_LICENSE = ISC, BSD-3-Clause
 LIBUBOX_INSTALL_STAGING = YES
 LIBUBOX_INSTALL_STAGING = YES
-LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c)
+LIBUBOX_DEPENDENCIES = json-c
 
 
 ifeq ($(BR2_USE_MMU)$(BR2_PACKAGE_LUA_5_1),yy)
 ifeq ($(BR2_USE_MMU)$(BR2_PACKAGE_LUA_5_1),yy)
 LIBUBOX_DEPENDENCIES += lua
 LIBUBOX_DEPENDENCIES += lua

+ 2 - 0
package/libuci/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBUCI
 config BR2_PACKAGE_LIBUCI
 	bool "libuci"
 	bool "libuci"
 	depends on !BR2_STATIC_LIBS
 	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libubox -> json-c
 	select BR2_PACKAGE_LIBUBOX
 	select BR2_PACKAGE_LIBUBOX
 	help
 	help
 	  This library originates from the OpenWrt project to
 	  This library originates from the OpenWrt project to
@@ -14,3 +15,4 @@ config BR2_PACKAGE_LIBUCI
 
 
 comment "libuci needs a toolchain w/ dynamic library"
 comment "libuci needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
 	depends on BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4

+ 1 - 1
package/ubus/Config.in

@@ -4,7 +4,7 @@ comment "ubus needs a toolchain w/ dynamic library"
 
 
 config BR2_PACKAGE_UBUS
 config BR2_PACKAGE_UBUS
 	bool "ubus"
 	bool "ubus"
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c, libubox -> json-c
 	depends on !BR2_STATIC_LIBS # libubox
 	depends on !BR2_STATIC_LIBS # libubox
 	select BR2_PACKAGE_LIBUBOX
 	select BR2_PACKAGE_LIBUBOX
 	select BR2_PACKAGE_JSON_C
 	select BR2_PACKAGE_JSON_C

+ 1 - 1
package/uhttpd/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_UHTTPD
 config BR2_PACKAGE_UHTTPD
 	bool "uhttpd"
 	bool "uhttpd"
 	depends on !BR2_STATIC_LIBS # dlopen()
 	depends on !BR2_STATIC_LIBS # dlopen()
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c, libubox -> json-c
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBUBOX
 	select BR2_PACKAGE_LIBUBOX
 	select BR2_PACKAGE_JSON_C
 	select BR2_PACKAGE_JSON_C

+ 1 - 1
package/uqmi/Config.in

@@ -1,6 +1,6 @@
 config BR2_PACKAGE_UQMI
 config BR2_PACKAGE_UQMI
 	bool "uqmi"
 	bool "uqmi"
-	depends on !BR2_STATIC_LIBS # libubox
+	depends on !BR2_STATIC_LIBS # libubox, libubox -> json-c
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
 	select BR2_PACKAGE_JSON_C
 	select BR2_PACKAGE_JSON_C
 	select BR2_PACKAGE_LIBUBOX
 	select BR2_PACKAGE_LIBUBOX

+ 3 - 1
package/ustream-ssl/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_USTREAM_SSL
 config BR2_PACKAGE_USTREAM_SSL
 	bool "ustream-ssl"
 	bool "ustream-ssl"
-	depends on !BR2_STATIC_LIBS #libubox
+	depends on !BR2_STATIC_LIBS # libubox
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libubox -> json-c
 	select BR2_PACKAGE_LIBUBOX
 	select BR2_PACKAGE_LIBUBOX
 	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS
 	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS
 	help
 	help
@@ -10,3 +11,4 @@ config BR2_PACKAGE_USTREAM_SSL
 
 
 comment "ustream-ssl needs a toolchain w/ dynamic library"
 comment "ustream-ssl needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
 	depends on BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4