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