Hello community, here is the log from the commit of package lttng-modules for openSUSE:Factory checked in at 2020-02-29 21:24:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lttng-modules (Old) and /work/SRC/openSUSE:Factory/.lttng-modules.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lttng-modules" Sat Feb 29 21:24:13 2020 rev:12 rq:780075 version:2.11.2 Changes: -------- --- /work/SRC/openSUSE:Factory/lttng-modules/lttng-modules.changes 2019-10-04 11:22:42.364900623 +0200 +++ /work/SRC/openSUSE:Factory/.lttng-modules.new.26092/lttng-modules.changes 2020-02-29 21:24:15.990487053 +0100 @@ -1,0 +2,9 @@ +Wed Feb 26 14:29:32 UTC 2020 - Alexei Sorokin <[email protected]> + +- Update to version 2.11.2: + * See /usr/share/doc/packages/lttng-modules/ChangeLog +- Rebase and rename lttng-modules-fix-leap-15.0.patch to + lttng-modules-fix-leap-15.1.patch. +- Update the spec. + +------------------------------------------------------------------- Old: ---- lttng-modules-2.10.11.tar.bz2 lttng-modules-2.10.11.tar.bz2.asc lttng-modules-fix-leap-15.0.patch New: ---- lttng-modules-2.11.2.tar.bz2 lttng-modules-2.11.2.tar.bz2.asc lttng-modules-fix-leap-15.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lttng-modules.spec ++++++ --- /var/tmp/diff_new_pack.5Rko5w/_old 2020-02-29 21:24:17.190489428 +0100 +++ /var/tmp/diff_new_pack.5Rko5w/_new 2020-02-29 21:24:17.202489452 +0100 @@ -1,7 +1,7 @@ # # spec file for package lttng-modules # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,58 +16,37 @@ # -%if 0%{?suse_version} >= 1500 && !0%{?is_opensuse} -%ifarch x86_64 -%define buildrt 1 -%endif -%endif Name: lttng-modules -Version: 2.10.11 +Version: 2.11.2 Release: 0 Summary: Licensing information for package lttng-modules License: GPL-2.0-only AND LGPL-2.1-only AND MIT Group: System/Kernel -Url: https://lttng.org/ +URL: https://lttng.org/ Source: https://lttng.org/files/lttng-modules/%{name}-%{version}.tar.bz2 Source1: https://lttng.org/files/lttng-modules/%{name}-%{version}.tar.bz2.asc Source2: %{name}.keyring Source3: %{name}-preamble Source4: Module.supported -# PATCH-FIX-OPENSUSE lttng-modules-fix-leap-15.0.patch -- Fix building on openSUSE Leap 15.0. -Patch0: lttng-modules-fix-leap-15.0.patch -BuildRequires: kernel-devel -BuildRequires: kernel-source -BuildRequires: kernel-syms -BuildRequires: module-init-tools +# PATCH-FIX-OPENSUSE lttng-modules-fix-leap-15.1.patch -- Fix building on openSUSE Leap 15.1. +Patch0: lttng-modules-fix-leap-15.1.patch +BuildRequires: %{kernel_module_package_buildreqs} ExclusiveArch: %ix86 x86_64 aarch64 ppc64 ppc64le -%if 0%{?buildrt} -BuildRequires: kernel-syms-rt -%endif %description This package provides licensing documentation for the lttng kmp packages. -%suse_kernel_module_package -p %{name}-preamble ec2 xen xenpae vmi um - -%package KMP -Summary: LTTng Kernel Tracing Modules -Group: System/Kernel - -%description KMP -This package contains the LTTng 2.0 Kernel Modules necessary for -instrumenting kernel subsystems. +%kernel_module_package -p %{name}-preamble -x ec2 xen xenpae vmi um %prep -%setup -q -%patch0 -p1 +%autosetup -p1 set -- * -mkdir source -mkdir obj +mkdir source obj for i in "$@"; do case $i in - LICENSE|*.txt) ;; + LICENSE|LICENSES|ChangeLog) ;; *) mv $i source ;; esac done @@ -78,7 +57,7 @@ rm -rf obj/$flavor cp -r source obj/$flavor cp %{SOURCE4} obj/$flavor - make %{?_smp_mflags} V=1 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules \ + %make_build -C %{kernel_source $flavor} modules \ M=$PWD/obj/$flavor CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m done @@ -87,11 +66,12 @@ export INSTALL_MOD_DIR=updates export BRP_PESIGN_FILES="*.ko /lib/firmware" for flavor in %{flavors_to_build}; do - make -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules_install \ + make -C %{kernel_source $flavor} modules_install \ M=$PWD/obj/$flavor CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m done %files -%license LICENSE lgpl-2.1.txt gpl-2.0.txt mit-license.txt +%license LICENSE LICENSES/GPL-2.0 LICENSES/LGPL-2.1 LICENSES/MIT +%doc ChangeLog %changelog ++++++ lttng-modules-2.10.11.tar.bz2 -> lttng-modules-2.11.2.tar.bz2 ++++++ ++++ 16591 lines of diff (skipped) ++++++ lttng-modules-fix-leap-15.0.patch -> lttng-modules-fix-leap-15.1.patch ++++++ --- /work/SRC/openSUSE:Factory/lttng-modules/lttng-modules-fix-leap-15.0.patch 2019-04-22 12:27:03.368946253 +0200 +++ /work/SRC/openSUSE:Factory/.lttng-modules.new.26092/lttng-modules-fix-leap-15.1.patch 2020-02-29 21:24:15.958486990 +0100 @@ -1,82 +1,78 @@ -Index: lttng-modules-2.10.9/instrumentation/events/lttng-module/block.h -=================================================================== ---- lttng-modules-2.10.9.orig/instrumentation/events/lttng-module/block.h -+++ lttng-modules-2.10.9/instrumentation/events/lttng-module/block.h -@@ -618,7 +618,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_bounce, +--- a/instrumentation/events/lttng-module/block.h ++++ b/instrumentation/events/lttng-module/block.h +@@ -619,7 +619,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_bounce, TP_ARGS(q, bio), TP_FIELDS( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \ -+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ ++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ctf_integer(dev_t, dev, bio_dev(bio)) #else ctf_integer(dev_t, dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0) -@@ -663,7 +664,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_complet +@@ -664,7 +665,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_complet #endif TP_FIELDS( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \ -+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ ++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ctf_integer(dev_t, dev, bio_dev(bio)) #else ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev) -@@ -697,7 +699,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_m +@@ -698,7 +700,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_m TP_ARGS(q, rq, bio), TP_FIELDS( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \ -+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ ++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ctf_integer(dev_t, dev, bio_dev(bio)) #else ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev) -@@ -763,7 +766,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_queue, +@@ -764,7 +767,8 @@ LTTNG_TRACEPOINT_EVENT(block_bio_queue, TP_ARGS(q, bio), TP_FIELDS( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \ -+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ ++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ctf_integer(dev_t, dev, bio_dev(bio)) #else ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev) -@@ -854,7 +858,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_get_r +@@ -855,7 +859,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(block_get_r TP_ARGS(q, bio, rw), TP_FIELDS( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \ -+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ ++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ctf_integer(dev_t, dev, bio ? bio_dev(bio) : 0) #else ctf_integer(dev_t, dev, bio ? bio->bi_bdev->bd_dev : 0) -@@ -1019,7 +1024,8 @@ LTTNG_TRACEPOINT_EVENT(block_split, +@@ -1020,7 +1025,8 @@ LTTNG_TRACEPOINT_EVENT(block_split, TP_ARGS(q, bio, new_sector), TP_FIELDS( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \ -+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ ++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ctf_integer(dev_t, dev, bio_dev(bio)) #else ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev) -@@ -1062,7 +1068,8 @@ LTTNG_TRACEPOINT_EVENT(block_remap, +@@ -1063,7 +1069,8 @@ LTTNG_TRACEPOINT_EVENT(block_remap, TP_ARGS(q, bio, dev, from), TP_FIELDS( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) \ -+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ ++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ctf_integer(dev_t, dev, bio_dev(bio)) #else ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev) -Index: lttng-modules-2.10.9/instrumentation/events/lttng-module/btrfs.h -=================================================================== ---- lttng-modules-2.10.9.orig/instrumentation/events/lttng-module/btrfs.h -+++ lttng-modules-2.10.9/instrumentation/events/lttng-module/btrfs.h -@@ -39,10 +39,12 @@ struct extent_state; +--- a/instrumentation/events/lttng-module/btrfs.h ++++ b/instrumentation/events/lttng-module/btrfs.h +@@ -44,10 +44,12 @@ struct extent_state; #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ @@ -89,7 +85,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit, TP_PROTO(const struct btrfs_root *root), -@@ -146,7 +148,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__i +@@ -151,7 +153,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__i ) #endif @@ -99,17 +95,17 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, -@@ -285,7 +288,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, - - #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ +@@ -368,7 +371,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde + BTRFS_I(inode)->root->root_key.objectid) + ) + ) +-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ + LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__ordered_extent, TP_PROTO(const struct inode *inode, -@@ -329,6 +333,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde +@@ -412,6 +416,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde ) ) #elif (LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ @@ -117,7 +113,15 @@ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) -@@ -376,6 +381,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde +@@ -459,6 +464,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__orde + #endif + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ ++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0) /* openSUSE */ || \ + LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ +@@ -664,6 +670,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_file, #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ @@ -125,7 +129,7 @@ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ -@@ -581,6 +587,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_file, +@@ -766,6 +773,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_add_block_g #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ @@ -133,7 +137,7 @@ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ -@@ -623,6 +630,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_sync_fs, +@@ -1006,6 +1014,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tre #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ @@ -141,7 +145,7 @@ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ -@@ -797,6 +805,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrf +@@ -1295,6 +1304,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrf ) #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ @@ -149,7 +153,7 @@ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ -@@ -1000,7 +1009,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref +@@ -1498,7 +1508,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_ref ) #endif @@ -159,7 +163,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__chunk, -@@ -1070,7 +1080,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c +@@ -1568,7 +1579,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c TP_ARGS(fs_info, map, offset, size) ) @@ -169,7 +173,7 @@ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) -@@ -1146,6 +1157,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c +@@ -1644,6 +1656,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__c #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ @@ -177,15 +181,7 @@ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ -@@ -1186,6 +1198,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_cow_block, - #endif - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ -+ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0) /* openSUSE */ || \ - LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ -@@ -1223,7 +1236,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_space_reser +@@ -1737,7 +1750,8 @@ LTTNG_TRACEPOINT_EVENT(btrfs_space_reser ) #endif @@ -195,7 +191,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__reserved_extent, -@@ -1392,7 +1406,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r +@@ -1956,7 +1970,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r TP_ARGS(block_group, start, len) ) @@ -205,15 +201,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(find_free_extent, btrfs_find_free_extent, -@@ -1611,6 +1626,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__r - #endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ -+ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0) /* openSUSE */ || \ - LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ - LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ -@@ -1707,6 +1723,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_setup_clust +@@ -2316,6 +2331,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_setup_clust #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \ @@ -221,25 +209,21 @@ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ -Index: lttng-modules-2.10.9/instrumentation/events/lttng-module/kmem.h -=================================================================== ---- lttng-modules-2.10.9.orig/instrumentation/events/lttng-module/kmem.h -+++ lttng-modules-2.10.9/instrumentation/events/lttng-module/kmem.h -@@ -132,7 +132,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_ +--- a/instrumentation/events/lttng-module/kmem.h ++++ b/instrumentation/events/lttng-module/kmem.h +@@ -133,7 +133,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_ ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) \ -+ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0) || \ ++ LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free_batched, kmem_mm_page_free_batched, TP_PROTO(struct page *page), -Index: lttng-modules-2.10.9/instrumentation/events/lttng-module/kvm.h -=================================================================== ---- lttng-modules-2.10.9.orig/instrumentation/events/lttng-module/kvm.h -+++ lttng-modules-2.10.9/instrumentation/events/lttng-module/kvm.h -@@ -111,6 +111,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio, +--- a/instrumentation/events/lttng-module/kvm.h ++++ b/instrumentation/events/lttng-module/kvm.h +@@ -112,6 +112,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio, || LTTNG_KERNEL_RANGE(3,2,97, 3,3,0) \ || LTTNG_UBUNTU_KERNEL_RANGE(4,13,16,38, 4,14,0,0) \ || LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,0,3,0, 4,10,0,0,0,0) \ @@ -247,3 +231,15 @@ || LTTNG_FEDORA_KERNEL_RANGE(4,14,13,300, 4,15,0,0)) LTTNG_TRACEPOINT_EVENT(kvm_mmio, +--- a/instrumentation/events/lttng-module/mm_vmscan.h ++++ b/instrumentation/events/lttng-module/mm_vmscan.h +@@ -94,7 +94,8 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_kswapd_ + + #endif + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0) \ ++ || LTTNG_KERNEL_RANGE(4,12,0, 4,13,0)) /* openSUSE */ + LTTNG_TRACEPOINT_EVENT(mm_vmscan_wakeup_kswapd, + + TP_PROTO(int nid, int zid, int order, gfp_t gfp_flags), ++++++ lttng-modules-preamble ++++++ --- /var/tmp/diff_new_pack.5Rko5w/_old 2020-02-29 21:24:17.734490505 +0100 +++ /var/tmp/diff_new_pack.5Rko5w/_new 2020-02-29 21:24:17.734490505 +0100 @@ -1,3 +1,3 @@ -Requires: kernel-%1 -Requires: lttng-modules -Enhances: kernel-%1 +Requires: kernel-%1 +Enhances: kernel-%1 +Supplements: (kernel-%1 and %name)
