From d4739b2bea237166282e247ec4d8f00fd79c1ef2 Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Sun, 11 Jan 2015 03:26:11 +0200 Subject: fix dtb location introduced with 3.19 Change-Id: I1382b10cf5c15f6073f2638ab161dcbe830d3b7f Signed-off-by: Fathi Boudra --- jenkins_common_lib | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/jenkins_common_lib b/jenkins_common_lib index 808797c..8c6ced9 100755 --- a/jenkins_common_lib +++ b/jenkins_common_lib @@ -150,7 +150,7 @@ build_instructions() make IMAGE=img-foundation.axf clean make DTC=${WORKSPACE}/${pkg_dir}/scripts/dtc/dtc \ IMAGE=img-foundation.axf \ - KERNEL_DTB=${WORKSPACE}/${pkg_dir}/arch/arm64/boot/dts/foundation-v8.dtb + KERNEL_DTB=`find ${WORKSPACE}/${pkg_dir}/arch/arm64/boot/dts/ -type f -name 'foundation-v8.dtb'` ./configure \ --host=aarch64-linux-gnu \ --with-kernel-dir=${WORKSPACE}/${pkg_dir} \ @@ -158,7 +158,7 @@ build_instructions() make IMAGE=img.axf clean make DTC=${WORKSPACE}/${pkg_dir}/scripts/dtc/dtc \ IMAGE=img.axf \ - KERNEL_DTB=${WORKSPACE}/${pkg_dir}/arch/arm64/boot/dts/rtsm_ve-aemv8a.dtb + KERNEL_DTB=`find ${WORKSPACE}/${pkg_dir}/arch/arm64/boot/dts/ -type f -name 'rtsm_ve-aemv8a.dtb'` cd ${WORKSPACE} cp -a ${pkg_dir}/boot-wrapper/*.axf ${pkg_dir}/arch/arm64/boot/ fi @@ -171,8 +171,7 @@ build_instructions() install -D -p -m0644 ${pkg_dir}/arch/${ARCH}/boot/${kernel_img_cmd} out/${kernel_img_cmd} [ "${silent}" = "true" ] && cp -a ${pkg_dir}/build.log out/ for dtb in `find ${pkg_dir}/arch/${ARCH}/boot/dts/ -type f -name '*.dtb'`; do - dtb=`basename ${dtb}` - install -D -p -m0644 ${pkg_dir}/arch/${ARCH}/boot/dts/${dtb} out/dtbs/${dtb} + install -D -p -m0644 ${dtb} out/dtbs/`basename ${dtb}` done fi END=$(date +%s) -- cgit v1.2.3