From 417a627d9d35ea0fba03bf87aef3459076524fde Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 3 May 2021 23:05:05 +0200 Subject: [PATCH] - up to 2.13.0-rc1 --- build.patch | 42 +++++++++++++++++++++--------------------- lttng-modules.spec | 18 +++++++++++------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/build.patch b/build.patch index 663b9dc..4934dd3 100644 --- a/build.patch +++ b/build.patch @@ -1,29 +1,29 @@ ---- lttng-modules-2.6.3/Makefile.orig 2015-09-14 20:30:29.749794009 +0200 -+++ lttng-modules-2.6.3/Makefile 2015-09-14 20:31:10.693125624 +0200 +--- lttng-modules-2.13.0-rc1/src/Kbuild~ 2021-04-24 03:13:26.000000000 +0200 ++++ lttng-modules-2.13.0-rc1/src/Kbuild 2021-05-03 22:55:50.925432956 +0200 @@ -8,19 +8,19 @@ - TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST))) + TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/.. -- lttng_check_linux_version = $(shell pwd)/include/linux/version.h -- lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h -+# lttng_check_linux_version = $(shell pwd)/include/linux/version.h -+# lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h +-lttng_check_linux_version = $(shell pwd)/include/linux/version.h +-lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h ++#lttng_check_linux_version = $(shell pwd)/include/linux/version.h ++#lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h - # - # Check for stale version.h, which can be a leftover from an old Linux - # kernel tree moved to a newer kernel version, only pruned by make - # distclean. - # -- ifneq ($(wildcard $(lttng_check_linux_version)),) -- ifneq ($(wildcard $(lttng_check_generated_linux_version)),) -- $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file) -- endif + # + # Check for stale version.h, which can be a leftover from an old Linux + # kernel tree moved to a newer kernel version, only pruned by make + # distclean. + # +-ifneq ($(wildcard $(lttng_check_linux_version)),) +- ifneq ($(wildcard $(lttng_check_generated_linux_version)),) +- $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file) - endif -+# ifneq ($(wildcard $(lttng_check_linux_version)),) -+# ifneq ($(wildcard $(lttng_check_generated_linux_version)),) -+# $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file) -+# endif +-endif ++#ifneq ($(wildcard $(lttng_check_linux_version)),) ++# ifneq ($(wildcard $(lttng_check_generated_linux_version)),) ++# $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file) +# endif ++#endif - include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common + include $(TOP_LTTNG_MODULES_DIR)/src/Kbuild.common diff --git a/lttng-modules.spec b/lttng-modules.spec index 17f994c..5bd3675 100644 --- a/lttng-modules.spec +++ b/lttng-modules.spec @@ -6,17 +6,18 @@ # nothing to be placed to debuginfo package %define _enable_debug_packages 0 +%define pre rc1 %define rel 1 %define pname lttng-modules Summary: LTTng 2.x kernel modules Summary(pl.UTF-8): Moduły jądra LTTng 2.x Name: %{pname}%{_alt_kernel} -Version: 2.12.5 +Version: 2.13.0 Release: %{rel}@%{_kernel_ver_str} License: GPL v2 Group: Base/Kernel -Source0: https://lttng.org/files/lttng-modules/%{pname}-%{version}.tar.bz2 -# Source0-md5: 675dceb2e097c972d6f86a73ba60cf70 +Source0: https://lttng.org/files/lttng-modules/%{pname}-%{version}-%{pre}.tar.bz2 +# Source0-md5: 487c988fdb10146ca772baf908683980 Patch0: build.patch URL: https://lttng.org/ %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:3.0} @@ -48,14 +49,17 @@ Moduły LTTng 2.x dla jądra Linuksa.\ \ %files -n kernel%{_alt_kernel}-lttng\ %defattr(644,root,root,755)\ -%doc %{pname}-%{version}/{ChangeLog,LICENSE,README.md,TODO}\ +%doc %{pname}-%{version}-%{pre}/{ChangeLog,LICENSE,README.md}\ %dir /lib/modules/%{_kernel_ver}/kernel/lttng\ /lib/modules/%{_kernel_ver}/kernel/lttng/lttng-clock.ko*\ +/lib/modules/%{_kernel_ver}/kernel/lttng/lttng-counter-client-percpu-32-modular.ko.*\ +/lib/modules/%{_kernel_ver}/kernel/lttng/lttng-counter-client-percpu-64-modular.ko.*\ /lib/modules/%{_kernel_ver}/kernel/lttng/lttng-ring-buffer-*.ko*\ /lib/modules/%{_kernel_ver}/kernel/lttng/lttng-statedump.ko*\ /lib/modules/%{_kernel_ver}/kernel/lttng/lttng-tracer.ko*\ /lib/modules/%{_kernel_ver}/kernel/lttng/lttng-wrapper.ko*\ %dir /lib/modules/%{_kernel_ver}/kernel/lttng/lib\ +/lib/modules/%{_kernel_ver}/kernel/lttng/lib/lttng-counter.ko.*\ /lib/modules/%{_kernel_ver}/kernel/lttng/lib/lttng-lib-ring-buffer.ko*\ %dir /lib/modules/%{_kernel_ver}/kernel/lttng/probes\ /lib/modules/%{_kernel_ver}/kernel/lttng/probes/lttng-kprobes.ko*\ @@ -88,12 +92,12 @@ p=`pwd`\ %{expand:%create_kernel_packages} %prep -%setup -qc -cd %{pname}-%{version} +%setup -qc -n %{name}-%{version} +cd %{pname}-%{version}-%{pre} %patch0 -p1 %build -cd %{pname}-%{version} +cd %{pname}-%{version}-%{pre} %{expand:%build_kernel_packages} %install -- 2.43.0