From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sun, 12 May 2024 15:17:38 +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.96) (envelope-from ) id 1s6958-00Avxs-2R for lore@lore.pengutronix.de; Sun, 12 May 2024 15:17:38 +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 1s6957-0004Op-Sk; Sun, 12 May 2024 15:17:37 +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 1s694E-0002gY-Go; Sun, 12 May 2024 15:16:42 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.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 1s694E-000zYW-4W; Sun, 12 May 2024 15:16:42 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1s694E-00FXUJ-0J; Sun, 12 May 2024 15:16:42 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Sun, 12 May 2024 15:16:42 +0200 Message-Id: <20240512131642.3703640-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240506105051.323546-3-ada@thorsis.com> References: <20240506105051.323546-3-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] ptxd_make_world_inject: Use _DIR directly 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 Cc: Alexander Dahl 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 Thanks, applied as 0eea7080662b36cd39f03a3b0785d0e4a1c346bc. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:41 +0200, Alexander Dahl wrote: > pkg_source was defined as "$($(1)_DIR)" which is the same as pkg_dir in > ptxd_make_world_common. We can use pkg_dir directly. Add a safe-guard > to bail out early if that var is empty. > > Signed-off-by: Alexander Dahl > Acked-by: Michael Riesch > Message-Id: <20240506105051.323546-3-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/post/ptxd_make_world_inject.make b/rules/post/ptxd_make_world_inject.make > index b7d28e92f25b..3506ee1140e1 100644 > --- a/rules/post/ptxd_make_world_inject.make > +++ b/rules/post/ptxd_make_world_inject.make > @@ -9,8 +9,7 @@ > world/inject/env = \ > $(call world/env, $(1)) \ > pkg_inject_path="$($(1)_INJECT_PATH)" \ > - pkg_inject_files="$($(1)_INJECT_FILES)" \ > - pkg_source="$($(1)_DIR)" > + pkg_inject_files="$($(1)_INJECT_FILES)" > > world/inject = \ > $(call world/inject/env,$(strip $(1))) \ > diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh > index 5c2d0dc5fb3e..b74e464c6895 100644 > --- a/scripts/lib/ptxd_make_world_inject.sh > +++ b/scripts/lib/ptxd_make_world_inject.sh > @@ -10,7 +10,7 @@ ptxd_make_inject() { > local source target > > source="$(echo ${inject_file} | cut -d ":" -f 1)" > - target="${pkg_source}/$(echo ${inject_file} | cut -d ":" -f 2)" > + target="${pkg_dir}/$(echo ${inject_file} | cut -d ":" -f 2)" > > if [[ "${source}" =~ ^/.* ]]; then > ptxd_bailout "'${source}' must not be an absolute path!" \ > @@ -32,6 +32,10 @@ export -f ptxd_make_inject > ptxd_make_world_inject() { > ptxd_make_world_init || return > > + if [ -z "${pkg_dir}" ]; then > + ptxd_bailout "_DIR empty, no destination to inject to." > + fi > + > for inject_file in ${pkg_inject_files}; do > ptxd_make_inject || return > done