[ptxdist] [PATCH v2] ptxd_make_dts_dtc: handle error if dtc failed

[ptxdist] [PATCH v2] ptxd_make_dts_dtc: handle error if dtc failed

[Alexander Aring]

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 | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/lib/ptxd_make_dts_dtc.sh b/scripts/lib/ptxd_make_dts_dtc.sh
index 24c5604..2af8405 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
+    fi &&
 
-    echo "DTC $(ptxd_print_path "${dts_dtb}")"
+    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}"
+	-o "${dts_dtb}" "${tmp_dts}" &&
 
     awk '{ \
 	    printf "%s", $1 ;  \
@@ -65,6 +65,8 @@ ptxd_make_dts_dtb() {
 		printf " $(wildcard %s)", $i; \
 	    }; \
 	    print "" \
-	}' "${tmp_deps}" >> "${deps}"
+	}' "${tmp_deps}" >> "${deps}" ||
+
+    ptxd_bailout "Unable to generate dtb file."
 }
 export -f ptxd_make_dts_dtb
-- 
2.0.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] ptxd_make_dts_dtc: handle error if dtc failed

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 492 bytes --]

On 07/09/2014 10:25 AM, Alexander Aring wrote:
> This patch adds error handling for the ptxd_make_dts_dtb function.
> 
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>

applied to master.

tnx,
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