aboutsummaryrefslogtreecommitdiff
path: root/lt-qcom-linux-automerge
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2019-07-19 10:13:19 +0200
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2019-07-19 10:15:23 +0200
commitffb03bdf23d5b693dc783ae3efae315249028a23 (patch)
treed42186d9ebd08c987bea666cade6e0b133bd623a /lt-qcom-linux-automerge
parent9350c74c22248a919aa496d124e6cfa234eadf75 (diff)
lt-qcom-linux-automerge: fix kernel-build_result_variables location
let's use pushd and popd to move in between folder while building, and ensure that the output file is properly created where expected. Change-Id: I44e399e749c979b05a4874049be3c0a6e2ab7a77 Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Diffstat (limited to 'lt-qcom-linux-automerge')
-rwxr-xr-xlt-qcom-linux-automerge/builders-kernel.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/lt-qcom-linux-automerge/builders-kernel.sh b/lt-qcom-linux-automerge/builders-kernel.sh
index 9e56fbc1..ab407b20 100755
--- a/lt-qcom-linux-automerge/builders-kernel.sh
+++ b/lt-qcom-linux-automerge/builders-kernel.sh
@@ -37,7 +37,7 @@ if [ ! -z "${AUTOMERGE_BRANCH_FAILED}" ]; then
exit 1
fi
-cd ${INTEGRATION_REPO_PATH}
+pushd ${INTEGRATION_REPO_PATH}
GIT_STATUS=$(git status -s)
if [ ! -z "${GIT_STATUS}" ]; then
@@ -49,8 +49,13 @@ fi
build_integration_kernel "arm" "multi_v7_defconfig"
build_integration_kernel "arm64" "defconfig"
+# record QCOM DTBS warnings, for all builds
+DTBS_WARNINGS=$(sed -n "s/.*: Warning (\(.*\)):.*/\1/p" qcom-dtbs.log | sort | uniq -c | sort -nr)
+
if [ ! -z ${KERNEL_CI_REPO_URL} ]; then
git push -f ${KERNEL_CI_REPO_URL} ${INTEGRATION_BRANCH}:${KERNEL_CI_BRANCH}
fi
-echo "DTBS_WARNINGS=$(sed -n "s/.*: Warning (\(.*\)):.*/\1/p" qcom-dtbs.log | sort | uniq -c | sort -nr)" > kernel-build_result_variables
+popd
+
+echo "DTBS_WARNINGS=${DTBS_WARNINGS}" > kernel-build_result_variables