diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2012-11-30 12:33:50 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-06 12:31:11 +0000 |
| commit | 48e7c26824e6f6a18f451aa34f7c30372a82f534 (patch) | |
| tree | 6967a91b125420e6b1b0cb5cd466505b524cc722 /meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | |
| parent | 2907c80bf1be8be6866346c0c0615ec0dd459c44 (diff) | |
| download | poky-48e7c26824e6f6a18f451aa34f7c30372a82f534.tar.gz | |
linux-yocto/3.4: merge v3.4.19, v3.4.20
Updating the linux-yocto-3.4 trees to incorporate both 3.4.19 and
3.4.20 from the kernel.org -stable team.
(From OE-Core rev: 8ac0c82bb8fe4fe17b6a32b18e57546d21b4d5ef)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb index ab214c8665..d6fe8bbaf5 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | |||
| @@ -8,12 +8,12 @@ KBRANCH = "${KBRANCH_DEFAULT}" | |||
| 8 | LINUX_KERNEL_TYPE = "tiny" | 8 | LINUX_KERNEL_TYPE = "tiny" |
| 9 | KCONFIG_MODE = "--allnoconfig" | 9 | KCONFIG_MODE = "--allnoconfig" |
| 10 | 10 | ||
| 11 | LINUX_VERSION ?= "3.4.18" | 11 | LINUX_VERSION ?= "3.4.20" |
| 12 | 12 | ||
| 13 | KMETA = "meta" | 13 | KMETA = "meta" |
| 14 | 14 | ||
| 15 | SRCREV_machine ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14" | 15 | SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3" |
| 16 | SRCREV_meta ?= "4e5f2b43acfbdb924edbdf42a816e3e2b15203b3" | 16 | SRCREV_meta ?= "8b0a93c0a224c9b91f90545b123b055b2e313bfc" |
| 17 | 17 | ||
| 18 | PR = "${INC_PR}.0" | 18 | PR = "${INC_PR}.0" |
| 19 | PV = "${LINUX_VERSION}+git${SRCPV}" | 19 | PV = "${LINUX_VERSION}+git${SRCPV}" |