From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from gallifrey.ext.pengutronix.de ([2001:6f8:1178:4:5054:ff:fe8d:eefb] helo=bjornoya.do.blackshift.org) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1X4W3p-0000oP-3o for ptxdist@pengutronix.de; Tue, 08 Jul 2014 16:07:57 +0200 Received: from [IPv6:2001:6f8:105b:1122:5e51:4fff:fed6:c770] (unknown [IPv6:2001:6f8:105b:1122:5e51:4fff:fed6:c770]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (Client did not present a certificate) (Authenticated sender: frogger) by bjornoya.do.blackshift.org (Postfix) with ESMTPSA id A0C9962326 for ; Tue, 8 Jul 2014 16:07:56 +0200 (CEST) Message-ID: <53BBFB39.3050403@pengutronix.de> Date: Tue, 08 Jul 2014 16:07:53 +0200 From: Marc Kleine-Budde MIME-Version: 1.0 References: <1404824365-7638-1-git-send-email-alex.aring@gmail.com> <1404824365-7638-2-git-send-email-alex.aring@gmail.com> <53BBF08A.1050802@pengutronix.de> <20140708132434.GA28466@omega> <53BBF27D.50005@pengutronix.de> <20140708134619.GA8389@omega> In-Reply-To: <20140708134619.GA8389@omega> Subject: Re: [ptxdist] [RFC] ptxd_make_dts_dtb: check on failure 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="===============2141483596==" Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============2141483596== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ag8xCfjQCnmI7HW1qCBEMR6prcWXbCu8G" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ag8xCfjQCnmI7HW1qCBEMR6prcWXbCu8G Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 07/08/2014 03:46 PM, Alexander Aring wrote: > On Tue, Jul 08, 2014 at 03:30:37PM +0200, Marc Kleine-Budde wrote: >> On 07/08/2014 03:24 PM, Alexander Aring wrote: >>> On Tue, Jul 08, 2014 at 03:22:18PM +0200, Marc Kleine-Budde wrote: >>>> On 07/08/2014 02:59 PM, Alexander Aring wrote: >>>>> This patch adds a error handling for the dtc and call a ptxd_bailou= t if >>>>> an error occur. >>>>> >>>>> Signed-off-by: Alexander Aring >>>>> --- >>>>> scripts/lib/ptxd_make_dts_dtc.sh | 4 ++++ >>>>> 1 file changed, 4 insertions(+) >>>>> >>>>> diff --git a/scripts/lib/ptxd_make_dts_dtc.sh b/scripts/lib/ptxd_ma= ke_dts_dtc.sh >>>>> index 24c5604..6a09cae 100644 >>>>> --- a/scripts/lib/ptxd_make_dts_dtc.sh >>>>> +++ b/scripts/lib/ptxd_make_dts_dtc.sh >>>>> @@ -59,6 +59,10 @@ ptxd_make_dts_dtb() { >>>>> -I dts -O dtb -b 0 \ >>>>> -o "${dts_dtb}" "${tmp_dts}" >>>>> =20 >>>>> + if [ "$?" !=3D "0" ]; then >>>>> + ptxd_bailout "Unable to generate ${dts_dtb} file." >>>>> + fi >>>> >>>> What about: >>>> >>>> || ptxd_bailout "Unable to generate ${dts_dtb} file." >>>> >>> >>> okay, yes then we could save the if. I can also add >>> >>> || ptxd_bailout ... for cpp call. >> >> Or better concatenate everything with a && and add || bailout at the e= nd. >> >=20 > uiuiuiui, but we have some other steps in the middle and the most looks= > currently like magic for me. But I think we could do: >=20 > sed -e "s;^${tmp_dts}:;${dts_dtb}:;" \ > -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 >=20 > echo "CPP $(ptxd_print_path "${tmp_dts}")" > cpp \ > -Wp,-MD,${tmp_deps} \ > -Wp,-MT,${tmp_dts} \ > -nostdinc \ > -P \ > -I$(dirname "${dts}") \ > -I${dts_kernel_dir}/arch/${dts_kernel_arch}/boot/dts \ > -I${dts_kernel_dir}/arch/${dts_kernel_arch}/boot/dts/include \ > -I${dts_kernel_dir}/drivers/of/testcase-data \ > -I${dts_kernel_dir}/include \ > -undef -D__DTS__ -x assembler-with-cpp \ > -o ${tmp_dts} \ > ${dts} && \ ^^^ not needed, as like the others.. > echo "DTC $(ptxd_print_path "${dts_dtb}")" && \ ^^^ > dtc \ > $(ptxd_get_ptxconf PTXCONF_DTC_EXTRA_ARGS) \ > ${dtc_include} \ > -d "${tmp_deps}" \ > -I dts -O dtb -b 0 \ > -o "${dts_dtb}" "${tmp_dts}" || \ > ptxd_bailout "Unable to generate ${dts_dtb} file." >=20 >=20 > normally we can forget to check error on echo, but it's in the > middle of the generation. I also moved the sed and dtc_include setting > before calling cpp step. I think this should work, maybe it looks a > little bit ugly, don't know what is a nice indentation. :-/ IMHO No need to rearrange the whole function, just add the missing && (and finally a || bailout). 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 | --ag8xCfjQCnmI7HW1qCBEMR6prcWXbCu8G 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/ iEYEARECAAYFAlO7+zkACgkQjTAFq1RaXHMfEwCfTnmHe1FuiAckFulF91ehkkVA WBwAoIbiV2e/bblZ18vPnqJlTrSkt0Pu =MeSM -----END PGP SIGNATURE----- --ag8xCfjQCnmI7HW1qCBEMR6prcWXbCu8G-- --===============2141483596== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============2141483596==--