| Message ID | 20260123230820.289540-1-reatmon@ti.com |
|---|---|
| State | Accepted, archived |
| Commit | 5114cae0a54efb8af0d0c0be10f99e4fcc7d09a6 |
| Headers | show |
| Series | lttng-modules: Fix CONFIG_TRACEPOINTS patch | expand |
On Fri, Jan 23, 2026 at 6:08 PM Ryan Eatmon via lists.openembedded.org <reatmon=ti.com@lists.openembedded.org> 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 <reatmon@ti.com> > --- > ...-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 <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) > 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 > -- > 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: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > bruce.ashfield@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
On 1/23/26 5:55 PM, Bruce Ashfield via lists.openembedded.org wrote: > > > On Fri, Jan 23, 2026 at 6:08 PM Ryan Eatmon via lists.openembedded.org <http://lists.openembedded.org> <reatmon=ti.com@lists.openembedded.org <mailto:ti.com@lists.openembedded.org>> 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 <reatmon@ti.com <mailto:reatmon@ti.com>> > --- > ...-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 <bruce.ashfield@gmail.com <mailto: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) > > > 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 > 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 > > > > > > > -- > - 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: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [afd@ti.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Sat, Jan 24, 2026 at 1:21 PM Andrew Davis <afd@ti.com> wrote: > On 1/23/26 5:55 PM, Bruce Ashfield via lists.openembedded.org wrote: > > > > > > On Fri, Jan 23, 2026 at 6:08 PM Ryan Eatmon via lists.openembedded.org < > http://lists.openembedded.org> <reatmon=ti.com@lists.openembedded.org > <mailto:ti.com@lists.openembedded.org>> 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 <reatmon@ti.com <mailto:reatmon@ti.com>> > > --- > > ...-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 <bruce.ashfield@gmail.com <mailto: > 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) > > > > > > 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 > > https://git.openembedded.org/openembedded-core/commit/?id=6215ffec6a3d5069cc74ae9853167c3c6395b1db > > Andrew > > > 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 > > > > > > > > > > > > > > -- > > - 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: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > afd@ti.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > > >
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 <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)
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> --- ...-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)