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

Commit 155c46c

Browse files
avalluriamarnath
authored andcommitted
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 the proper fix available in oecore, this is a temporary fix to whitelist and pass git committer environment to do_patch task. Signed-off-by: amarnath <amarnath@valluri.com>
1 parent e157032 commit 155c46c

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
@@ -84,7 +84,7 @@ else
8484
echo "SSTATE_DIR = \"${BUILD_CACHE_DIR}/sstate\"" >> conf/auto.conf
8585
fi
8686
export BUILD_ID=${CI_BUILD_ID}
87-
export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE BUILD_ID"
87+
export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE BUILD_ID GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL"
8888

8989
# Let's try to fetch build targets from configuration files
9090
bitbake -e >bb_e_out 2>bb_e_err || (cat bb_e_err && false)

docker/local-build.sh

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

4141
# export other vars
42-
for var in WORKSPACE BASE_DISTRO CURRENT_PROJECT BUILD_CACHE_DIR GIT_PROXY_COMMAND CI_BUILD_ID TARGET_MACHINE; do
42+
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
4343
RUN_ARGS="$RUN_ARGS -e $var=${!var}"
4444
done
4545
# 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)