diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-03-18 21:20:56 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-01 14:34:26 +0100 |
| commit | fbacbb0ca79cdae33803fdd3158671488b9bbcbe (patch) | |
| tree | 1160f33a2ec2a25cfaff6003f9617ed4490d89df /meta | |
| parent | 93a7c7bd8e860e621af7174ef10d571b0d8622b2 (diff) | |
| download | openembedded-core-fbacbb0ca79cdae33803fdd3158671488b9bbcbe.tar.gz openembedded-core-fbacbb0ca79cdae33803fdd3158671488b9bbcbe.tar.bz2 openembedded-core-fbacbb0ca79cdae33803fdd3158671488b9bbcbe.zip | |
kernel-yocto: remove KBRANCH_DEFAULT
KBRANCH_DEFAULT was introduced as a way to trigger the enforced build
of a particular branch of the tree. With the fetcher now enforcing
SRCREVs existing on a branch, we can simply validate that the SRCREV
is reachable from the final branch and no longer care about enforcing
a given branch.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index d51748e556..087fbb0c37 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -111,10 +111,6 @@ do_patch() { done fi - if [ "${machine_branch}" != "${KBRANCH_DEFAULT}" ]; then - updateme_flags="--branch ${machine_branch}" - fi - # updates or generates the target description updateme ${updateme_flags} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \ ${includes} ${addon_features} ${ARCH} ${KMACHINE} ${sccs} ${patches} @@ -152,18 +148,6 @@ do_patch() { exit 1 fi fi - - # Perform a final check. If something other than the default kernel - # branch was requested, and that's not where we ended up, then we - # should thrown an error, since we aren't building what was expected - final_branch="$(git symbolic-ref HEAD 2>/dev/null)" - final_branch=${final_branch##refs/heads/} - if [ "${machine_branch}" != "${KBRANCH_DEFAULT}" ] && - [ "${final_branch}" != "${machine_branch}" ]; then - echo "ERROR: branch ${machine_branch} was requested, but was not properly" - echo " configured to be built. The current branch is ${final_branch}" - exit 1 - fi } do_kernel_checkout() { |