From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Alexander Aring <alex.aring@gmail.com>
Cc: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] ptxd_make_dts_dtc: handle error if dtc failed
Date: Wed, 09 Jul 2014 10:05:07 +0200 [thread overview]
Message-ID: <53BCF7B3.5030403@pengutronix.de> (raw)
In-Reply-To: <20140709080318.GB11028@omega>
[-- Attachment #1.1: Type: text/plain, Size: 3380 bytes --]
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 <alex.aring@gmail.com>
>>>>> ---
>>>>> 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="${ptx_state_dir}/dtc.$(basename "${dts}").deps"
>>>>> tmp_deps="${PTXDIST_TEMPDIR}/dts.deps"
>>>>>
>>>>> - 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} &&
>>>>>
>>>>> sed -e "s;^${tmp_dts}:;${dts_dtb}:;" \
>>>>> - -e 's;^ \([^ ]*\); $(wildcard \1);' "${tmp_deps}" > "${deps}"
>>>>> + -e 's;^ \([^ ]*\); $(wildcard \1);' "${tmp_deps}" > "${deps}" &&
>>>>>
>>>>> if dtc -h 2>&1 | grep -q '^[[:space:]]\+-i\(,.*\)\?$'; then
>>>>> dtc_include="-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 unexpected token `&&'
>>> ../scripts/lib/ptxd_make_dts_dtc.sh: line 53: ` &&'
>>> ptxdist: error: failed to source lib: ..scripts/lib/ptxd_make_dts_dtc.sh
>>
>
> I tested:
>
> if dtc -h 2>&1 | grep -q '^[[:space:]]\+-i\(,.*\)\?$'; then
> dtc_include="-i $(dirname "${dts}") -i ${dts_kernel_dir}/arch/${dts_kernel_arch}/boot/dts"
> fi
> &&
>
> and
>
> if dtc -h 2>&1 | grep -q '^[[:space:]]\+-i\(,.*\)\?$'; then
> dtc_include="-i $(dirname "${dts}") -i ${dts_kernel_dir}/arch/${dts_kernel_arch}/boot/dts"
> &&
> fi
>
> ...
>
> 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="-i $(dirname "${dts}") -i ${dts_kernel_dir}/arch/${dts_kernel_arch}/boot/dts"
>> fi &&
Marc
--
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 |
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 242 bytes --]
[-- Attachment #2: Type: text/plain, Size: 48 bytes --]
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2014-07-09 8:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-08 14:33 Alexander Aring
2014-07-08 14:44 ` Marc Kleine-Budde
2014-07-09 7:20 ` Alexander Aring
2014-07-09 7:32 ` Marc Kleine-Budde
2014-07-09 8:03 ` Alexander Aring
2014-07-09 8:05 ` Marc Kleine-Budde [this message]
2014-07-09 8:11 ` Alexander Aring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53BCF7B3.5030403@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=alex.aring@gmail.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox