From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Message-ID: <53BCF7B3.5030403@pengutronix.de> Date: Wed, 09 Jul 2014 10:05:07 +0200 From: Marc Kleine-Budde MIME-Version: 1.0 References: <1404830025-22351-1-git-send-email-alex.aring@gmail.com> <53BC03E9.301@pengutronix.de> <20140709072036.GA4423@omega> <53BCEFFE.4080505@pengutronix.de> <20140709080318.GB11028@omega> In-Reply-To: <20140709080318.GB11028@omega> Subject: Re: [ptxdist] [PATCH] ptxd_make_dts_dtc: handle error if dtc failed Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1738089783==" Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: Alexander Aring Cc: ptxdist@pengutronix.de This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============1738089783== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="MQB7CpfVmhvEgLO4jFnp72OUkd20CWJtE" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --MQB7CpfVmhvEgLO4jFnp72OUkd20CWJtE Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 07/09/2014 10:03 AM, Alexander Aring wrote: > On Wed, Jul 09, 2014 at 09:32:14AM +0200, Marc Kleine-Budde wrote: >> On 07/09/2014 09:20 AM, Alexander Aring wrote: >>> On Tue, Jul 08, 2014 at 04:44:57PM +0200, Marc Kleine-Budde wrote: >>>> On 07/08/2014 04:33 PM, Alexander Aring wrote: >>>>> This patch adds error handling for the ptxd_make_dts_dtb function. >>>>> >>>>> Signed-off-by: Alexander Aring >>>>> --- >>>>> scripts/lib/ptxd_make_dts_dtc.sh | 14 ++++++++------ >>>>> 1 file changed, 8 insertions(+), 6 deletions(-) >>>>> >>>>> diff --git a/scripts/lib/ptxd_make_dts_dtc.sh b/scripts/lib/ptxd_ma= ke_dts_dtc.sh >>>>> index 24c5604..46eaa9d 100644 >>>>> --- a/scripts/lib/ptxd_make_dts_dtc.sh >>>>> +++ b/scripts/lib/ptxd_make_dts_dtc.sh >>>>> @@ -29,7 +29,7 @@ ptxd_make_dts_dtb() { >>>>> deps=3D"${ptx_state_dir}/dtc.$(basename "${dts}").deps" >>>>> tmp_deps=3D"${PTXDIST_TEMPDIR}/dts.deps" >>>>> =20 >>>>> - echo "CPP $(ptxd_print_path "${tmp_dts}")" >>>>> + echo "CPP $(ptxd_print_path "${tmp_dts}")" && >>>>> cpp \ >>>>> -Wp,-MD,${tmp_deps} \ >>>>> -Wp,-MT,${tmp_dts} \ >>>>> @@ -42,22 +42,22 @@ ptxd_make_dts_dtb() { >>>>> -I${dts_kernel_dir}/include \ >>>>> -undef -D__DTS__ -x assembler-with-cpp \ >>>>> -o ${tmp_dts} \ >>>>> - ${dts} >>>>> + ${dts} && >>>>> =20 >>>>> sed -e "s;^${tmp_dts}:;${dts_dtb}:;" \ >>>>> - -e 's;^ \([^ ]*\); $(wildcard \1);' "${tmp_deps}" > "${deps}" >>>>> + -e 's;^ \([^ ]*\); $(wildcard \1);' "${tmp_deps}" > "${deps}" && >>>>> =20 >>>>> if dtc -h 2>&1 | grep -q '^[[:space:]]\+-i\(,.*\)\?$'; then >>>>> dtc_include=3D"-i $(dirname "${dts}") -i ${dts_kernel_dir}/arch/$= {dts_kernel_arch}/boot/dts" >>>>> fi >>>> >>>> ^^^ >>>> I think a && is missing here. >>>> >>> I tought that too, because the dirname call. But when I insert a && >> >> It's not only about the dirname call, the && is needed, so that the ||= >> bailout will kick in. >> >>> there I get: >>> >>> ../scripts/lib/ptxd_make_dts_dtc.sh: line 53: syntax error near unexp= ected token `&&' >>> ../scripts/lib/ptxd_make_dts_dtc.sh: line 53: ` &&' >>> ptxdist: error: failed to source lib: ..scripts/lib/ptxd_make_dts_dtc= =2Esh >> >=20 > I tested: >=20 > if dtc -h 2>&1 | grep -q '^[[:space:]]\+-i\(,.*\)\?$'; then > dtc_include=3D"-i $(dirname "${dts}") -i ${dts_kernel_dir}/arch/${dts_= kernel_arch}/boot/dts" > fi = =20 > && >=20 > and >=20 > if dtc -h 2>&1 | grep -q '^[[:space:]]\+-i\(,.*\)\?$'; then > dtc_include=3D"-i $(dirname "${dts}") -i ${dts_kernel_dir}/arch/${dts_= kernel_arch}/boot/dts" > && > fi = =20 >=20 > ... >=20 > vi show me at the last one that's a syntax mismatch. What about: >> if dtc -h 2>&1 | grep -q '^[[:space:]]\+-i\(,.*\)\?$'; then >> dtc_include=3D"-i $(dirname "${dts}") -i ${dts_kernel_dir}/arch/${dts= _kernel_arch}/boot/dts" >> fi && Marc --=20 Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | --MQB7CpfVmhvEgLO4jFnp72OUkd20CWJtE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iEYEARECAAYFAlO897MACgkQjTAFq1RaXHNbVgCeJWCoSIlZV4bcGJVkOouGwqqw R90An0W18SAi2agf0MxmDigCpjp5ycdd =fHWD -----END PGP SIGNATURE----- --MQB7CpfVmhvEgLO4jFnp72OUkd20CWJtE-- --===============1738089783== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============1738089783==--