From fd032a2db3a6c31e1f808e224616d1049dbf39a3 Mon Sep 17 00:00:00 2001 From: wangmy Date: Tue, 15 Mar 2022 20:12:29 +0800 Subject: lttng-modules: upgrade 2.13.1 -> 2.13.2 Changelog: ========= * Fix: incorrect in/out direction for syscall exit * fix: net: socket: rename SKB_DROP_REASON_SOCKET_FILTER (v5.17) * fix: net: skb: introduce kfree_skb_reason() (v5.17) * fix: random: rather than entropy_store abstraction, use global (v5.17) * fix: btrfs: pass fs_info to trace_btrfs_transaction_commit (v5.17) * fix: mm: compaction: fix the migration stats in trace_mm_compaction_migratepages() (v5.17) * fix: block: remove the ->rq_disk field in struct request (v5.17) * fix: block: remove GENHD_FL_SUPPRESS_PARTITION_INFO (v5.17) * Copyright ownership transfer (From OE-Core rev: 8407ac82264475ade1f8ef7fbafd70f830a0376c) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (cherry picked from commit 093d6dba95c03911d3d7e1b3b07ceff2c1de5563) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-kernel/lttng/lttng-modules_2.13.1.bb | 45 ----------------------- meta/recipes-kernel/lttng/lttng-modules_2.13.2.bb | 44 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 45 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.13.1.bb create mode 100644 meta/recipes-kernel/lttng/lttng-modules_2.13.2.bb diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.1.bb deleted file mode 100644 index b05cad6be7..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.1.bb +++ /dev/null @@ -1,45 +0,0 @@ -SECTION = "devel" -SUMMARY = "Linux Trace Toolkit KERNEL MODULE" -DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" -HOMEPAGE = "https://lttng.org/" -LICENSE = "LGPLv2.1 & GPLv2 & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4" - -inherit module - -include lttng-platforms.inc - -SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ - " -# Use :append here so that the patch is applied also when using devupstream -SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" - -SRC_URI[sha256sum] = "a7c86d91c9bbe66d27f025aa04b8cfc6d7785ed2fc7ef774930800ee44d7f343" - -export INSTALL_MOD_DIR="kernel/lttng-modules" - -EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'" - -MODULES_MODULE_SYMVERS_LOCATION = "src" - -do_install:append() { - # Delete empty directories to avoid QA failures if no modules were built - if [ -d ${D}/${nonarch_base_libdir} ]; then - find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \; - fi -} - -python do_package:prepend() { - if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')): - bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN')) -} - -BBCLASSEXTEND = "devupstream:target" -LIC_FILES_CHKSUM:class-devupstream = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4" -DEFAULT_PREFERENCE:class-devupstream = "-1" -SRC_URI:class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.13" - -SRCREV:class-devupstream = "c570be0da77e963d77bac099d468bc0cd5f1bd63" -PV:class-devupstream = "2.13.0+git${SRCPV}" -S:class-devupstream = "${WORKDIR}/git" -SRCREV_FORMAT ?= "lttng_git" diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.2.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.2.bb new file mode 100644 index 0000000000..b438d06c6c --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.2.bb @@ -0,0 +1,44 @@ +SECTION = "devel" +SUMMARY = "Linux Trace Toolkit KERNEL MODULE" +DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" +HOMEPAGE = "https://lttng.org/" +LICENSE = "LGPLv2.1 & GPLv2 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4" + +inherit module + +include lttng-platforms.inc + +SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2" +# Use :append here so that the patch is applied also when using devupstream +SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch" + +SRC_URI[sha256sum] = "dfd547d9041c8c545ae5b7bfef3f0ef2d9f2520d6ab44188c9ea8de56d5d298a" + +export INSTALL_MOD_DIR="kernel/lttng-modules" + +EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'" + +MODULES_MODULE_SYMVERS_LOCATION = "src" + +do_install:append() { + # Delete empty directories to avoid QA failures if no modules were built + if [ -d ${D}/${nonarch_base_libdir} ]; then + find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \; + fi +} + +python do_package:prepend() { + if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')): + bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN')) +} + +BBCLASSEXTEND = "devupstream:target" +LIC_FILES_CHKSUM:class-devupstream = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4" +DEFAULT_PREFERENCE:class-devupstream = "-1" +SRC_URI:class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.13" + +SRCREV:class-devupstream = "c570be0da77e963d77bac099d468bc0cd5f1bd63" +PV:class-devupstream = "2.13.0+git${SRCPV}" +S:class-devupstream = "${WORKDIR}/git" +SRCREV_FORMAT ?= "lttng_git" -- cgit v1.2.3-54-g00ecf