[oe-commits] Bruce Ashfield : kernel-yocto: remove KBRANCH_DEFAULT
git at git.openembedded.org
git at git.openembedded.org
Sun Aug 31 22:41:50 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: eb15d765148019167853e7af07aacacfa6b78aa7
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=eb15d765148019167853e7af07aacacfa6b78aa7
Author: Bruce Ashfield <bruce.ashfield at windriver.com>
Date: Tue Mar 18 21:20:56 2014 -0400
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 at windriver.com>
---
meta/classes/kernel-yocto.bbclass | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index d51748e..087fbb0 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() {
More information about the Openembedded-commits
mailing list