[Buildroot] [PATCH 1/1] package/swupdate: specify SWU_VER during build

[Buildroot] [PATCH 1/1] package/swupdate: specify SWU_VER during build

[Vincent Fazio]

The swupdate build process uses SWU_VER as part of the build commandline
for compiling objects to define the value for use in globals.h (see also
Makefile.flags).

This value is also used to communicate capabilities to lua handlers
(see upstream 0f38ff186e76c55c8d00ccb53739a29bcca91445).

When swupdate gets built, SWU_VER defaults to using `git describe` to
determine the version. This, unfortunately, picks up the version of the
Buildroot checkout and not the actual version of swupdate.

Now, specify SWU_VER as part of the make options to override the
calculated value so the proper version is reported.

Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
---
 package/swupdate/swupdate.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk
index b2f50d2b71..2f618b2e79 100644
--- a/package/swupdate/swupdate.mk
+++ b/package/swupdate/swupdate.mk
@@ -209,6 +209,7 @@ SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG))
 SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
 
 SWUPDATE_MAKE_OPTS = \
+	SWU_VER="$(SWUPDATE_VERSION) (Buildroot $(BR2_VERSION_FULL))"
 	CROSS_COMPILE="$(TARGET_CROSS)" \
 	CONFIG_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
 	CONFIG_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)"
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/swupdate: specify SWU_VER during build

[Thomas Petazzoni via buildroot]

On Fri,  4 Nov 2022 10:12:42 -0500
Vincent Fazio <vfazio@xes-inc.com> wrote:

> The swupdate build process uses SWU_VER as part of the build commandline
> for compiling objects to define the value for use in globals.h (see also
> Makefile.flags).
> 
> This value is also used to communicate capabilities to lua handlers
> (see upstream 0f38ff186e76c55c8d00ccb53739a29bcca91445).
> 
> When swupdate gets built, SWU_VER defaults to using `git describe` to
> determine the version. This, unfortunately, picks up the version of the
> Buildroot checkout and not the actual version of swupdate.
> 
> Now, specify SWU_VER as part of the make options to override the
> calculated value so the proper version is reported.
> 
> Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
> ---
>  package/swupdate/swupdate.mk | 1 +
>  1 file changed, 1 insertion(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/swupdate: specify SWU_VER during build

[Peter Korsgaard]

>>>>> "Vincent" == Vincent Fazio <vfazio@xes-inc.com> writes:

 > The swupdate build process uses SWU_VER as part of the build commandline
 > for compiling objects to define the value for use in globals.h (see also
 > Makefile.flags).

 > This value is also used to communicate capabilities to lua handlers
 > (see upstream 0f38ff186e76c55c8d00ccb53739a29bcca91445).

 > When swupdate gets built, SWU_VER defaults to using `git describe` to
 > determine the version. This, unfortunately, picks up the version of the
 > Buildroot checkout and not the actual version of swupdate.

 > Now, specify SWU_VER as part of the make options to override the
 > calculated value so the proper version is reported.

 > Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>

Committed to 2022.08.x and 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot