aboutsummaryrefslogtreecommitdiff
path: root/openembedded-lkft
diff options
context:
space:
mode:
authorDaniel Díaz <daniel.diaz@linaro.org>2019-06-01 00:06:27 -0500
committerDaniel Díaz <daniel.diaz@linaro.org>2019-06-11 17:35:23 +0000
commit14fadf699caf2fab72bfe2325198a5ac15c8deed (patch)
treebdea129ca8d50d9850bf6d1ee6b786f0af6ab0a4 /openembedded-lkft
parent4b6c08b56397b9727c60444e390e7f3e6b04437b (diff)
openembedded-lkft: Fetch Bitbake metadata only once
Instead of calling `bitbake -e' a few times, run it only once and save the output in a temporary file. We can then sip the information that we need from there. Change-Id: I880e2e4612c28f95424f86855e4290852b097d83 Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Diffstat (limited to 'openembedded-lkft')
-rwxr-xr-xopenembedded-lkft/builders.sh20
1 files changed, 15 insertions, 5 deletions
diff --git a/openembedded-lkft/builders.sh b/openembedded-lkft/builders.sh
index ad98f901..7c61cd1e 100755
--- a/openembedded-lkft/builders.sh
+++ b/openembedded-lkft/builders.sh
@@ -295,10 +295,21 @@ EOF
mv /srv/oe/manifest-changes.txt ${DEPLOY_DIR_IMAGE}
fi
-GCCVERSION=$(bitbake -e | grep "^GCCVERSION="| cut -d'=' -f2 | tr -d '"')
-TARGET_SYS=$(bitbake -e | grep "^TARGET_SYS="| cut -d'=' -f2 | tr -d '"')
-TUNE_FEATURES=$(bitbake -e | grep "^TUNE_FEATURES="| cut -d'=' -f2 | tr -d '"')
-STAGING_KERNEL_DIR=$(bitbake -e | grep "^STAGING_KERNEL_DIR="| cut -d'=' -f2 | tr -d '"')
+# Save Bitbake environment
+mkdir ${WORKSPACE}/lkftmetadata/
+bb_env=$(mktemp)
+bitbake -e > "${bb_env}"
+(
+ grep "^GCCVERSION=" "${bb_env}"
+ grep "^TARGET_SYS=" "${bb_env}"
+ grep "^TUNE_FEATURES=" "${bb_env}"
+ grep "^STAGING_KERNEL_DIR=" "${bb_env}"
+) > "${WORKSPACE}/lkftmetadata/bitbake"
+rm -v "${bb_env}"
+
+set -a
+source "${WORKSPACE}/lkftmetadata/bitbake"
+set +a
if [ "${DISTRO}" = "rpb" ]; then
# lkft-metadata class generates metadata file, which can be sourced
@@ -307,7 +318,6 @@ if [ "${DISTRO}" = "rpb" ]; then
done
else
# Generate LKFT metadata
- mkdir ${WORKSPACE}/lkftmetadata/
for recipe in kselftests-mainline kselftests-next ltp libhugetlbfs ${KERNEL_RECIPE}; do
tmpfile=$(mktemp)
pkg=$(echo $recipe | tr '[a-z]-' '[A-Z]_')