mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-29 18:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

utils.bbclass: add function to check for git config user

Browse Source 
If attempting to patch a git repo without a proper git config setup,
an error will occur saying user.name/user.email are needed by git
am/apply. After some code was removed from kernel-yocto, it was
simple enough to reproduce this error by creating a kernel patch and
using a container to build.

This patch abstracts out functionality that existed in buildhistory
for use in other classes. It also adds a call to this functionality
to the kernel-yocto class.

Fixes [YOCTO #10346]

introduced in OE-core revision
0f698dfd1c8bbc0d53ae7977e26685a7a3df52a3

(From OE-Core rev: 25b43cb05c645e43f96bc18906441b8fdc272228)

Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Stephano Cetola
2016-10-03 16:32:45 -07:00
committed by Richard Purdie
parent 4454d02448
commit ef7828c9f2
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
meta/classes/buildhistory.bbclass
View File

@@ -57,6 +57,9 @@ SSTATEPOSTINSTFUNCS[vardepvalueexclude] .= "| buildhistory_emit_pkghistory"
# class. # class.
BUILDHISTORY_PRESERVE = "latest latest_srcrev" BUILDHISTORY_PRESERVE = "latest latest_srcrev"
PATCH_GIT_USER_EMAIL ?= "buildhistory@oe"
PATCH_GIT_USER_NAME ?= "OpenEmbedded"
# #
# Write out metadata about this package for comparison when writing future packages # Write out metadata about this package for comparison when writing future packages
# #
@@ -708,15 +711,9 @@ END
git tag -f build-minus-2 build-minus-1 > /dev/null 2>&1 || true git tag -f build-minus-2 build-minus-1 > /dev/null 2>&1 || true
git tag -f build-minus-1 > /dev/null 2>&1 || true git tag -f build-minus-1 > /dev/null 2>&1 || true
fi fi
# If the user hasn't set up their name/email, set some defaults
# just for this repo (otherwise the commit will fail with older check_git_config
# versions of git)
if ! git config user.email > /dev/null ; then
git config --local user.email "buildhistory@${DISTRO}"
fi
if ! git config user.name > /dev/null ; then
git config --local user.name "buildhistory"
fi
# Check if there are new/changed files to commit (other than metadata-revs) # Check if there are new/changed files to commit (other than metadata-revs)
repostatus=`git status --porcelain | grep -v " metadata-revs$"` repostatus=`git status --porcelain | grep -v " metadata-revs$"`
HOSTNAME=`hostname 2>/dev/null || echo unknown` HOSTNAME=`hostname 2>/dev/null || echo unknown`

3
meta/classes/kernel-yocto.bbclass
View File

@@ -1,5 +1,7 @@
# remove tasks that modify the source tree in case externalsrc is inherited # remove tasks that modify the source tree in case externalsrc is inherited
SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_configcheck do_kernel_checkout do_fetch do_unpack do_patch" SRCTREECOVEREDTASKS += "do_kernel_configme do_validate_branches do_kernel_configcheck do_kernel_checkout do_fetch do_unpack do_patch"
PATCH_GIT_USER_EMAIL ?= "kernel-yocto@oe"
PATCH_GIT_USER_NAME ?= "OpenEmbedded"
# returns local (absolute) path names for all valid patches in the # returns local (absolute) path names for all valid patches in the
# src_uri # src_uri
@@ -159,6 +161,7 @@ do_kernel_metadata() {
do_patch() { do_patch() {
cd ${S} cd ${S}
check_git_config
meta_dir=$(kgit --meta) meta_dir=$(kgit --meta)
(cd ${meta_dir}; ln -sf patch.queue series) (cd ${meta_dir}; ln -sf patch.queue series)
if [ -f "${meta_dir}/series" ]; then if [ -f "${meta_dir}/series" ]; then

10
meta/classes/utils.bbclass
View File

@@ -419,3 +419,13 @@ def all_multilib_tune_list(vars, d):
values[v].append(localdata.getVar(v, True)) values[v].append(localdata.getVar(v, True))
values['ml'].append(item) values['ml'].append(item)
return values return values
# If the user hasn't set up their name/email, set some defaults
check_git_config() {
if ! git config user.email > /dev/null ; then
git config --local user.email "${PATCH_GIT_USER_EMAIL}"
fi
if ! git config user.name > /dev/null ; then
git config --local user.name "${PATCH_GIT_USER_NAME}"
fi
}