diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-07-13 19:51:57 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-23 08:48:39 +0100 |
commit | 271b9b6873ce1e79587325b4dd35e4103d5a1258 (patch) | |
tree | af1fcc7313ecde57df5cca79cfaceccc3d350e54 /meta/recipes-kernel | |
parent | 51b590db259375aa6259845862ca9020ed264b05 (diff) | |
download | poky-271b9b6873ce1e79587325b4dd35e4103d5a1258.tar.gz |
lttng-ust: 2.6.1 -> 2.6.2
* Remove add-aarch64.patch since it is already in the source.
* Rename lttng-ust_2.6.1.bb -> lttng-ust_git.bb
(From OE-Core rev: f5b03208c0ae0f47dddec6e39712fb0f1d041ebc)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch | 19 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-ust_git.bb (renamed from meta/recipes-kernel/lttng/lttng-ust_2.6.1.bb) | 6 |
2 files changed, 3 insertions, 22 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch b/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch deleted file mode 100644 index cec5410369..0000000000 --- a/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | lttng-ust: add aarch64 recognition | ||
2 | |||
3 | Treat the same as "arm". | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-off-by: joe.slater@windriver.com | ||
8 | |||
9 | |||
10 | --- a/configure.ac | ||
11 | +++ b/configure.ac | ||
12 | @@ -230,6 +230,7 @@ changequote([,])dnl | ||
13 | s390) NO_UNALIGNED_ACCESS=1 ;; | ||
14 | s390x) NO_UNALIGNED_ACCESS=1 ;; | ||
15 | arm*) NO_UNALIGNED_ACCESS=1 ;; | ||
16 | + aarch64) NO_UNALIGNED_ACCESS=1 ;; | ||
17 | mips*) NO_UNALIGNED_ACCESS=1 ;; | ||
18 | tile*) NO_UNALIGNED_ACCESS=1 ;; | ||
19 | *) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;; | ||
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.6.1.bb b/meta/recipes-kernel/lttng/lttng-ust_git.bb index d083f86695..ae4afd3d89 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.6.1.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_git.bb | |||
@@ -18,14 +18,14 @@ RPROVIDES_${PN} = "lttng2-ust" | |||
18 | RREPLACES_${PN} = "lttng2-ust" | 18 | RREPLACES_${PN} = "lttng2-ust" |
19 | RCONFLICTS_${PN} = "lttng2-ust" | 19 | RCONFLICTS_${PN} = "lttng2-ust" |
20 | 20 | ||
21 | SRCREV = "369ee1a1b12338e5158d24f9c879f5dd52f1aba2" | 21 | SRCREV = "c49ee9040ada6984c880756614e8a6f7fd645bd6" |
22 | PE = "2" | 22 | PE = "2" |
23 | PV = "2.6.2+git${SRCPV}" | ||
23 | 24 | ||
24 | SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.6 \ | 25 | SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.6 \ |
25 | file://lttng-ust-doc-examples-disable.patch \ | 26 | file://lttng-ust-doc-examples-disable.patch \ |
26 | file://add-aarch64.patch \ | ||
27 | file://lttng-ust-Fix-live-timer-calculation-error.patch \ | 27 | file://lttng-ust-Fix-live-timer-calculation-error.patch \ |
28 | " | 28 | " |
29 | 29 | ||
30 | S = "${WORKDIR}/git" | 30 | S = "${WORKDIR}/git" |
31 | 31 | ||