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. (From OE-Core rev: fbacbb0ca79cdae33803fdd3158671488b9bbcbe) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
95bfc6ab51
commit
3b3fe047a4
|
@ -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() {
|
||||
|
|
Loading…
Reference in New Issue