diff options
Diffstat (limited to 'meta/recipes-kernel/linux')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-stable_git.bb | 10 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_git.bb | 18 |
2 files changed, 16 insertions, 12 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb index dd4d176ac5..85b67f4ddc 100644 --- a/meta/recipes-kernel/linux/linux-yocto-stable_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto-stable_git.bb | |||
@@ -12,8 +12,9 @@ KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb" | |||
12 | KMACHINE_beagleboard = "beagleboard" | 12 | KMACHINE_beagleboard = "beagleboard" |
13 | 13 | ||
14 | LINUX_VERSION ?= "2.6.34" | 14 | LINUX_VERSION ?= "2.6.34" |
15 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" | 15 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE_EXTENSION}" |
16 | PR = "r0" | 16 | |
17 | PR = "r1" | ||
17 | PV = "${LINUX_VERSION}+git${SRCPV}" | 18 | PV = "${LINUX_VERSION}+git${SRCPV}" |
18 | SRCREV_FORMAT = "meta_machine" | 19 | SRCREV_FORMAT = "meta_machine" |
19 | 20 | ||
@@ -21,11 +22,14 @@ COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|atom-pc|route | |||
21 | 22 | ||
22 | # this performs a fixup on the SRCREV for new/undefined BSPs | 23 | # this performs a fixup on the SRCREV for new/undefined BSPs |
23 | python __anonymous () { | 24 | python __anonymous () { |
24 | import bb, re | 25 | import bb, re, string |
25 | 26 | ||
26 | rev = bb.data.getVar("SRCREV_machine", d, 1) | 27 | rev = bb.data.getVar("SRCREV_machine", d, 1) |
27 | if rev == "standard": | 28 | if rev == "standard": |
28 | bb.data.setVar("SRCREV_machine", "${SRCREV_meta}", d) | 29 | bb.data.setVar("SRCREV_machine", "${SRCREV_meta}", d) |
30 | |||
31 | kerntype = string.replace(bb.data.expand("${LINUX_KERNEL_TYPE}", d), "_", "-") | ||
32 | bb.data.setVar("LINUX_KERNEL_TYPE_EXTENSION", kerntype, d) | ||
29 | } | 33 | } |
30 | 34 | ||
31 | SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ | 35 | SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ |
diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb index f40fe38fcd..6677f99abb 100644 --- a/meta/recipes-kernel/linux/linux-yocto_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto_git.bb | |||
@@ -1,15 +1,15 @@ | |||
1 | inherit kernel | 1 | inherit kernel |
2 | require linux-yocto.inc | 2 | require linux-yocto.inc |
3 | 3 | ||
4 | KMACHINE_qemux86 = "common_pc/base" | 4 | KMACHINE_qemux86 = "yocto/standard/common_pc/base" |
5 | KMACHINE_qemux86-64 = "common_pc_64" | 5 | KMACHINE_qemux86-64 = "yocto/standard/common-pc-64" |
6 | KMACHINE_qemuppc = "qemu_ppc32" | 6 | KMACHINE_qemuppc = "yocto/standard/qemu-ppc32" |
7 | KMACHINE_qemumips = "mti_malta32_be" | 7 | KMACHINE_qemumips = "yocto/standard/mti-malta32-be" |
8 | KMACHINE_qemuarm = "arm_versatile_926ejs" | 8 | KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs" |
9 | KMACHINE_atom-pc = "atom-pc" | 9 | KMACHINE_atom-pc = "yocto/standard/common-pc/atom-pc" |
10 | KMACHINE_routerstationpro = "routerstationpro" | 10 | KMACHINE_routerstationpro = "yocto/standard/routerstationpro" |
11 | KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb" | 11 | KMACHINE_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb" |
12 | KMACHINE_beagleboard = "beagleboard" | 12 | KMACHINE_beagleboard = "yocto/standard/beagleboard" |
13 | 13 | ||
14 | LINUX_VERSION ?= "2.6.37" | 14 | LINUX_VERSION ?= "2.6.37" |
15 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" | 15 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" |