summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-yocto.bbclass11
1 files changed, 11 insertions, 0 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 6a6a3a31d9..f86b3ef011 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -170,6 +170,17 @@ do_patch() {
170 fi 170 fi
171 fi 171 fi
172 172
173 current_branch=`git rev-parse --abbrev-ref HEAD`
174 machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
175 if [ "${current_branch}" != "${machine_branch}" ]; then
176 bbwarn "After meta data application, the kernel tree branch is ${current_branch}. The"
177 bbwarn "SRC_URI specified branch ${machine_branch}. The branch will be forced to ${machine_branch},"
178 bbwarn "but this means the board meta data (.scc files) do not match the SRC_URI specification."
179 bbwarn "The meta data and branch ${machine_branch} should be inspected to ensure the proper"
180 bbwarn "kernel is being built."
181 git checkout -f ${machine_branch}
182 fi
183
173 if [ "${machine_srcrev}" != "AUTOINC" ]; then 184 if [ "${machine_srcrev}" != "AUTOINC" ]; then
174 if ! [ "$(git rev-parse --verify ${machine_srcrev}~0)" = "$(git merge-base ${machine_srcrev} HEAD)" ]; then 185 if ! [ "$(git rev-parse --verify ${machine_srcrev}~0)" = "$(git merge-base ${machine_srcrev} HEAD)" ]; then
175 bberror "SRCREV ${machine_srcrev} was specified, but is not reachable" 186 bberror "SRCREV ${machine_srcrev} was specified, but is not reachable"