projects / packages / lttng-modules.git / blame
| Commit | Line | Data |
|---|---|---|
| 417a627d JR |
1 | --- lttng-modules-2.13.0-rc1/src/Kbuild~ 2021-04-24 03:13:26.000000000 +0200 |
| 2 | +++ lttng-modules-2.13.0-rc1/src/Kbuild 2021-05-03 22:55:50.925432956 +0200 | |
| 11a6b978 | 3 | @@ -8,19 +8,19 @@ |
| 7528c1a9 | 4 | |
| 417a627d | 5 | TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/.. |
| b5a5bc4f | 6 | |
| 417a627d JR |
7 | -lttng_check_linux_version = $(shell pwd)/include/linux/version.h |
| 8 | -lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h | |
| 9 | +#lttng_check_linux_version = $(shell pwd)/include/linux/version.h | |
| 10 | +#lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h | |
| b5a5bc4f | 11 | |
| 417a627d JR |
12 | # |
| 13 | # Check for stale version.h, which can be a leftover from an old Linux | |
| 14 | # kernel tree moved to a newer kernel version, only pruned by make | |
| 15 | # distclean. | |
| 16 | # | |
| 17 | -ifneq ($(wildcard $(lttng_check_linux_version)),) | |
| 18 | - ifneq ($(wildcard $(lttng_check_generated_linux_version)),) | |
| 19 | - $(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) | |
| 11a6b978 | 20 | - endif |
| 417a627d JR |
21 | -endif |
| 22 | +#ifneq ($(wildcard $(lttng_check_linux_version)),) | |
| 23 | +# ifneq ($(wildcard $(lttng_check_generated_linux_version)),) | |
| 24 | +# $(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) | |
| 11a6b978 | 25 | +# endif |
| 417a627d | 26 | +#endif |
| 7528c1a9 | 27 | |
| 417a627d | 28 | include $(TOP_LTTNG_MODULES_DIR)/src/Kbuild.common |
| b5a5bc4f | 29 |