From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Message-ID: <53BCEFFE.4080505@pengutronix.de> Date: Wed, 09 Jul 2014 09:32:14 +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> In-Reply-To: <20140709072036.GA4423@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="===============0240037501==" 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) --===============0240037501== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="d7id7uiBF5STbQF2BJhX2L3rAErofvR0B" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --d7id7uiBF5STbQF2BJhX2L3rAErofvR0B Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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_make= _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/${d= ts_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: >=20 > ../scripts/lib/ptxd_make_dts_dtc.sh: line 53: syntax error near unexpec= ted token `&&' > ../scripts/lib/ptxd_make_dts_dtc.sh: line 53: ` &&' > ptxdist: error: failed to source lib: ..scripts/lib/ptxd_make_dts_dtc.s= h Where have you added the &&? 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 | --d7id7uiBF5STbQF2BJhX2L3rAErofvR0B 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/ iEYEARECAAYFAlO87/4ACgkQjTAFq1RaXHNcHwCePt1HLn20uR99lWRQVyO6o6TE d/AAn0+ldtbnMLrYLi68R75kd8HizpTt =4prr -----END PGP SIGNATURE----- --d7id7uiBF5STbQF2BJhX2L3rAErofvR0B-- --===============0240037501== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline -- ptxdist mailing list ptxdist@pengutronix.de --===============0240037501==--