Re: [Buildroot] [PATCH] package/swupdate: bump version to 2023.12

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Giulio, All,

On 2023-12-18 14:11 +0100, Giulio Benetti spake thusly:
> * make json-c mandatory according to [0]
> * make libubootenv mandatory according to [1]
> * drop local patch that has been upstreamed [2]
> 
> [0]: https://github.com/sbabic/swupdate/commit/82e75322443e021d119a026a3476c410f4705d67
> [1]: https://github.com/sbabic/swupdate/commit/75838874e2575f822ed85d89532f47e9adf781b6
> [2]: https://github.com/sbabic/swupdate/commit/1999685830d6e9b57014666b9e53e46de17a471c
> 
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> ---
[--SNIP--]
> diff --git a/package/swupdate/Config.in b/package/swupdate/Config.in
> index 7d9fc90e10..b5a567fa8f 100644
> --- a/package/swupdate/Config.in
> +++ b/package/swupdate/Config.in
> @@ -3,9 +3,10 @@ config BR2_PACKAGE_SWUPDATE
>  	depends on !BR2_STATIC_LIBS
>  	depends on BR2_TOOLCHAIN_HAS_THREADS
>  	depends on BR2_USE_MMU # fork()
> +	select BR2_PACKAGE_JSON_C

Json-C depends on SYNC_4, so you must propagate the depndency.

> +	select BR2_PACKAGE_LIBUBOOTENV
>  	# swupdate requires a parser and uses libconfig as default
> -	select BR2_PACKAGE_LIBCONFIG if !BR2_PACKAGE_JSON_C && \
> -		!BR2_PACKAGE_HAS_LUAINTERPRETER
> +	select BR2_PACKAGE_LIBCONFIG if !BR2_PACKAGE_HAS_LUAINTERPRETER

Previously, when json-C was enabled, libconfig was not necessary. Now,
json-c is always enabled (it is selected), so is it still needed to
force libconfig even without a lua-interpreter?

Regards,
Yann E. MORIN.

>  	help
>  	  swupdate provides a reliable way to update the software on
>  	  an embedded system.
> diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash
> index 72b71ce12d..c19a82304f 100644
> --- a/package/swupdate/swupdate.hash
> +++ b/package/swupdate/swupdate.hash
> @@ -1,5 +1,5 @@
>  # Locally calculated
> -sha256  888df5050035e4fbe14e3a964885646fa3163e727f78c423c3d24c28f7a50b66  swupdate-2023.05.tar.gz
> +sha256  ce24032300e2b6a6faa3d22e49f981fd90f04ac6f5d7e802166824b0cd5ca669  swupdate-2023.12.tar.gz
>  sha256  4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683  LICENSES/BSD-1-Clause.txt
>  sha256  e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6  LICENSES/BSD-3-Clause.txt
>  sha256  0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192  LICENSES/CC0-1.0.txt
> diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk
> index ea4a5a62e5..ca8c140886 100644
> --- a/package/swupdate/swupdate.mk
> +++ b/package/swupdate/swupdate.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -SWUPDATE_VERSION = 2023.05
> +SWUPDATE_VERSION = 2023.12
>  SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION))
>  SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, OFL-1.1
>  SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \
> @@ -18,6 +18,7 @@ SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \
>  	LICENSES/MIT.txt \
>  	LICENSES/OFL-1.1.txt
>  SWUPDATE_INSTALL_STAGING = YES
> +SWUPDATE_DEPENDENCIES = json-c libubootenv
>  
>  # swupdate uses $CROSS-cc instead of $CROSS-gcc, which is not
>  # available in all external toolchains, and use CC for linking. Ensure
> @@ -36,13 +37,6 @@ else
>  SWUPDATE_MAKE_ENV += HAVE_LIBEXT2FS=n
>  endif
>  
> -ifeq ($(BR2_PACKAGE_JSON_C),y)
> -SWUPDATE_DEPENDENCIES += json-c
> -SWUPDATE_MAKE_ENV += HAVE_JSON_C=y
> -else
> -SWUPDATE_MAKE_ENV += HAVE_JSON_C=n
> -endif
> -
>  ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)
>  SWUPDATE_DEPENDENCIES += libarchive
>  SWUPDATE_MAKE_ENV += HAVE_LIBARCHIVE=y
> @@ -85,13 +79,6 @@ else
>  SWUPDATE_MAKE_ENV += HAVE_LIBGPIOD=n
>  endif
>  
> -ifeq ($(BR2_PACKAGE_LIBUBOOTENV),y)
> -SWUPDATE_DEPENDENCIES += libubootenv
> -SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=y
> -else
> -SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=n
> -endif
> -
>  ifeq ($(BR2_PACKAGE_LIBURIPARSER),y)
>  SWUPDATE_DEPENDENCIES += liburiparser
>  SWUPDATE_MAKE_ENV += HAVE_URIPARSER=y
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot