- up to 2.13.0-rc1

[packages/lttng-modules.git] / build.patch

diff --git a/build.patch b/build.patch
index 663b9dccb0b31e39598c56daf9802301a2099c35..4934dd3e6dfae5a2d92e40deaa2ff7c348a7952e 100644 (file)
--- 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