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 <[email protected]>
ostroproject · Oct 20, 2016 · f43ef78 · f43ef78
1 parent bb546cb
commit f43ef78
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/docker/build-project.sh b/docker/build-project.sh
@@ -84,7 +84,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"
 
 # Let's try to fetch build targets from configuration files
 bitbake -e >bb_e_out 2>bb_e_err || (cat bb_e_err && false)

diff --git a/docker/local-build.sh b/docker/local-build.sh
@@ -39,7 +39,7 @@ echo "$BUILD_NUMBER" > $WORKSPACE/.build_number
 CI_BUILD_ID="${BUILD_TIMESTAMP}-build-${BUILD_NUMBER}"
 
 # export other vars
-for var in WORKSPACE BASE_DISTRO CURRENT_PROJECT BUILD_CACHE_DIR GIT_PROXY_COMMAND CI_BUILD_ID TARGET_MACHINE; do
+for var in WORKSPACE BASE_DISTRO CURRENT_PROJECT BUILD_CACHE_DIR GIT_PROXY_COMMAND GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL CI_BUILD_ID TARGET_MACHINE; do
 	RUN_ARGS="$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
@@ -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}"
+}