summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-09-09 18:27:46 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-15 11:23:57 +0100
commit1080d52f578ca03a48569c638ea72f53bdaf4cc7 (patch)
tree21b91bdf49f3e41cdc12348fd81f1562d6f4c813 /meta
parent8c310ee0a94a7e15d815a2719272ffc704e857b0 (diff)
downloadpoky-1080d52f578ca03a48569c638ea72f53bdaf4cc7.tar.gz
linux-yocto: move common tasks to a common location
During the initial development of the linux-yocto recipes there were several additional tasks that needed to be run in any inheriting recipe. At that time, they didn't seem to fire if they were in the include file versus the recipes themselves. As it turns out, these tasks do work fine if placed in the linux-yocto.inc file, and the rest of the recipes can be simplified as a result. (From OE-Core rev: a1ab7c5e03df97e630dfee470ff7959d3143bf41) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb8
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb8
-rw-r--r--meta/recipes-kernel/linux/linux-yocto.inc5
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_2.6.37.bb13
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.0.bb8
5 files changed, 9 insertions, 33 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb b/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
index 0ca53ae436..d92a902a9a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
@@ -17,9 +17,8 @@ SRCREV_machine_qemux86-64 = "3c84c45ad3c3592f9c7ff4076de9bee417cd322e"
17SRCREV_machine = "439602eb6acd53d9beb8493710310214fc7bd749" 17SRCREV_machine = "439602eb6acd53d9beb8493710310214fc7bd749"
18SRCREV_meta = "e1f85a470934a0cf6abde5d95533e74501822c6b" 18SRCREV_meta = "e1f85a470934a0cf6abde5d95533e74501822c6b"
19 19
20PR = "r2" 20PR = "r3"
21PV = "${LINUX_VERSION}+git${SRCPV}" 21PV = "${LINUX_VERSION}+git${SRCPV}"
22SRCREV_FORMAT = "meta_machine"
23 22
24COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" 23COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"
25 24
@@ -34,11 +33,6 @@ python __anonymous () {
34SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.34.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta" 33SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.34.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta"
35 34
36# Functionality flags 35# Functionality flags
37KERNEL_REVISION_CHECKING ?= "t"
38KERNEL_FEATURES=features/netfilter 36KERNEL_FEATURES=features/netfilter
39 37
40# extra tasks
41addtask kernel_link_vmlinux after do_compile before do_install
42addtask validate_branches before do_patch after do_kernel_checkout
43
44require recipes-kernel/linux/linux-tools.inc 38require recipes-kernel/linux/linux-tools.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index b296ef46f9..ebf60546c3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -18,9 +18,8 @@ SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3"
18SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af" 18SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af"
19SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7" 19SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
20 20
21PR = "r0" 21PR = "r1"
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23SRCREV_FORMAT = "meta_machine"
24 23
25SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
26 25
@@ -35,9 +34,4 @@ KERNEL_FEATURES_append=" features/taskstats"
35KERNEL_FEATURES_append_qemux86=" cfg/sound" 34KERNEL_FEATURES_append_qemux86=" cfg/sound"
36KERNEL_FEATURES_append_qemux86-64=" cfg/sound" 35KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
37 36
38# extra tasks
39addtask kernel_link_vmlinux after do_compile before do_install
40addtask validate_branches before do_patch after do_kernel_checkout
41addtask kernel_configcheck after do_configure before do_compile
42
43require recipes-kernel/linux/linux-tools.inc 37require recipes-kernel/linux/linux-tools.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index 11b77cefd1..09433fabe9 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -34,3 +34,8 @@ do_install_append(){
34 rm -rf ${STAGING_KERNEL_DIR}/${KMETA} 34 rm -rf ${STAGING_KERNEL_DIR}/${KMETA}
35 fi 35 fi
36} 36}
37
38# extra tasks
39addtask kernel_link_vmlinux after do_compile before do_install
40addtask validate_branches before do_patch after do_kernel_checkout
41addtask kernel_configcheck after do_configure before do_compile
diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
index 419913728a..34e563cffd 100644
--- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
@@ -9,10 +9,8 @@ KMACHINE_qemumips = "yocto/standard/mti-malta32-be"
9KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" 9KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs"
10 10
11KBRANCH = ${KMACHINE} 11KBRANCH = ${KMACHINE}
12KMETA = meta
13 12
14LINUX_VERSION ?= "2.6.37" 13LINUX_VERSION ?= "2.6.37"
15LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
16 14
17SRCREV_machine_qemuarm = "b3e53a090eaa23aa82e64fa0a563a93a2b4dbb5d" 15SRCREV_machine_qemuarm = "b3e53a090eaa23aa82e64fa0a563a93a2b4dbb5d"
18SRCREV_machine_qemumips = "91f2eb4a3b447476b36aac8e6e198d08c98e0680" 16SRCREV_machine_qemumips = "91f2eb4a3b447476b36aac8e6e198d08c98e0680"
@@ -22,26 +20,17 @@ SRCREV_machine_qemux86-64 = "af2bfbe5f757361b5b027a24d67a93bfdfaaf33c"
22SRCREV_machine = "4ae8f8605c81c39b959948e23f7123294a5dfb3f" 20SRCREV_machine = "4ae8f8605c81c39b959948e23f7123294a5dfb3f"
23SRCREV_meta = "aeea99683c7283f1f3320bf2ee7085ee252d4e7e" 21SRCREV_meta = "aeea99683c7283f1f3320bf2ee7085ee252d4e7e"
24 22
25PR = "r20" 23PR = "r21"
26PV = "${LINUX_VERSION}+git${SRCPV}" 24PV = "${LINUX_VERSION}+git${SRCPV}"
27SRCREV_FORMAT = "meta_machine"
28 25
29SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" 26SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
30 27
31COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" 28COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)"
32 29
33# Functionality flags 30# Functionality flags
34KERNEL_REVISION_CHECKING ?= "t"
35KERNEL_FEATURES="features/netfilter" 31KERNEL_FEATURES="features/netfilter"
36KERNEL_FEATURES_append=" features/taskstats" 32KERNEL_FEATURES_append=" features/taskstats"
37KERNEL_FEATURES_append_qemux86=" cfg/sound" 33KERNEL_FEATURES_append_qemux86=" cfg/sound"
38KERNEL_FEATURES_append_qemux86-64=" cfg/sound" 34KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
39 35
40YOCTO_KERNEL_META_DATA=t
41
42# extra tasks
43addtask kernel_link_vmlinux after do_compile before do_install
44addtask validate_branches before do_patch after do_kernel_checkout
45addtask kernel_configcheck after do_configure before do_compile
46
47require linux-tools.inc 36require linux-tools.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index f504b74dbd..b2965582bc 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -20,9 +20,8 @@ SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1"
20SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e" 20SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e"
21SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7" 21SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
22 22
23PR = "r1" 23PR = "r2"
24PV = "${LINUX_VERSION}+git${SRCPV}" 24PV = "${LINUX_VERSION}+git${SRCPV}"
25SRCREV_FORMAT = "meta_machine"
26 25
27SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" 26SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
28 27
@@ -34,9 +33,4 @@ KERNEL_FEATURES_append=" features/taskstats"
34KERNEL_FEATURES_append_qemux86=" cfg/sound" 33KERNEL_FEATURES_append_qemux86=" cfg/sound"
35KERNEL_FEATURES_append_qemux86-64=" cfg/sound" 34KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
36 35
37# extra tasks
38addtask kernel_link_vmlinux after do_compile before do_install
39addtask validate_branches before do_patch after do_kernel_checkout
40addtask kernel_configcheck after do_configure before do_compile
41
42require linux-tools.inc 36require linux-tools.inc