diff options
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-stable_git.bb | 10 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_git.bb | 4 |
3 files changed, 11 insertions, 7 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb index d4bee77c21..3c1e669733 100644 --- a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb | |||
@@ -1,6 +1,7 @@ | |||
1 | inherit kernel | 1 | inherit kernel |
2 | require linux-yocto.inc | 2 | require linux-yocto.inc |
3 | 3 | ||
4 | KMACHINE = "common_pc" | ||
4 | KMACHINE_qemux86 = "common_pc" | 5 | KMACHINE_qemux86 = "common_pc" |
5 | KMACHINE_qemux86-64 = "common_pc_64" | 6 | KMACHINE_qemux86-64 = "common_pc_64" |
6 | KMACHINE_qemuppc = "qemu_ppc32" | 7 | KMACHINE_qemuppc = "qemu_ppc32" |
@@ -14,20 +15,19 @@ KMACHINE_beagleboard = "beagleboard" | |||
14 | LINUX_VERSION ?= "2.6.34" | 15 | LINUX_VERSION ?= "2.6.34" |
15 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE_EXTENSION}" | 16 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE_EXTENSION}" |
16 | 17 | ||
18 | KMETA = wrs_meta | ||
19 | KBRANCH = ${KMACHINE}-${LINUX_KERNEL_TYPE_EXTENSION} | ||
20 | |||
17 | PR = "r1" | 21 | PR = "r1" |
18 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
19 | SRCREV_FORMAT = "meta_machine" | 23 | SRCREV_FORMAT = "meta_machine" |
20 | 24 | ||
21 | COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|atom-pc|routerstationpro|mpc8315e-rdb|beagleboard)" | 25 | COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|atom-pc|routerstationpro|mpc8315e-rdb|beagleboard)" |
22 | 26 | ||
23 | # this performs a fixup on the SRCREV for new/undefined BSPs | 27 | # this performs a fixup on historical kernel types with embedded _'s |
24 | python __anonymous () { | 28 | python __anonymous () { |
25 | import bb, re, string | 29 | import bb, re, string |
26 | 30 | ||
27 | rev = bb.data.getVar("SRCREV_machine", d, 1) | ||
28 | if rev == "standard": | ||
29 | bb.data.setVar("SRCREV_machine", "${SRCREV_meta}", d) | ||
30 | |||
31 | kerntype = string.replace(bb.data.expand("${LINUX_KERNEL_TYPE}", d), "_", "-") | 31 | kerntype = string.replace(bb.data.expand("${LINUX_KERNEL_TYPE}", d), "_", "-") |
32 | bb.data.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype, d) | 32 | bb.data.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype, d) |
33 | } | 33 | } |
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 3ad849e46e..03935fa702 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" | |||
7 | # A KMACHINE is the mapping of a yocto $MACHINE to what is built | 7 | # A KMACHINE is the mapping of a yocto $MACHINE to what is built |
8 | # by the kernel. This is typically the branch that should be built, | 8 | # by the kernel. This is typically the branch that should be built, |
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 | 12 | # Set this to 'preempt_rt' in the local.conf if you want a real time kernel |
13 | LINUX_KERNEL_TYPE ?= standard | 13 | LINUX_KERNEL_TYPE ?= standard |
@@ -19,4 +19,4 @@ addtask kernel_configme before do_configure after do_patch | |||
19 | # Pick up shared functions | 19 | # Pick up shared functions |
20 | inherit kernel-yocto | 20 | inherit kernel-yocto |
21 | 21 | ||
22 | B = "${WORKDIR}/linux-${KMACHINE}-${LINUX_KERNEL_TYPE}-build" | 22 | B = "${WORKDIR}/linux-${MACHINE}-${LINUX_KERNEL_TYPE}-build" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb index cc52397006..75c6fb1653 100644 --- a/meta/recipes-kernel/linux/linux-yocto_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto_git.bb | |||
@@ -1,6 +1,7 @@ | |||
1 | inherit kernel | 1 | inherit kernel |
2 | require linux-yocto.inc | 2 | require linux-yocto.inc |
3 | 3 | ||
4 | KMACHINE = "yocto/standard/base" | ||
4 | KMACHINE_qemux86 = "yocto/standard/common-pc/base" | 5 | KMACHINE_qemux86 = "yocto/standard/common-pc/base" |
5 | KMACHINE_qemux86-64 = "yocto/standard/common-pc-64/base" | 6 | KMACHINE_qemux86-64 = "yocto/standard/common-pc-64/base" |
6 | KMACHINE_qemuppc = "yocto/standard/qemu-ppc32" | 7 | KMACHINE_qemuppc = "yocto/standard/qemu-ppc32" |
@@ -11,6 +12,9 @@ KMACHINE_routerstationpro = "yocto/standard/routerstationpro" | |||
11 | KMACHINE_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb" | 12 | KMACHINE_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb" |
12 | KMACHINE_beagleboard = "yocto/standard/beagleboard" | 13 | KMACHINE_beagleboard = "yocto/standard/beagleboard" |
13 | 14 | ||
15 | KBRANCH = ${KMACHINE} | ||
16 | KMETA = meta | ||
17 | |||
14 | LINUX_VERSION ?= "2.6.37" | 18 | LINUX_VERSION ?= "2.6.37" |
15 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" | 19 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" |
16 | PR = "r15" | 20 | PR = "r15" |