From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 10 Nov 2023 10:37:24 +0100 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.96) (envelope-from ) id 1r1Nx5-005dFi-2p for lore@lore.pengutronix.de; Fri, 10 Nov 2023 10:37:24 +0100 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 1r1Nx5-0005Nd-2H; Fri, 10 Nov 2023 10:37:23 +0100 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 1r1Nwq-0005NT-VZ; Fri, 10 Nov 2023 10:37:08 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.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 1r1Nwq-007zHb-JR; Fri, 10 Nov 2023 10:37:08 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1r1Nwq-00GbSE-Ah; Fri, 10 Nov 2023 10:37:08 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: ptxdist@pengutronix.de Date: Fri, 10 Nov 2023 10:37:06 +0100 Message-ID: <20231110093705.45879-2-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1308; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=yf7btCk7NoI9BahUJx8yXprMjz6qL/blk0ex3HLwY+A=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlTfnCzoBydLTVRSampb3PS/mUrai11ehtxU4Xp 0zK7GviqH2JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZU35wgAKCRCPgPtYfRL+ ToM2B/0S6lGlEEmcCbzxp3VAUsAnDaRTCNtCLwmmWHrV91m6uTqo2jJQpxB+3EIQ3zSeOpdq0q2 PlZdKYAo1ThAKJcqzRN+r0oGxMSiGoenoP03w/x0/8c238Ch9RBV/Okon7nClihhYStFSLYv2bv xlZzt4IUwQoEoXjeyRLnhHWlm95ColUudoT1IKU+racP14E3emu2z0JS0b0bOyHD7O/3B6XRNX5 tDqXN6GSB1jLV176ykjv0dBO8Exm2W/v7dun6iN/yhBiVMe7CGkDoLoms3Oj6J+eTXF5DFikizH mxHq1IU6Cc6EKZMW5L8Dpl7dFKPVAOmEJ5+dA41MiMeg0g/B X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] ptxd_make_nested: Fix parameter passing for --dirty, --force and --pedantic X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Some variables corresponding to ptxdist parameters use "true" as value when given, others use "1". PTXDIST_DIRTY, PTXDIST_FORCE and PTXDIST_PEDANTIC are in the first group according to git grep -E 'PTXDIST_(DIRTY|FORCE|FEDANTIC)=' . Adapt ptxd_make_nested_ptxdist() accordingly. Fixes: 5169ae99daf8 ("add support for nested PTXdist execution") Signed-off-by: Uwe Kleine-König --- scripts/lib/ptxd_make_nested.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/lib/ptxd_make_nested.sh b/scripts/lib/ptxd_make_nested.sh index cae12bceb377..2c4af5337207 100644 --- a/scripts/lib/ptxd_make_nested.sh +++ b/scripts/lib/ptxd_make_nested.sh @@ -46,13 +46,13 @@ ptxd_make_nested_ptxdist() { fi args=( "cd" "${pkg_workspace}" "&&" "${PTXDIST_TOPDIR}/bin/ptxdist" ) - if [ "${PTXDIST_DIRTY}" = 1 ]; then + if [ "${PTXDIST_DIRTY}" = true ]; then args[${#args[*]}]="--dirty" fi - if [ "${PTXDIST_FORCE}" = 1 ]; then + if [ "${PTXDIST_FORCE}" = true ]; then args[${#args[*]}]="--force" fi - if [ "${PTXDIST_PEDANTIC}" = 1 ]; then + if [ "${PTXDIST_PEDANTIC}" = true ]; then args[${#args[*]}]="--pedantic" fi if [ "${PTXDIST_QUIET}" = 1 ]; then -- 2.42.0