diff options
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 1 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 7 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.0.bb | 23 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.2.bb | 2 |
7 files changed, 26 insertions, 13 deletions
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 754ebe5fb2..1af22f634d 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | |||
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8 | |||
4 | 4 | ||
5 | DEPENDS = "git-native guilt-native" | 5 | DEPENDS = "git-native guilt-native" |
6 | 6 | ||
7 | SRCREV = "2bbbaaa00cc70887d6d6f745b9425890d522d240" | 7 | SRCREV = "369e67046a1b72b6447c208babd4d2065265a95e" |
8 | PR = "r12" | 8 | PR = "r12" |
9 | PV = "0.1+git${SRCPV}" | 9 | PV = "0.1+git${SRCPV}" |
10 | 10 | ||
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 36dcb6e67e..14af91dc31 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | |||
@@ -13,6 +13,7 @@ KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32" | |||
13 | 13 | ||
14 | LINUX_VERSION ?= "3.0.24" | 14 | LINUX_VERSION ?= "3.0.24" |
15 | LINUX_KERNEL_TYPE = "preempt-rt" | 15 | LINUX_KERNEL_TYPE = "preempt-rt" |
16 | KMETA = "meta" | ||
16 | 17 | ||
17 | SRCREV_machine ?= "cf280f1dc5877d4ca43d21307222326efa68bb27" | 18 | SRCREV_machine ?= "cf280f1dc5877d4ca43d21307222326efa68bb27" |
18 | SRCREV_machine_qemuppc ?= "afaa5baa6a9ca9c8a03a9a3eee2ba9fba089f416" | 19 | SRCREV_machine_qemuppc ?= "afaa5baa6a9ca9c8a03a9a3eee2ba9fba089f416" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb index 7e01efbc98..8ec366ceee 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | |||
@@ -14,6 +14,8 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32" | |||
14 | LINUX_VERSION ?= "3.2.11" | 14 | LINUX_VERSION ?= "3.2.11" |
15 | LINUX_KERNEL_TYPE = "preempt-rt" | 15 | LINUX_KERNEL_TYPE = "preempt-rt" |
16 | 16 | ||
17 | KMETA = "meta" | ||
18 | |||
17 | SRCREV_machine ?= "3ebf4d172cf4a41d2abf09e4036f0850e08064e7" | 19 | SRCREV_machine ?= "3ebf4d172cf4a41d2abf09e4036f0850e08064e7" |
18 | SRCREV_machine_qemuppc ?= "7cebfe717987f4ffa9ae90558c28f45049847c1c" | 20 | SRCREV_machine_qemuppc ?= "7cebfe717987f4ffa9ae90558c28f45049847c1c" |
19 | SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" | 21 | SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" |
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 2b61b7e2cc..0912beef5a 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc | |||
@@ -9,15 +9,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" | |||
9 | # and it can be specific to the machine or shared | 9 | # and it can be specific to the machine or shared |
10 | # KMACHINE = "UNDEFINED" | 10 | # KMACHINE = "UNDEFINED" |
11 | 11 | ||
12 | # Set this to 'preempt_rt' in the local.conf if you want a real time kernel | ||
13 | LINUX_KERNEL_TYPE ?= "standard" | 12 | LINUX_KERNEL_TYPE ?= "standard" |
14 | 13 | ||
15 | KMETA ?= "meta" | 14 | # KMETA ?= "" |
15 | KBRANCH ?= "master" | ||
16 | KMACHINE ?= "${MACHINE}" | ||
16 | SRCREV_FORMAT ?= "meta_machine" | 17 | SRCREV_FORMAT ?= "meta_machine" |
17 | 18 | ||
18 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" | 19 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" |
19 | KERNEL_REVISION_CHECKING ?= "t" | ||
20 | YOCTO_KERNEL_META_DATA ?= "t" | ||
21 | 20 | ||
22 | do_patch[depends] = "kern-tools-native:do_populate_sysroot" | 21 | do_patch[depends] = "kern-tools-native:do_populate_sysroot" |
23 | 22 | ||
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 d3da75cfc6..3968c62f38 100644 --- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb +++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | |||
@@ -10,6 +10,8 @@ KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" | |||
10 | 10 | ||
11 | KBRANCH = "${KMACHINE}" | 11 | KBRANCH = "${KMACHINE}" |
12 | 12 | ||
13 | KMETA = "meta" | ||
14 | |||
13 | LINUX_VERSION ?= "2.6.37" | 15 | LINUX_VERSION ?= "2.6.37" |
14 | 16 | ||
15 | SRCREV_machine_qemuarm = "b3e53a090eaa23aa82e64fa0a563a93a2b4dbb5d" | 17 | SRCREV_machine_qemuarm = "b3e53a090eaa23aa82e64fa0a563a93a2b4dbb5d" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb index 074b1ede95..82a7224251 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb | |||
@@ -1,14 +1,21 @@ | |||
1 | inherit kernel | 1 | inherit kernel |
2 | require recipes-kernel/linux/linux-yocto.inc | 2 | require recipes-kernel/linux/linux-yocto.inc |
3 | 3 | ||
4 | KMACHINE = "yocto/standard/base" | 4 | KBRANCH = "yocto/standard/base" |
5 | KMACHINE_qemux86 = "yocto/standard/common-pc/base" | 5 | KBRANCH_qemux86 = "yocto/standard/common-pc/base" |
6 | KMACHINE_qemux86-64 = "yocto/standard/common-pc-64/base" | 6 | KBRANCH_qemux86-64 = "yocto/standard/common-pc-64/base" |
7 | KMACHINE_qemuppc = "yocto/standard/qemu-ppc32" | 7 | KBRANCH_qemuppc = "yocto/standard/qemu-ppc32" |
8 | KMACHINE_qemumips = "yocto/standard/mti-malta32-be" | 8 | KBRANCH_qemumips = "yocto/standard/mti-malta32-be" |
9 | KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" | 9 | KBRANCH_qemuarm = "yocto/standard/arm-versatile-926ejs" |
10 | 10 | ||
11 | KBRANCH = "${KMACHINE}" | 11 | # Temporary until 3.0 kernel tree is updated with machine mappings |
12 | KMACHINE_qemux86 = "common-pc" | ||
13 | KMACHINE_qemux86-64 = "common-pc-64" | ||
14 | KMACHINE_qemuppc = "qemu-ppc32" | ||
15 | KMACHINE_qemumips = "mti-malta32-be" | ||
16 | KMACHINE_qemuarm = "arm-versatile-926ejs" | ||
17 | |||
18 | KMETA = "meta" | ||
12 | 19 | ||
13 | LINUX_VERSION ?= "3.0.24" | 20 | LINUX_VERSION ?= "3.0.24" |
14 | 21 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb index 51119bb201..71290bddd4 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb | |||
@@ -28,6 +28,8 @@ SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03" | |||
28 | PR = "r1" | 28 | PR = "r1" |
29 | PV = "${LINUX_VERSION}+git${SRCPV}" | 29 | PV = "${LINUX_VERSION}+git${SRCPV}" |
30 | 30 | ||
31 | KMETA = "meta" | ||
32 | |||
31 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" | 33 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" |
32 | 34 | ||
33 | COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" | 35 | COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" |