[ptxdist] [PATCH] lshw: Set VERSION variable

[ptxdist] [PATCH] lshw: Set VERSION variable

[Sven Püschel]

The lshw Makefile defaults to a git describe if the version
variable isn't set. This may cause it to use the version
of a parent git repository like DistroKit, as lshw is extracted from a
tarball.

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 rules/lshw.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/lshw.make b/rules/lshw.make
index 1feb82dba..dbc911dfe 100644
--- a/rules/lshw.make
+++ b/rules/lshw.make
@@ -35,7 +35,7 @@ LSHW_CONF_TOOL		:= NO
 # the "src" subdir avoids this.
 LSHW_SUBDIR		:= src
 
-LSHW_MAKE_ENV		:= $(CROSS_ENV)
+LSHW_MAKE_ENV		:= $(CROSS_ENV) VERSION=$(LSHW_VERSION)
 LSHW_MAKE_OPT		:= all
 LSHW_INSTALL_OPT	:= install
 
-- 
2.30.2

Re: [ptxdist] [APPLIED] lshw: Set VERSION variable

[Michael Olbrich]

Thanks, applied as 27647e4b15b096b8b5e1521d8bda7181bda5731a.

Michael

[sent from post-receive hook]

On Fri, 10 Feb 2023 15:17:24 +0100, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> The lshw Makefile defaults to a git describe if the version
> variable isn't set. This may cause it to use the version
> of a parent git repository like DistroKit, as lshw is extracted from a
> tarball.
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20230207141307.334029-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/lshw.make b/rules/lshw.make
> index 1feb82dba8e8..dbc911dfe7d4 100644
> --- a/rules/lshw.make
> +++ b/rules/lshw.make
> @@ -35,7 +35,7 @@ LSHW_CONF_TOOL		:= NO
>  # the "src" subdir avoids this.
>  LSHW_SUBDIR		:= src
>  
> -LSHW_MAKE_ENV		:= $(CROSS_ENV)
> +LSHW_MAKE_ENV		:= $(CROSS_ENV) VERSION=$(LSHW_VERSION)
>  LSHW_MAKE_OPT		:= all
>  LSHW_INSTALL_OPT	:= install
>