From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Fri, 10 Feb 2023 15:18:32 +0100
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1pQUEU-0036Nb-9Q
	for lore@lore.pengutronix.de; Fri, 10 Feb 2023 15:18:32 +0100
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1pQUEQ-0000tT-Ll; Fri, 10 Feb 2023 15:18:30 +0100
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1pQUDO-0005b5-Hv; Fri, 10 Feb 2023 15:17:26 +0100
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1pQUDM-0040Ae-Lh; Fri, 10 Feb 2023 15:17:25 +0100
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1pQUDM-00EpSq-Le; Fri, 10 Feb 2023 15:17:24 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Fri, 10 Feb 2023 15:17:24 +0100
Message-Id: <20230210141724.3534377-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20230207141307.334029-1-s.pueschel@pengutronix.de>
References: <20230207141307.334029-1-s.pueschel@pengutronix.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] lshw: Set VERSION variable
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= <s.pueschel@pengutronix.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false

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
>