[PATCH] lttng-modules: Make it build when CONFIG_TRACEPOINTS is not enabled again

[PATCH] lttng-modules: Make it build when CONFIG_TRACEPOINTS is not enabled again

[Peter Kjellerstedt]

Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch was updated
with the 2.13.0 update (commit 5dad15af), but unfortunately it no longer
did what it was intended to do.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 ...fail-if-CONFIG_TRACEPOINTS-is-not-en.patch | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch b/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch
index a852834344..4fb55270f5 100644
--- a/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch
@@ -1,8 +1,7 @@
-From 1b0e574d680101105a6c1e8931c78824f5a97a42 Mon Sep 17 00:00:00 2001
+From 885926e62f32a29b185dcfe738e61a2358a6b615 Mon Sep 17 00:00:00 2001
 From: Otavio Salvador <otavio@ossystems.com.br>
 Date: Mon, 5 Sep 2016 17:08:56 +0000
 Subject: [PATCH] Makefile: Do not fail if CONFIG_TRACEPOINTS is not enabled
-Organization: O.S. Systems Software LTDA.
 
 The lttng-modules are being pulled by the tools-profile image feature,
 however, not every kernel has the CONFIG_TRACEPOINTS feature enabled.
@@ -16,22 +15,31 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
 [bva: modified for lttng-modules 2.13+ context]
 Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
 ---
- Makefile | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
+ src/Kbuild | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
-Index: lttng-modules-2.13.0/Makefile
-===================================================================
---- lttng-modules-2.13.0.orig/Makefile
-+++ lttng-modules-2.13.0/Makefile
-@@ -7,6 +7,11 @@
+diff --git a/src/Kbuild b/src/Kbuild
+index 7137874..04eb5c9 100644
+--- a/src/Kbuild
++++ b/src/Kbuild
+@@ -2,10 +2,13 @@
  
- obj-$(CONFIG_LTTNG) += src/
+ ifdef CONFIG_LOCALVERSION	# 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)
++    DISABLE_MODULE = y
+   endif # CONFIG_TRACEPOINTS
+ endif # ifdef CONFIG_LOCALVERSION
  
-+  ifdef CONFIG_LOCALVERSION	# Check if dot-config is included.
-+    ifneq ($(CONFIG_TRACEPOINTS),)
-+      $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
-+    endif # CONFIG_TRACEPOINTS
-+  endif # ifdef CONFIG_LOCALVERSION
- else # KERNELRELEASE
++ifneq ($(DISABLE_MODULE),y)
++
+ TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/..
  
- # This part of the Makefile is used when the 'make' command is runned in the
+ lttng_check_linux_version = $(shell pwd)/include/linux/version.h
+@@ -150,3 +153,5 @@ lttng-statedump-objs := lttng-statedump-impl.o
+ obj-$(CONFIG_LTTNG) += probes/
+ obj-$(CONFIG_LTTNG) += lib/
+ obj-$(CONFIG_LTTNG) += tests/
++
++endif # DISABLE_MODULE

Re: [OE-core] [PATCH] lttng-modules: Make it build when CONFIG_TRACEPOINTS is not enabled again

[Andrey Zhizhikin]

Hello Peter,

On Wed, Aug 25, 2021 at 11:41 AM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch was updated
> with the 2.13.0 update (commit 5dad15af), but unfortunately it no longer
> did what it was intended to do.
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> ---
>  ...fail-if-CONFIG_TRACEPOINTS-is-not-en.patch | 42 +++++++++++--------
>  1 file changed, 25 insertions(+), 17 deletions(-)
>
> diff --git a/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch b/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch

I guess the patch you've refreshed is not a correct one...

There is another patch introduced by Bruce in the commit 18bf7b0
("lttng-modules: update devupstream to v2.13-rc "), namely
0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch

It make sense to refresh rather that one instead of the Makefile one,
and have it included in the SRC_URI (see discussion in
https://lists.openembedded.org/g/openembedded-core/topic/84950303#154888).

--
Regards,
Andrey.

Re: [OE-core] [PATCH] lttng-modules: Make it build when CONFIG_TRACEPOINTS is not enabled again

[Peter Kjellerstedt]

> -----Original Message-----
> From: Andrey Zhizhikin <andrey.z@gmail.com>
> Sent: den 25 augusti 2021 12:20
> To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> Cc: Bruce Ashfield <bruce.ashfield@gmail.com>; OE Core mailing list
> <openembedded-core@lists.openembedded.org>
> Subject: Re: [OE-core] [PATCH] lttng-modules: Make it build when
> CONFIG_TRACEPOINTS is not enabled again
> 
> Hello Peter,
> 
> On Wed, Aug 25, 2021 at 11:41 AM Peter Kjellerstedt
> <peter.kjellerstedt@axis.com> wrote:
> >
> > Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch was updated
> > with the 2.13.0 update (commit 5dad15af), but unfortunately it no longer
> > did what it was intended to do.
> >
> > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > ---
> >  ...fail-if-CONFIG_TRACEPOINTS-is-not-en.patch | 42 +++++++++++--------
> >  1 file changed, 25 insertions(+), 17 deletions(-)
> >
> > diff --git a/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-
> fail-if-CONFIG_TRACEPOINTS-is-not-en.patch b/meta/recipes-
> kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-
> not-en.patch
> 
> I guess the patch you've refreshed is not a correct one...
> 
> There is another patch introduced by Bruce in the commit 18bf7b0
> ("lttng-modules: update devupstream to v2.13-rc "), namely
> 0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
> 
> It make sense to refresh rather that one instead of the Makefile one,
> and have it included in the SRC_URI (see discussion in
> https://lists.openembedded.org/g/openembedded-core/topic/84950303#154888).
> 
> --
> Regards,
> Andrey.

Right, I had missed that there were two patches doing the same thing 
(though neither actually solved the problem after the update to 2.13.0).
I will send an updated review unifying the patches and adding my solution 
to disable building the module when CONFIG_TRACEPOINTS is not enabled.

//Peter

Re: [OE-core] [PATCH] lttng-modules: Make it build when CONFIG_TRACEPOINTS is not enabled again

[Bruce Ashfield]

On Wed, Aug 25, 2021 at 8:57 AM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> > -----Original Message-----
> > From: Andrey Zhizhikin <andrey.z@gmail.com>
> > Sent: den 25 augusti 2021 12:20
> > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > Cc: Bruce Ashfield <bruce.ashfield@gmail.com>; OE Core mailing list
> > <openembedded-core@lists.openembedded.org>
> > Subject: Re: [OE-core] [PATCH] lttng-modules: Make it build when
> > CONFIG_TRACEPOINTS is not enabled again
> >
> > Hello Peter,
> >
> > On Wed, Aug 25, 2021 at 11:41 AM Peter Kjellerstedt
> > <peter.kjellerstedt@axis.com> wrote:
> > >
> > > Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch was updated
> > > with the 2.13.0 update (commit 5dad15af), but unfortunately it no longer
> > > did what it was intended to do.
> > >
> > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > > ---
> > >  ...fail-if-CONFIG_TRACEPOINTS-is-not-en.patch | 42 +++++++++++--------
> > >  1 file changed, 25 insertions(+), 17 deletions(-)
> > >
> > > diff --git a/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-
> > fail-if-CONFIG_TRACEPOINTS-is-not-en.patch b/meta/recipes-
> > kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-
> > not-en.patch
> >
> > I guess the patch you've refreshed is not a correct one...
> >
> > There is another patch introduced by Bruce in the commit 18bf7b0
> > ("lttng-modules: update devupstream to v2.13-rc "), namely
> > 0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
> >
> > It make sense to refresh rather that one instead of the Makefile one,
> > and have it included in the SRC_URI (see discussion in
> > https://lists.openembedded.org/g/openembedded-core/topic/84950303#154888).
> >
> > --
> > Regards,
> > Andrey.
>
> Right, I had missed that there were two patches doing the same thing
> (though neither actually solved the problem after the update to 2.13.0).
> I will send an updated review unifying the patches and adding my solution
> to disable building the module when CONFIG_TRACEPOINTS is not enabled.
>

We really should stop dragging these patches along at all.

I have a unified set of patches here as well, but continuing to allow
lttng modules to build in configurations like these, just doesn't make
sense (which is why I haven't sent them).

We should have a distro feature, and simply drop it from package lists
when appropriate.

Bruce

> //Peter
>


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

Re: [OE-core] [PATCH] lttng-modules: Make it build when CONFIG_TRACEPOINTS is not enabled again

[Peter Kjellerstedt]

> -----Original Message-----
> From: Bruce Ashfield <bruce.ashfield@gmail.com>
> Sent: den 25 augusti 2021 15:18
> To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> Cc: Andrey Zhizhikin <andrey.z@gmail.com>; OE Core mailing list
> <openembedded-core@lists.openembedded.org>
> Subject: Re: [OE-core] [PATCH] lttng-modules: Make it build when
> CONFIG_TRACEPOINTS is not enabled again
> 
> On Wed, Aug 25, 2021 at 8:57 AM Peter Kjellerstedt
> <peter.kjellerstedt@axis.com> wrote:
> >
> > > -----Original Message-----
> > > From: Andrey Zhizhikin <andrey.z@gmail.com>
> > > Sent: den 25 augusti 2021 12:20
> > > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > > Cc: Bruce Ashfield <bruce.ashfield@gmail.com>; OE Core mailing list
> > > <openembedded-core@lists.openembedded.org>
> > > Subject: Re: [OE-core] [PATCH] lttng-modules: Make it build when
> > > CONFIG_TRACEPOINTS is not enabled again
> > >
> > > Hello Peter,
> > >
> > > On Wed, Aug 25, 2021 at 11:41 AM Peter Kjellerstedt
> > > <peter.kjellerstedt@axis.com> wrote:
> > > >
> > > > Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch was
> updated
> > > > with the 2.13.0 update (commit 5dad15af), but unfortunately it no
> longer
> > > > did what it was intended to do.
> > > >
> > > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > > > ---
> > > >  ...fail-if-CONFIG_TRACEPOINTS-is-not-en.patch | 42 +++++++++++-----
> ---
> > > >  1 file changed, 25 insertions(+), 17 deletions(-)
> > > >
> > > > diff --git a/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-
> not-
> > > fail-if-CONFIG_TRACEPOINTS-is-not-en.patch b/meta/recipes-
> > > kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-
> is-
> > > not-en.patch
> > >
> > > I guess the patch you've refreshed is not a correct one...
> > >
> > > There is another patch introduced by Bruce in the commit 18bf7b0
> > > ("lttng-modules: update devupstream to v2.13-rc "), namely
> > > 0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
> > >
> > > It make sense to refresh rather that one instead of the Makefile one,
> > > and have it included in the SRC_URI (see discussion in
> > > https://lists.openembedded.org/g/openembedded-
> core/topic/84950303#154888).
> > >
> > > --
> > > Regards,
> > > Andrey.
> >
> > Right, I had missed that there were two patches doing the same thing
> > (though neither actually solved the problem after the update to 2.13.0).
> > I will send an updated review unifying the patches and adding my
> solution
> > to disable building the module when CONFIG_TRACEPOINTS is not enabled.
> >
> 
> We really should stop dragging these patches along at all.
> 
> I have a unified set of patches here as well, but continuing to allow
> lttng modules to build in configurations like these, just doesn't make
> sense (which is why I haven't sent them).
> 
> We should have a distro feature, and simply drop it from package lists
> when appropriate.
> 
> Bruce
> 
> > //Peter

I know nothing about lttng myself, but has passed on your concerns to our 
maintainer for the functionality. Unfortunately he is on vacation for a 
couple of weeks more, so I do not know when I can expect an answer from 
him.

So for now I hope we can update the recipe per my patches so that it 
continues to work as before, and then we can take the discussion of 
whether it should be possible to build lttng-modules without 
CONFIG_TRACEPOINTS enabled separately.

//Peter

Re: [OE-core] [PATCH] lttng-modules: Make it build when CONFIG_TRACEPOINTS is not enabled again

[Bruce Ashfield]

On Wed, Aug 25, 2021 at 9:40 AM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> > -----Original Message-----
> > From: Bruce Ashfield <bruce.ashfield@gmail.com>
> > Sent: den 25 augusti 2021 15:18
> > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > Cc: Andrey Zhizhikin <andrey.z@gmail.com>; OE Core mailing list
> > <openembedded-core@lists.openembedded.org>
> > Subject: Re: [OE-core] [PATCH] lttng-modules: Make it build when
> > CONFIG_TRACEPOINTS is not enabled again
> >
> > On Wed, Aug 25, 2021 at 8:57 AM Peter Kjellerstedt
> > <peter.kjellerstedt@axis.com> wrote:
> > >
> > > > -----Original Message-----
> > > > From: Andrey Zhizhikin <andrey.z@gmail.com>
> > > > Sent: den 25 augusti 2021 12:20
> > > > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > > > Cc: Bruce Ashfield <bruce.ashfield@gmail.com>; OE Core mailing list
> > > > <openembedded-core@lists.openembedded.org>
> > > > Subject: Re: [OE-core] [PATCH] lttng-modules: Make it build when
> > > > CONFIG_TRACEPOINTS is not enabled again
> > > >
> > > > Hello Peter,
> > > >
> > > > On Wed, Aug 25, 2021 at 11:41 AM Peter Kjellerstedt
> > > > <peter.kjellerstedt@axis.com> wrote:
> > > > >
> > > > > Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch was
> > updated
> > > > > with the 2.13.0 update (commit 5dad15af), but unfortunately it no
> > longer
> > > > > did what it was intended to do.
> > > > >
> > > > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > > > > ---
> > > > >  ...fail-if-CONFIG_TRACEPOINTS-is-not-en.patch | 42 +++++++++++-----
> > ---
> > > > >  1 file changed, 25 insertions(+), 17 deletions(-)
> > > > >
> > > > > diff --git a/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-
> > not-
> > > > fail-if-CONFIG_TRACEPOINTS-is-not-en.patch b/meta/recipes-
> > > > kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-
> > is-
> > > > not-en.patch
> > > >
> > > > I guess the patch you've refreshed is not a correct one...
> > > >
> > > > There is another patch introduced by Bruce in the commit 18bf7b0
> > > > ("lttng-modules: update devupstream to v2.13-rc "), namely
> > > > 0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
> > > >
> > > > It make sense to refresh rather that one instead of the Makefile one,
> > > > and have it included in the SRC_URI (see discussion in
> > > > https://lists.openembedded.org/g/openembedded-
> > core/topic/84950303#154888).
> > > >
> > > > --
> > > > Regards,
> > > > Andrey.
> > >
> > > Right, I had missed that there were two patches doing the same thing
> > > (though neither actually solved the problem after the update to 2.13.0).
> > > I will send an updated review unifying the patches and adding my
> > solution
> > > to disable building the module when CONFIG_TRACEPOINTS is not enabled.
> > >
> >
> > We really should stop dragging these patches along at all.
> >
> > I have a unified set of patches here as well, but continuing to allow
> > lttng modules to build in configurations like these, just doesn't make
> > sense (which is why I haven't sent them).
> >
> > We should have a distro feature, and simply drop it from package lists
> > when appropriate.
> >
> > Bruce
> >
> > > //Peter
>
> I know nothing about lttng myself, but has passed on your concerns to our
> maintainer for the functionality. Unfortunately he is on vacation for a
> couple of weeks more, so I do not know when I can expect an answer from
> him.
>

No worries.

> So for now I hope we can update the recipe per my patches so that it
> continues to work as before, and then we can take the discussion of
> whether it should be possible to build lttng-modules without
> CONFIG_TRACEPOINTS enabled separately.

Agreed.

I've chucked my patches that fixed the build here as well, since they
were very similar to yours.

I'll continue creating a dummy package / distro feature option here,
since pulling those patches along is a particular pain point for me, as
I continually hit lttng issues as I work through new kernels :D

Bruce

>
> //Peter
>


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