sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

kernel-yocto: remove branch existence checking in do_validate_branches 

Now that the fetcher will enforce branch existence, we no longer need to
confirm that a branch exists, and that it was the branch requested to
be built.

We know the branch exists and we'll confirm that the specified SRCREV
is going to be built after we've patched the tree.

(From OE-Core rev: 93a7c7bd8e860e621af7174ef10d571b0d8622b2)

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-18 21:16:10 -04:00 committed by Richard Purdie
parent 254bc3a283
commit 95bfc6ab51
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,13 +309,19 @@ python do_kernel_configcheck() {
# their SRCREV values. If they are NOT on the right commits, the branches
# are corrected to the proper commit.
do_validate_branches() {
set +e
cd ${S}
export KMETA=${KMETA}
machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
machine_srcrev="${SRCREV_machine}"
set +e
# if the machine branch doesn't exist, lets build master
git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
if [ $? -eq 1 ]; then
machine_branch = "master"
fi
# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
# check and we can exit early
if [ "${machine_srcrev}" = "AUTOINC" ] || [ "${machine_srcrev}" = "INVALID" ] ||
@ -324,19 +330,6 @@ do_validate_branches() {
return
fi
# If something other than the default branch was requested, it must
# exist in the tree, and it's a hard error if it wasn't
git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
if [ $? -eq 1 ]; then
if [ -n "${KBRANCH_DEFAULT}" ] &&
[ "${machine_branch}" != "${KBRANCH_DEFAULT}" ]; then
echo "ERROR: branch ${machine_branch} was set for kernel compilation, "
echo " but it does not exist in the kernel repository."
echo " Check the value of KBRANCH and ensure that it describes"
echo " a valid banch in the source kernel repository"
exit 1
fi
fi
git cat-file -t ${machine_srcrev} > /dev/null
if [ if $? -ne 0 ]; then
@ -369,13 +362,7 @@ do_validate_branches() {
fi
fi
git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
if [ $? -eq 0 ]; then
# restore the branch for builds
git checkout -q -f ${machine_branch}
else
git checkout -q master
fi
git checkout -q -f ${machine_branch}
}
# Many scripts want to look in arch/$arch/boot for the bootable