summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-03-05 09:04:01 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 23:56:00 +0000
commitad6313d01b8877d426bf69179cd8ced61565a532 (patch)
tree3eeff90a29b15191777ed6bc5a2481169fd85b42 /meta/classes
parentc328e2fdd0240e7a0980c29610a303ab15509421 (diff)
downloadpoky-ad6313d01b8877d426bf69179cd8ced61565a532.tar.gz
kernel-yocto: split meta data generation from patching phase
The linux-yocto kernel has a meta-data component which accompanies the actual tree. That meta-data is processed to generate a series file that controls the patching and configuration of the kernel. patching and configuration are two distinct phases, so when working on kernel configuration, it doesn't make sense to always have to re-run the patching step just to update configuration data in the meta-series. To allow a more granular set of tasks, we break the meta-data generation into a separate task, which runs before do_patch. This allows the task to be explicitly called when working on configuration, but otherwise has no impact on the build. (From OE-Core rev: 1be4c68fb876b63f19d107275b701fe1c1c121db) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel-yocto.bbclass9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 8db489964e..1e226a5722 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -55,7 +55,7 @@ def get_machine_branch(d, default):
55 55
56 return default 56 return default
57 57
58do_patch() { 58do_kernel_metadata() {
59 cd ${S} 59 cd ${S}
60 export KMETA=${KMETA} 60 export KMETA=${KMETA}
61 61
@@ -81,7 +81,7 @@ do_patch() {
81 createme_flags="--disable-meta-gen --meta ${KMETA}" 81 createme_flags="--disable-meta-gen --meta ${KMETA}"
82 fi 82 fi
83 83
84 createme ${createme_flags} ${ARCH} ${machine_branch} 84 createme -v -v ${createme_flags} ${ARCH} ${machine_branch}
85 if [ $? -ne 0 ]; then 85 if [ $? -ne 0 ]; then
86 bbfatal "Could not create ${machine_branch}" 86 bbfatal "Could not create ${machine_branch}"
87 fi 87 fi
@@ -118,6 +118,10 @@ do_patch() {
118 if [ $? -ne 0 ]; then 118 if [ $? -ne 0 ]; then
119 bbfatal "Could not update ${machine_branch}" 119 bbfatal "Could not update ${machine_branch}"
120 fi 120 fi
121}
122
123do_patch() {
124 cd ${S}
121 125
122 # executes and modifies the source tree as required 126 # executes and modifies the source tree as required
123 patchme ${KMACHINE} 127 patchme ${KMACHINE}
@@ -221,6 +225,7 @@ do_kernel_checkout() {
221do_kernel_checkout[dirs] = "${S}" 225do_kernel_checkout[dirs] = "${S}"
222 226
223addtask kernel_checkout before do_patch after do_unpack 227addtask kernel_checkout before do_patch after do_unpack
228addtask kernel_metadata after do_validate_branches before do_patch
224 229
225do_kernel_configme[dirs] += "${S} ${B}" 230do_kernel_configme[dirs] += "${S} ${B}"
226do_kernel_configme() { 231do_kernel_configme() {