lttng-modules: Upgrade 2.13.9 -> 2.13.14
PATCH v2 1/1 lttng-modules: Upgrade 2.13.9 -> 2.13.14
From: Siddharth Doshi <[email protected]>
License-Update: Updated LIC_FILES_CHKSUM due to License file modification
Note: Upgrade lttng-modules to 2.13.14 to fix fcheck error which occurs with commit 782202de6478f68caaed4567017095ad906c4eef in kernel "file: Rename fcheck lookup_fd_rcu" which does replaces fcheck with lookup_fd_rcu.
---
.../0009-Rename-genhd-wrapper-to-blkdev.patch | 19 +++++++++++--------
...les_2.13.9.bb => lttng-modules_2.13.14.bb} | 4 ++--
2 files changed, 13 insertions(+), 10 deletions(-)
rename meta/recipes-kernel/lttng/{lttng-modules_2.13.9.bb => lttng-modules_2.13.14.bb} (89%)meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch +11 -8
@@ -8,9 +8,12 @@ to follow upstream. Upstream-Status: Backport +Note: Updated patch to cleanly apply to 2.13.14 + Change-Id: I4ec94fb94d11712dd20f0680aea1de77fbfa9d17 Signed-off-by: Michael Jeanson <[email protected]> Signed-off-by: Mathieu Desnoyers <[email protected]> +Signed-off-by: Siddharth Doshi <[email protected]> --- include/wrapper/{genhd.h => blkdev.h} | 10 +++++----- src/lttng-statedump-impl.c | 2 +-
@@ -21,7 +24,7 @@ diff --git a/include/wrapper/genhd.h b/include/wrapper/blkdev.h similarity index 93% rename from include/wrapper/genhd.h rename to include/wrapper/blkdev.h -index 4a59b68e..0d5ad90f 100644 +index e32c7b6..76397f6 100644 --- a/include/wrapper/genhd.h +++ b/include/wrapper/blkdev.h @@ -1,6 +1,6 @@
@@ -41,9 +44,9 @@ index 4a59b68e..0d5ad90f 100644 +#ifndef _LTTNG_WRAPPER_BLKDEV_H +#define _LTTNG_WRAPPER_BLKDEV_H - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) - #include <linux/blkdev.h> -@@ -45,7 +45,7 @@ struct class *wrapper_get_block_class(void) + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0) \ + || LTTNG_RHEL_KERNEL_RANGE(5,14,0,162,0,0, 5,15,0,0,0,0)) +@@ -47,7 +47,7 @@ struct class *wrapper_get_block_class(void) /* * Canary function to check for 'block_class' at compile time. *
@@ -52,17 +55,17 @@ index 4a59b68e..0d5ad90f 100644 * * extern struct class block_class; */ -@@ -104,4 +104,4 @@ struct device_type *wrapper_get_disk_type(void) +@@ -106,4 +106,4 @@ struct device_type *wrapper_get_disk_type(void) #endif -#endif /* _LTTNG_WRAPPER_GENHD_H */ +#endif /* _LTTNG_WRAPPER_BLKDEV_H */ diff --git a/src/lttng-statedump-impl.c b/src/lttng-statedump-impl.c -index 4d7b2921..0e753090 100644 +index 9d197ce..229517e 100644 --- a/src/lttng-statedump-impl.c +++ b/src/lttng-statedump-impl.c -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include <wrapper/namespace.h> #include <wrapper/irq.h> #include <wrapper/tracepoint.h>
@@ -72,5 +75,5 @@ index 4d7b2921..0e753090 100644 #include <wrapper/fdtable.h> #include <wrapper/sched.h> -- -2.19.1 +2.35.7
meta/recipes-kernel/lttng/lttng-modules_2.13.14.bb renamed from meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb +2 -2
@@ -3,7 +3,7 @@ SUMMARY = "Linux Trace Toolkit KERNEL MODULE" DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" HOMEPAGE = "https://lttng.org/" LICENSE = "LGPL-2.1-only & GPL-2.0-only & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8d0d9f08888046474772a5d745d89d6a" inherit module
@@ -16,7 +16,7 @@ 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] = "bf808b113544287cfe837a6382887fa66354ef5cc8216460cebbef3d27dc3581" +SRC_URI[sha256sum] = "c6449f7ff12ab644a630692a556304e51525ca37d98aebf826796918be0f5da6" export INSTALL_MOD_DIR="kernel/lttng-modules"
Signature · 1 line
2.34.1
Quoted 4 lines · Siddharth Doshi via lists.openembedded.org
From: Siddharth Doshi <[email protected]>
License-Update: Updated
LIC_FILES_CHKSUMdue to License file modification
I think the intent of this tag is to specify what was modified! Please send a V3 outlining what changed in the license file.
Thanks!
Steve
Quoted 117 lines
Note: Upgrade lttng-modules to 2.13.14 to fix fcheck error which occurs with commit
782202de6478f68caaed4567017095ad906c4eefin kernel "file: Rename fchecklookup_fd_rcu" which does replaces fcheck withlookup_fd_rcu.Signed-off-by Armin Kuster <[email protected]>Signed-off-by Siddharth Doshi <[email protected]>--- .../0009-Rename-genhd-wrapper-to-blkdev.patch | 19 +++++++++++-------- ...les_2.13.9.bb => lttng-modules_2.13.14.bb} | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) rename meta/recipes-kernel/lttng/{lttng-modules_2.13.9.bb => lttng-modules_2.13.14.bb} (89%)meta/recipes-kernel/lttng/lttng-modules/0009-Rename-genhd-wrapper-to-blkdev.patch +11
-8@@ -8,9 +8,12 @@ to follow upstream. Upstream-Status: Backport +Note: Updated patch to cleanly apply to 2.13.14 + Change-Id: I4ec94fb94d11712dd20f0680aea1de77fbfa9d17 Signed-off-by: Michael Jeanson <[email protected]> Signed-off-by: Mathieu Desnoyers <[email protected]> +Signed-off-by: Siddharth Doshi <[email protected]> --- include/wrapper/{genhd.h => blkdev.h} | 10 +++++----- src/lttng-statedump-impl.c | 2 +-@@ -21,7 +24,7 @@ diff --git a/include/wrapper/genhd.h b/include/wrapper/blkdev.h similarity index 93% rename from include/wrapper/genhd.h rename to include/wrapper/blkdev.h -index 4a59b68e..0d5ad90f 100644 +index e32c7b6..76397f6 100644 --- a/include/wrapper/genhd.h +++ b/include/wrapper/blkdev.h @@ -1,6 +1,6 @@@@ -41,9 +44,9 @@ index 4a59b68e..0d5ad90f 100644 +#ifndef _LTTNG_WRAPPER_BLKDEV_H +#define _LTTNG_WRAPPER_BLKDEV_H - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) - #include <linux/blkdev.h> -@@ -45,7 +45,7 @@ struct class *wrapper_get_block_class(void) + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0) \ + || LTTNG_RHEL_KERNEL_RANGE(5,14,0,162,0,0, 5,15,0,0,0,0)) +@@ -47,7 +47,7 @@ struct class *wrapper_get_block_class(void) /* * Canary function to check for 'block_class' at compile time. *@@ -52,17 +55,17 @@ index 4a59b68e..0d5ad90f 100644 * * extern struct class block_class; */ -@@ -104,4 +104,4 @@ struct device_type *wrapper_get_disk_type(void) +@@ -106,4 +106,4 @@ struct device_type *wrapper_get_disk_type(void) #endif -#endif /* _LTTNG_WRAPPER_GENHD_H */ +#endif /* _LTTNG_WRAPPER_BLKDEV_H */ diff --git a/src/lttng-statedump-impl.c b/src/lttng-statedump-impl.c -index 4d7b2921..0e753090 100644 +index 9d197ce..229517e 100644 --- a/src/lttng-statedump-impl.c +++ b/src/lttng-statedump-impl.c -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include <wrapper/namespace.h> #include <wrapper/irq.h> #include <wrapper/tracepoint.h>@@ -72,5 +75,5 @@ index 4d7b2921..0e753090 100644 #include <wrapper/fdtable.h> #include <wrapper/sched.h> -- -2.19.1 +2.35.7meta/recipes-kernel/lttng/lttng-modules_2.13.14.bb renamed from meta/recipes-kernel/lttng/lttng-modules_2.13.9.bb +2
-3@@ -3,7 +3,7 @@ SUMMARY = "Linux Trace Toolkit KERNEL MODULE" DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" HOMEPAGE = "https://lttng.org/" LICENSE = "LGPL-2.1-only & GPL-2.0-only & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8d0d9f08888046474772a5d745d89d6a" inherit module@@ -16,7 +16,7 @@ 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] = "bf808b113544287cfe837a6382887fa66354ef5cc8216460cebbef3d27dc3581" +SRC_URI[sha256sum] = "c6449f7ff12ab644a630692a556304e51525ca37d98aebf826796918be0f5da6" export INSTALL_MOD_DIR="kernel/lttng-modules" --2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#202887): https://lists.openembedded.org/g/openembedded-core/message/202887
Mute This Topic: https://lists.openembedded.org/mt/107673130/3620601
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-