From ebad3032746016baa14c9fb25c3bb11a0f9c8c70 Mon Sep 17 00:00:00 2001 From: Amarnath Valluri Date: Fri, 7 Oct 2016 14:53:31 +0300 Subject: [PATCH] linux-yocto: fix do_patch failure due to lack of git config This issue been addressed in oecore here: http://lists.openembedded.org/pipermail/openembedded-core/2016-October/127230.html Till we take 25b43cb05c645e43f96bc18906441b8fdc272228 from oecore, this is a temporary fix to whitelist and pass git committer environment to do_patch task. Signed-off-by: Amarnath Valluri --- docker/build-project.sh | 2 +- docker/local-build.sh | 2 +- meta-ostro-xt/recipes-kernel/linux/linux-yocto_4.4.bbappend | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docker/build-project.sh b/docker/build-project.sh index 5161fc3..15c1c9f 100755 --- a/docker/build-project.sh +++ b/docker/build-project.sh @@ -86,7 +86,7 @@ else echo "SSTATE_DIR = \"${BUILD_CACHE_DIR}/sstate\"" >> conf/auto.conf fi export BUILD_ID=${CI_BUILD_ID} -export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE BUILD_ID" +export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE BUILD_ID GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL" if [ -z "$BUILD_TARGET" ]; then # Let's try to fetch build targets from configuration files diff --git a/docker/local-build.sh b/docker/local-build.sh index e195f29..295ac68 100755 --- a/docker/local-build.sh +++ b/docker/local-build.sh @@ -40,7 +40,7 @@ echo "$BUILD_NUMBER" > $WORKSPACE/.build_number CI_BUILD_ID="${BUILD_TIMESTAMP}-build-${BUILD_NUMBER}" # export other vars -for var in WORKSPACE BASE_DISTRO BUILD_DIR BUILD_CACHE_DIR GIT_PROXY_COMMAND CI_BUILD_ID TARGET_MACHINE BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE; do +for var in WORKSPACE BASE_DISTRO BUILD_DIR BUILD_CACHE_DIR GIT_PROXY_COMMAND GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL CI_BUILD_ID TARGET_MACHINE BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE; do RUN_ARGS+=(-e "$var=${!var}") done # Point HOME to WORKSPACE, don't polute real home. diff --git a/meta-ostro-xt/recipes-kernel/linux/linux-yocto_4.4.bbappend b/meta-ostro-xt/recipes-kernel/linux/linux-yocto_4.4.bbappend index 485856e..581e0da 100644 --- a/meta-ostro-xt/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/meta-ostro-xt/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -33,3 +33,8 @@ SRC_URI_remove = " \ file://0001-iio-tmp006-Set-correct-iio-name.patch \ file://0001-iio-si7020-Set-correct-iio-name.patch \ " + +do_patch_prepend() { + export GIT_COMMITTER_NAME="${GIT_COMMITTER_NAME}" + export GIT_COMMITTER_EMAIL="${GIT_COMMITTER_EMAIL}" +}