aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-03-18 21:16:10 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-01 14:34:26 +0100
commit93a7c7bd8e860e621af7174ef10d571b0d8622b2 (patch)
treefe39873724d0c0e7e0e939b10bcd4117711de9b1 /meta
parenta9b6550d3e2f5bf21fd05a17bca3e57c5b74e057 (diff)
downloadopenembedded-core-contrib-93a7c7bd8e860e621af7174ef10d571b0d8622b2.tar.gz
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. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-yocto.bbclass29
1 files changed, 8 insertions, 21 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 3bef841ae80..d51748e556e 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -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