diff options
Diffstat (limited to 'poky/meta/recipes-kernel')
-rw-r--r-- | poky/meta/recipes-kernel/lttng/lttng-modules_2.10.11.bb (renamed from poky/meta/recipes-kernel/lttng/lttng-modules_2.10.10.bb) | 5 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/lttng/lttng-ust/0001-Add-config-time-check-for-new-gettid-API.patch | 57 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb (renamed from poky/meta/recipes-kernel/lttng/lttng-ust_2.10.4.bb) | 5 | ||||
-rw-r--r-- | poky/meta/recipes-kernel/perf/perf.bb | 4 |
4 files changed, 7 insertions, 64 deletions
diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules_2.10.10.bb b/poky/meta/recipes-kernel/lttng/lttng-modules_2.10.11.bb index 6e2d655495..789a3be850 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-modules_2.10.10.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-modules_2.10.11.bb @@ -16,8 +16,8 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \ " -SRC_URI[md5sum] = "07c0b1ea4c1dd9d3edba8dc980fd93dd" -SRC_URI[sha256sum] = "e0d031005eef337c62de530a3b5b3e8fb1c732846eefcb23b8978edd2091f6e4" +SRC_URI[md5sum] = "c618fb646514dfc1bf910cfd7cda4256" +SRC_URI[sha256sum] = "7f91e39b2e8e46d8bbba2b4c8c1614f1fb380611cd1a1fccc1d1859be26112f1" export INSTALL_MOD_DIR="kernel/lttng-modules" @@ -43,3 +43,4 @@ SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.1 SRCREV_class-devupstream = "624aca5d7507fbd11ea4a1a474c3aa1031bd9a31" PV_class-devupstream = "2.10.10+git${SRCPV}" S_class-devupstream = "${WORKDIR}/git" +SRCREV_FORMAT ?= "lttng_git" diff --git a/poky/meta/recipes-kernel/lttng/lttng-ust/0001-Add-config-time-check-for-new-gettid-API.patch b/poky/meta/recipes-kernel/lttng/lttng-ust/0001-Add-config-time-check-for-new-gettid-API.patch deleted file mode 100644 index 15db1d3af7..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-ust/0001-Add-config-time-check-for-new-gettid-API.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 2bb3e259d0410f16a8b2058a05af434376a1583a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 26 Jul 2019 09:57:32 -0700 -Subject: [lttng-ust][PATCH] Add config time check for new gettid API - -glibc 2.30 introdoced this function see [1] -so its best to detect it -and provide fallbacks only if its not present - -[1] https://sourceware.org/bugzilla/show_bug.cgi?id=6399 - -Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2019-July/029131.html] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 1 + - include/lttng/ust-tid.h | 7 +++++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7fa059a..b1099c1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -137,6 +137,7 @@ AC_CHECK_FUNCS([ \ - clock_gettime \ - ftruncate \ - getpagesize \ -+ gettid \ - gettimeofday \ - localeconv \ - memchr \ -diff --git a/include/lttng/ust-tid.h b/include/lttng/ust-tid.h -index e669d7e..7995c78 100644 ---- a/include/lttng/ust-tid.h -+++ b/include/lttng/ust-tid.h -@@ -26,7 +26,10 @@ - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -- -+#include <config.h> -+#if HAVE_GETTID -+#include <unistd.h> -+#else - #ifdef __linux__ - #include <syscall.h> - #endif -@@ -49,5 +52,5 @@ static inline pid_t gettid(void) - return getpid(); - } - #endif -- -+#endif /* HAVE_GETTID */ - #endif /* _LTTNG_UST_TID_H */ --- -2.22.0 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-ust_2.10.4.bb b/poky/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb index 861a05e6a8..e8312afb26 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-ust_2.10.4.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb @@ -27,11 +27,10 @@ PE = "2" SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://lttng-ust-doc-examples-disable.patch \ - file://0001-Add-config-time-check-for-new-gettid-API.patch \ " -SRC_URI[md5sum] = "19916ff0dec23c90f985586a8cbd1fd2" -SRC_URI[sha256sum] = "75d5b4bb205c444a343e1297e14cd3a2503fc645a26710531cbd319c72c1a967" +SRC_URI[md5sum] = "f0c86a9fa7dcfd0205fb42584a310b1c" +SRC_URI[sha256sum] = "06f9ed9b2198855b1c7fcbf15fe57297ee259409ffa1b3bad87321412d98bc35" CVE_PRODUCT = "ust" diff --git a/poky/meta/recipes-kernel/perf/perf.bb b/poky/meta/recipes-kernel/perf/perf.bb index 7f00df0f8e..8201c0cb60 100644 --- a/poky/meta/recipes-kernel/perf/perf.bb +++ b/poky/meta/recipes-kernel/perf/perf.bb @@ -244,8 +244,8 @@ do_configure_prepend () { install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/tools/include/uapi/asm-generic/unistd.h install -D -m0644 ${STAGING_INCDIR}/asm-generic/unistd.h ${S}/include/uapi/asm-generic/unistd.h - # bits.h can have the same issuen as unistd.h, so we make the tools variant take precedence - install -D -m0644 ${S}/tools/include/linux/bits.h ${S}/include/linux/bits.h + # bits.h can have the same issue as unistd.h, so we make the tools variant take precedence + [ -e ${S}/tools/include/linux/bits.h ] && install -D -m0644 ${S}/tools/include/linux/bits.h ${S}/include/linux/bits.h } python do_package_prepend() { |