Skip to content
This repository was archived by the owner on Jan 6, 2023. It is now read-only.

Commit ebad303

Browse files
committed
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 <amarnath.valluri@intel.com>
1 parent 4c53972 commit ebad303

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

docker/build-project.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ else
8686
echo "SSTATE_DIR = \"${BUILD_CACHE_DIR}/sstate\"" >> conf/auto.conf
8787
fi
8888
export BUILD_ID=${CI_BUILD_ID}
89-
export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE BUILD_ID"
89+
export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE BUILD_ID GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL"
9090

9191
if [ -z "$BUILD_TARGET" ]; then
9292
# Let's try to fetch build targets from configuration files

docker/local-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ echo "$BUILD_NUMBER" > $WORKSPACE/.build_number
4040
CI_BUILD_ID="${BUILD_TIMESTAMP}-build-${BUILD_NUMBER}"
4141

4242
# export other vars
43-
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
43+
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
4444
RUN_ARGS+=(-e "$var=${!var}")
4545
done
4646
# Point HOME to WORKSPACE, don't polute real home.

meta-ostro-xt/recipes-kernel/linux/linux-yocto_4.4.bbappend

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,8 @@ SRC_URI_remove = " \
3333
file://0001-iio-tmp006-Set-correct-iio-name.patch \
3434
file://0001-iio-si7020-Set-correct-iio-name.patch \
3535
"
36+
37+
do_patch_prepend() {
38+
export GIT_COMMITTER_NAME="${GIT_COMMITTER_NAME}"
39+
export GIT_COMMITTER_EMAIL="${GIT_COMMITTER_EMAIL}"
40+
}

0 commit comments

Comments
 (0)