summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch19
-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 @@
-lttng-ust: add aarch64 recognition
-
-Treat the same as "arm".
-
-Upstream-Status: Pending
-
-Signed-off-by: joe.slater@windriver.com
-
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -230,6 +230,7 @@ changequote([,])dnl
- s390) NO_UNALIGNED_ACCESS=1 ;;
- s390x) NO_UNALIGNED_ACCESS=1 ;;
- arm*) NO_UNALIGNED_ACCESS=1 ;;
-+ aarch64) NO_UNALIGNED_ACCESS=1 ;;
- mips*) NO_UNALIGNED_ACCESS=1 ;;
- tile*) NO_UNALIGNED_ACCESS=1 ;;
- *) 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"
RREPLACES_${PN} = "lttng2-ust"
RCONFLICTS_${PN} = "lttng2-ust"
-SRCREV = "369ee1a1b12338e5158d24f9c879f5dd52f1aba2"
+SRCREV = "c49ee9040ada6984c880756614e8a6f7fd645bd6"
PE = "2"
+PV = "2.6.2+git${SRCPV}"
SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.6 \
file://lttng-ust-doc-examples-disable.patch \
- file://add-aarch64.patch \
file://lttng-ust-Fix-live-timer-calculation-error.patch \
- "
+ "
S = "${WORKDIR}/git"