lttng-modules: Fix CONFIG_TRACEPOINTS patch

The check for CONFIG_TRACEPOINTS is guarded by a check for
CONFIG_LOCALVERSION.  But what happens if your .config has
CONFIG_LOCALVERSION="" ?  Then the check never runs and you try and
build the module even though CONFIG_TRACEPOINTS is missing.

Update the guard to check for either CONFIG_LOCALVERSION or
CONFIG_LOCALVERSION_AUTO.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
index 1854d9a944cd94fb214bd055b74869843a887001..a47b5b97891e48bc57af593a4e36df91f627bf29 100644 (file)
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
@@ -16,8 +16,8 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
 ---
- src/Kbuild | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ src/Kbuild | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
 
 Index: lttng-modules-2.14.0/src/Kbuild
 ===================================================================
@@ -25,7 +25,8 @@ Index: lttng-modules-2.14.0/src/Kbuild
 +++ lttng-modules-2.14.0/src/Kbuild
 @@ -3,10 +3,13 @@
  
- ifdef CONFIG_LOCALVERSION     # Check if dot-config is included.
+-ifdef CONFIG_LOCALVERSION     # Check if dot-config is included.
++ifneq ($(CONFIG_LOCALVERSION)$(CONFIG_LOCALVERSION_AUTO),)    # Check if dot-config is included.
    ifeq ($(CONFIG_TRACEPOINTS),)
 -    $(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
 +    $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)