mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

kernel-yocto: remove redundant SRCREV check

Browse Source 
do_validate_branches checks to ensure that a valid machine SRCREV was
set. A test against an empty SRCREV is done in two separate locations,
we only need one, since the first check immediately returns and the
second check never hits.

At the same time, we can stop referring to the same commit hash by
3 different names. Instead we assign to a local variable at the
top of the routine, and refer to it at all times.

(From OE-Core rev: 05508339882c7cc1fe3f1f67f72314fdcab979b7)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bruce Ashfield
2014-03-17 10:59:16 -04:00
committed by Richard Purdie
parent 50a8400b72
commit 6b294a0489
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/kernel-yocto.bbclass
+12 -21
View File
@@ -296,12 +296,14 @@ do_validate_branches() {
export KMETA=${KMETA}
machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
machine_srcrev="${SRCREV_machine}"
set +e
# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
# check and we can exit early
if [ "${SRCREV_machine}" = "AUTOINC" ] || [ "${SRCREV_machine}" = "INVALID" ] ||
[ "${SRCREV_machine}" = "" ]; then
if [ "${machine_srcrev}" = "AUTOINC" ] || [ "${machine_srcrev}" = "INVALID" ] ||
[ "${machine_srcrev}" = "" ]; then
bbnote "INFO: SRCREV validation is not required for AUTOREV or empty/invalid settings, returning"
return
fi
@@ -319,27 +321,16 @@ do_validate_branches() {
fi
fi
if [ -z "${SRCREV_machine}" ]; then
target_branch_head="${SRCREV}"
else
target_branch_head="${SRCREV_machine}"
fi
# $SRCREV could have also been AUTOINC, so check again
if [ "${target_branch_head}" = "AUTOINC" ]; then
return
fi
ref=`git show ${target_branch_head} 2>&1 | head -n1 || true`
ref=`git show ${machine_srcrev} 2>&1 | head -n1 || true`
if [ "$ref" = "fatal: bad object ${target_meta_head}" ]; then
echo "ERROR ${target_branch_head} is not a valid commit ID."
echo "ERROR ${machine_srcrev} is not a valid commit ID."
echo "The kernel source tree may be out of sync"
exit 1
fi
containing_branches=`git branch --contains $target_branch_head | sed 's/^..//'`
containing_branches=`git branch --contains $machine_srcrev | sed 's/^..//'`
if [ -z "$containing_branches" ]; then
echo "ERROR: SRCREV was set to \"$target_branch_head\", but no branches"
echo "ERROR: SRCREV was set to \"$machine_srcrev\", but no branches"
echo " contain this commit"
exit 1
fi
@@ -349,13 +340,13 @@ do_validate_branches() {
git checkout -q master
for b in $containing_branches; do
branch_head=`git show-ref -s --heads ${b}`
if [ "$branch_head" != "$target_branch_head" ]; then
echo "[INFO] Setting branch $b to ${target_branch_head}"
if [ "$branch_head" != "$machine_srcrev" ]; then
echo "[INFO] Setting branch $b to ${machine_srcrev}"
if [ "$b" = "master" ]; then
git reset --hard $target_branch_head > /dev/null
git reset --hard $machine_srcrev > /dev/null
else
git branch -D $b > /dev/null
git branch $b $target_branch_head > /dev/null
git branch $b $machine_srcrev > /dev/null
fi
fi
done