Skip to contentSkip to conversation

lttng-modules: Fix CONFIG_TRACEPOINTS patch

PATCH In review Ryan Eatmon 3 participants 4 messages Jan 23 – Jan 24

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 ...-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch +4 -3
index 1854d9a944..a47b5b9789 100644
@@ -16,8 +16,8 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Bruce Ashfield <[email protected]>
 ---
- 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)
Signature · 1 line
2.43.0
#1 lore raw
Quoted 40 lines · Ryan Eatmon via lists.openembedded.org

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.

---
 ...-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 1854d9a944..a47b5b9789 100644
---
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

meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch +4 -3
@@ -16,8 +16,8 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Bruce Ashfield <[email protected]>
 ---
- 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.

Quoted 6 lines
    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)

Why is this changing to a warning ?

You have no mention of it in the changelog. Although the check wasn't working, the intention of making this an error is still the same.

Bruce

Quoted 15 lines

--
2.43.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#229916):
https://lists.openembedded.org/g/openembedded-core/message/229916
Mute This Topic: https://lists.openembedded.org/mt/117427953/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
#2 lore raw
Quoted 44 lines · Bruce Ashfield via lists.openembedded.org

On Fri, Jan 23, 2026 at 6:08 PM Ryan Eatmon via lists.openembedded.org <http://lists.openembedded.org> <[email protected] <mailto:[email protected]>> wrote:

    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 <[email protected] <mailto:[email protected]>>
    ---
      ...-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch | 7 ++++---
      1 file changed, 4 insertions(+), 3 deletions(-)

    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 1854d9a944..a47b5b9789 100644
    --- 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 <[email protected] <mailto:[email protected]>>
      ---
    - 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)
Quoted 2 lines

Why is this changing to a warning ?

It isn't, this is a patch for a patch, these diff change lines are already part of the patch from before.

https://git.openembedded.org/openembedded-core/commit/?id=6215ffec6a3d5069cc74ae9853167c3c6395b1db

Andrew

Quoted 27 lines

You have no mention of it in the changelog. Although the check wasn't working, the intention of making this an error is still the same.

Bruce

    -- 
    2.43.0
Signature · 12 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#229917): https://lists.openembedded.org/g/openembedded-core/message/229917
Mute This Topic: https://lists.openembedded.org/mt/117427953/3619733
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
#3 lore raw
Quoted 56 lines · Andrew Davis
Quoted 3 lines · Bruce Ashfield via lists.openembedded.org

On Fri, Jan 23, 2026 at 6:08 PM Ryan Eatmon via lists.openembedded.org <

http://lists.openembedded.org> <[email protected]

Quoted 6 lines · <mailto:[email protected]>> wrote:

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.

Quoted 6 lines

Update the guard to check for either CONFIG_LOCALVERSION or CONFIG_LOCALVERSION_AUTO.

Signed-off-by Ryan Eatmon <[email protected] <mailto:[email protected]>>

---
...-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch | 7

++++---

Quoted 3 lines
      1 file changed, 4 insertions(+), 3 deletions(-)
    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

Quoted 2 lines
    index 1854d9a944..a47b5b9789 100644
    ---

a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch

Quoted 1 line
    +++

b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch

Quoted 3 lines

@@ -16,8 +16,8 @@ Upstream-Status: Inappropriate [embedded specific]

[email protected]>>

Quoted 7 lines
      ---
    - 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
Quoted 8 lines
      ===================================================================
    @@ -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.

Quoted 2 lines

ifeq ($(CONFIG_TRACEPOINTS),)
- $(error The option CONFIG_TRACEPOINTS needs to be enabled in

your kernel configuration)

Quoted 1 line

+ $(warning The option CONFIG_TRACEPOINTS needs to be enabled

in your kernel configuration)

Quoted 2 lines
Quoted 8 lines
Quoted 2 lines

Why is this changing to a warning ?

It isn't, this is a patch for a patch, these diff change lines are already part of
the patch from before.

Right!

It is even my patch :)

Bruce

Quoted 37 lines

https://git.openembedded.org/openembedded-core/commit/?id=6215ffec6a3d5069cc74ae9853167c3c6395b1db

Andrew

Quoted 13 lines

You have no mention of it in the changelog. Although the check wasn't working, the intention of making this an error is still the same.

Bruce

    --
    2.43.0
Quoted 2 lines

--
- Thou shalt not follow the NULL pointer, for chaos and madness await

thee at its end

Quoted 7 lines

- "Use the force Harry" - Gandalf, Star Trek II

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#229917):

https://lists.openembedded.org/g/openembedded-core/message/229917

Quoted 3 lines

Mute This Topic: https://lists.openembedded.org/mt/117427953/3619733
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [

[email protected]]

Quoted 2 lines

-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II