From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 18 Oct 2023 11:15:51 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) 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 ) id 1qt2ed-00CozJ-Rs for lore@lore.pengutronix.de; Wed, 18 Oct 2023 11:15:51 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qt2ec-0003dB-Qq; Wed, 18 Oct 2023 11:15:50 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qt2eb-0003co-1x; Wed, 18 Oct 2023 11:15:49 +0200 Received: from [2a0a:edc0:2:b01:1d::c0] (helo=ptx.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qt2ea-002WQy-M2; Wed, 18 Oct 2023 11:15:48 +0200 Received: from rsc by ptx.whiteo.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1qt2ea-00F3uH-Js; Wed, 18 Oct 2023 11:15:48 +0200 Date: Wed, 18 Oct 2023 11:15:48 +0200 From: Robert Schwebel To: Roland Hieber Message-ID: <20231018091548.GR3184561@pengutronix.de> References: <20231010091028.3444582-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231010091028.3444582-1-rhi@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [DistroKit] [PATCH] qemu-run: don't evaluate selected_platformconfig X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: distrokit@pengutronix.de Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Applied to next. On Tue, Oct 10, 2023 at 11:10:28AM +0200, Roland Hieber wrote: > Even when a selected_platformconfig symlink exists, ptxdist can still be > used with the --platformconfig=... option to override the platformconfig > during the build. In this case, running the qemu script will search in > the wrong build folder for the images. > > Don't use the selected_platformconfig link to find out the platform, > instead determine it from the path of the qemu script itself. > > Signed-off-by: Roland Hieber > --- > configs/platform-mips/run | 9 ++------- > configs/platform-mipsel/run | 9 ++------- > configs/platform-v7a/run | 9 ++------- > configs/platform-v7a_noneon/run | 9 ++------- > configs/platform-x86_64/run | 11 +++-------- > 5 files changed, 11 insertions(+), 36 deletions(-) > > diff --git a/configs/platform-mips/run b/configs/platform-mips/run > index e41f01283ca3..6d6fca68c2cd 100755 > --- a/configs/platform-mips/run > +++ b/configs/platform-mips/run > @@ -1,17 +1,12 @@ > #!/bin/bash > > -platformconfig=selected_platformconfig > -# fallback to platformconfig in the same dir as this script > -if [ ! -e "$platformconfig" ]; then > - platformconfig=$(dirname $0)/platformconfig > -fi > +platformconfig=$(dirname $0)/platformconfig > > # > # we need information about the platform > # > if [ ! -e "$platformconfig" ]; then > - echo "error: selected_platformconfig does not exist" > - echo " please use 'ptxdist platform ...' or 'ptxdist --platformconfig=...'" > + echo "error: ${platformconfig} does not exist" > exit 1 > fi > > diff --git a/configs/platform-mipsel/run b/configs/platform-mipsel/run > index 6407f0c0729e..9ecf65b2e429 100755 > --- a/configs/platform-mipsel/run > +++ b/configs/platform-mipsel/run > @@ -1,17 +1,12 @@ > #!/bin/bash > > -platformconfig=selected_platformconfig > -# fallback to platformconfig in the same dir as this script > -if [ ! -e "$platformconfig" ]; then > - platformconfig=$(dirname $0)/platformconfig > -fi > +platformconfig=$(dirname $0)/platformconfig > > # > # we need information about the platform > # > if [ ! -e "$platformconfig" ]; then > - echo "error: selected_platformconfig does not exist" > - echo " please use 'ptxdist platform ...' or 'ptxdist --platformconfig=...'" > + echo "error: ${platformconfig} does not exist" > exit 1 > fi > > diff --git a/configs/platform-v7a/run b/configs/platform-v7a/run > index 3874a7b2f0af..257dc1a6fd2e 100755 > --- a/configs/platform-v7a/run > +++ b/configs/platform-v7a/run > @@ -1,17 +1,12 @@ > #!/bin/bash > > -platformconfig=selected_platformconfig > -# fallback to platformconfig in the same dir as this script > -if [ ! -e "$platformconfig" ]; then > - platformconfig=$(dirname $0)/platformconfig > -fi > +platformconfig=$(dirname $0)/platformconfig > > # > # we need information about the platform > # > if [ ! -e "$platformconfig" ]; then > - echo "error: selected_platformconfig does not exist" > - echo " please use 'ptxdist platform ...' or 'ptxdist --platformconfig=...'" > + echo "error: ${platformconfig} does not exist" > exit 1 > fi > > diff --git a/configs/platform-v7a_noneon/run b/configs/platform-v7a_noneon/run > index 0bb06bc60868..ccdcdb91c767 100755 > --- a/configs/platform-v7a_noneon/run > +++ b/configs/platform-v7a_noneon/run > @@ -1,17 +1,12 @@ > #!/bin/bash > > -platformconfig=selected_platformconfig > -# fallback to platformconfig in the same dir as this script > -if [ ! -e "$platformconfig" ]; then > - platformconfig=$(dirname $0)/platformconfig > -fi > +platformconfig=$(dirname $0)/platformconfig > > # > # we need information about the platform > # > if [ ! -e "$platformconfig" ]; then > - echo "error: selected_platformconfig does not exist" > - echo " please use 'ptxdist platform ...' or 'ptxdist --platformconfig=...'" > + echo "error: ${platformconfig} does not exist" > exit 1 > fi > > diff --git a/configs/platform-x86_64/run b/configs/platform-x86_64/run > index ddc510070418..b826b4436d0d 100755 > --- a/configs/platform-x86_64/run > +++ b/configs/platform-x86_64/run > @@ -1,17 +1,12 @@ > #!/bin/bash > > -platformconfig=selected_platformconfig > -# fallback to platformconfig in the same dir as this script > -if [ ! -e "$platformconfig" ]; then > - platformconfig=$(dirname $0)/platformconfig > -fi > - > +platformconfig=$(dirname $0)/platformconfig > +# > # > # we need information about the platform > # > if [ ! -e "$platformconfig" ]; then > - echo "error: selected_platformconfig does not exist" > - echo " please use 'ptxdist platform ...' or 'ptxdist --platformconfig=...'" > + echo "error: ${platformconfig} does not exist" > exit 1 > fi > > -- > 2.39.2 > > > -- Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |