diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2012-11-21 16:32:24 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-22 07:53:33 +0000 |
commit | 01ff7003cd82d3a549da7b761d64cc1d634012ae (patch) | |
tree | bec4ed5189afb66e3ef7986a13c9538daa118603 /meta/recipes-kernel | |
parent | 1e12ab7af6f3ae1e897ee7412450d78e26a60c1a (diff) | |
download | poky-01ff7003cd82d3a549da7b761d64cc1d634012ae.tar.gz |
linux-yocto/3.4: uprobes: reinstate config options for 'uprobe' feature
bumping the meta SRCREV to import the following fix:
[
uprobes: reinstate config options for 'uprobe' feature
commit 17ec51adfff (meta: cleanup invalid/obselete 3.4 CONFIG options)
removed the uprobes config options, this restores them.
]
(From OE-Core rev: 8c637986e063fcb087babecfc0192f96d3981515)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.4.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb index 1176404c0b..76ee542628 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | |||
@@ -10,7 +10,7 @@ KMETA = "meta" | |||
10 | 10 | ||
11 | SRCREV_machine ?= "2572b13999da8129c37eb2bf7e9a8fa68dc2a4bf" | 11 | SRCREV_machine ?= "2572b13999da8129c37eb2bf7e9a8fa68dc2a4bf" |
12 | SRCREV_machine_qemuppc ?= "2004632314104d4f31bb1577e955da53796f517c" | 12 | SRCREV_machine_qemuppc ?= "2004632314104d4f31bb1577e955da53796f517c" |
13 | SRCREV_meta ?= "553a8512fd924420db5cc2320ece4a6fd9b1e486" | 13 | SRCREV_meta ?= "472aaf880c9176a40de98c97e14355fe77478598" |
14 | 14 | ||
15 | PR = "${INC_PR}.0" | 15 | PR = "${INC_PR}.0" |
16 | PV = "${LINUX_VERSION}+git${SRCPV}" | 16 | PV = "${LINUX_VERSION}+git${SRCPV}" |
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 6cfec9290f..50890a3ce0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | |||
@@ -13,7 +13,7 @@ LINUX_VERSION ?= "3.4.18" | |||
13 | KMETA = "meta" | 13 | KMETA = "meta" |
14 | 14 | ||
15 | SRCREV_machine ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14" | 15 | SRCREV_machine ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14" |
16 | SRCREV_meta ?= "553a8512fd924420db5cc2320ece4a6fd9b1e486" | 16 | SRCREV_meta ?= "472aaf880c9176a40de98c97e14355fe77478598" |
17 | 17 | ||
18 | PR = "${INC_PR}.0" | 18 | PR = "${INC_PR}.0" |
19 | PV = "${LINUX_VERSION}+git${SRCPV}" | 19 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index 7a58e1c6ba..587bdd6772 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb | |||
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?= "ae8e2cd14e47bceb9c2bdcb927b3a0ea61f6c311" | |||
9 | SRCREV_machine_qemux86 ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14" | 9 | SRCREV_machine_qemux86 ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14" |
10 | SRCREV_machine_qemux86-64 ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14" | 10 | SRCREV_machine_qemux86-64 ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14" |
11 | SRCREV_machine ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14" | 11 | SRCREV_machine ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14" |
12 | SRCREV_meta ?= "553a8512fd924420db5cc2320ece4a6fd9b1e486" | 12 | SRCREV_meta ?= "472aaf880c9176a40de98c97e14355fe77478598" |
13 | 13 | ||
14 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" | 14 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" |
15 | 15 | ||