summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-04-21 11:23:45 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-11 10:33:40 +0100
commit1ce221da64e21b9ee0a743dc9372236ab22e21ba (patch)
tree101c0bd6008fe37c64fffd3639324e67d4320671 /meta/classes
parent0e50f6f295ff0dde3d3528da8ae5496f79935528 (diff)
downloadpoky-1ce221da64e21b9ee0a743dc9372236ab22e21ba.tar.gz
kernel-yocto: allow branch auditing to be suspended
When working on the yocto-bsp and kernel-lab update for yocto 1.2 we found it was impossible for a end-user BSP to isolate patches on a branch, since with the following commit: [kernel-yocto: enforce SRC_URI specified branch] Any new branch would be switched to whatever was specified on the SRC_URI and undoing the work that the yocto-bsp tool did to support board specific patches. To fix this, we'll keep the enforcing of branch consistency enabled by default, but introduce a variable "KMETA_AUDIT" that when not set will skip the check. There's no impact for existing users, and it is only something that other plumbing commands and tools will need to use (or care about). [YOCTO: #9120] (From OE-Core rev: 1d4c120edeb6e45665eafd6962a10ebb89d758eb) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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