[PATCH 1/2] bitbake.conf: Log events by default using BB_DEFAULT_EVENTLOG

[PATCH 1/2] bitbake.conf: Log events by default using BB_DEFAULT_EVENTLOG

[Richard Purdie]

By setting this, event data from during the build is saved out. This can
be used for analytic including toaster to allow builds to be examined
later. This will use some disk space but it is worth it for the ability
to look into what happened during the build. Users can set the value to
something else in local.conf to override if they wish.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/bitbake.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 67ff7690463..12292714d2f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -934,6 +934,7 @@ BB_DEFAULT_UMASK ??= "022"
 
 # Complete output from bitbake
 BB_CONSOLELOG ?= "${LOG_DIR}/cooker/${MACHINE}/${DATETIME}.log"
+BB_DEFAULT_EVENTLOG ?= "${LOG_DIR}/eventlog/${DATETIME}.json"
 
 # Setup our default hash policy
 BB_SIGNATURE_HANDLER ?= "OEBasicHash"
-- 
2.39.2

[PATCH 2/2] bitbake.conf: Drop oldincludedir

[Richard Purdie]

Autoconf defines this as:

"The directory for installing C header files for non-GCC compilers."

Whilst this is something autoconf does allow changing, I find it hard
to believe it has much use in the wild now and that headers don't get
split like this in reality, it would probably only be useful on really
old unixes.. The values are the same in our configuration anyway.

Drop the value and just use includedir everywhere.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes-recipe/autotools.bbclass  | 2 +-
 meta/conf/bitbake.conf                 | 1 -
 meta/files/fs-perms-persistent-log.txt | 1 -
 meta/files/fs-perms.txt                | 1 -
 meta/lib/oe/package.py                 | 3 +--
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass
index 5ed21a3d684..1663307b061 100644
--- a/meta/classes-recipe/autotools.bbclass
+++ b/meta/classes-recipe/autotools.bbclass
@@ -76,7 +76,7 @@ CONFIGUREOPTS = " --build=${BUILD_SYS} \
 		  --localstatedir=${localstatedir} \
 		  --libdir=${libdir} \
 		  --includedir=${includedir} \
-		  --oldincludedir=${oldincludedir} \
+		  --oldincludedir=${includedir} \
 		  --infodir=${infodir} \
 		  --mandir=${mandir} \
 		  --disable-silent-rules \
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 12292714d2f..500f0112742 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -46,7 +46,6 @@ export sbindir = "${exec_prefix}/sbin"
 export libdir = "${exec_prefix}/${baselib}"
 export libexecdir = "${exec_prefix}/libexec"
 export includedir = "${exec_prefix}/include"
-export oldincludedir = "${exec_prefix}/include"
 localedir = "${libdir}/locale"
 
 # Linkage between native/cross/nativesdk layouts
diff --git a/meta/files/fs-perms-persistent-log.txt b/meta/files/fs-perms-persistent-log.txt
index 518c1be3c93..61f0a6e26a1 100644
--- a/meta/files/fs-perms-persistent-log.txt
+++ b/meta/files/fs-perms-persistent-log.txt
@@ -38,7 +38,6 @@ ${datadir}/locale	0755	root	root	true	0644	root	root
 
 # Cleanup headers
 ${includedir}		0755	root	root	true	0644	root	root
-${oldincludedir}	0755	root	root	true	0644	root	root
 
 # Cleanup debug src
 /usr/src/debug		0755	root	root	true	0644	root	root
diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt
index daa4aed840f..48191f504ce 100644
--- a/meta/files/fs-perms.txt
+++ b/meta/files/fs-perms.txt
@@ -38,7 +38,6 @@ ${datadir}/locale	0755	root	root	true	0644	root	root
 
 # Cleanup headers
 ${includedir}		0755	root	root	true	0644	root	root
-${oldincludedir}	0755	root	root	true	0644	root	root
 
 # Cleanup debug src
 /usr/src/debug		0755	root	root	true	0644	root	root
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 1dd20f85ebd..f69bf9c353c 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -456,8 +456,7 @@ def fixup_perms(d):
                 'sbindir',
                 'libexecdir',
                 'libdir',
-                'includedir',
-                'oldincludedir' ]
+                'includedir' ]
 
     for path in target_path_vars:
         dir = d.getVar(path) or ""
-- 
2.39.2

Re: [OE-core] [PATCH 2/2] bitbake.conf: Drop oldincludedir

[Khem Raj]

On Thu, Nov 16, 2023 at 8:53 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> Autoconf defines this as:
>
> "The directory for installing C header files for non-GCC compilers."
>
> Whilst this is something autoconf does allow changing, I find it hard
> to believe it has much use in the wild now and that headers don't get
> split like this in reality, it would probably only be useful on really
> old unixes.. The values are the same in our configuration anyway.
>
> Drop the value and just use includedir everywhere.

Maybe alias it to includedir instead. Since some makefiles may assume
a default value in its absence
which might change the install behavior. It does not matter much on
native builds but for cross builds it might.

>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/classes-recipe/autotools.bbclass  | 2 +-
>  meta/conf/bitbake.conf                 | 1 -
>  meta/files/fs-perms-persistent-log.txt | 1 -
>  meta/files/fs-perms.txt                | 1 -
>  meta/lib/oe/package.py                 | 3 +--
>  5 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass
> index 5ed21a3d684..1663307b061 100644
> --- a/meta/classes-recipe/autotools.bbclass
> +++ b/meta/classes-recipe/autotools.bbclass
> @@ -76,7 +76,7 @@ CONFIGUREOPTS = " --build=${BUILD_SYS} \
>                   --localstatedir=${localstatedir} \
>                   --libdir=${libdir} \
>                   --includedir=${includedir} \
> -                 --oldincludedir=${oldincludedir} \
> +                 --oldincludedir=${includedir} \
>                   --infodir=${infodir} \
>                   --mandir=${mandir} \
>                   --disable-silent-rules \
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 12292714d2f..500f0112742 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -46,7 +46,6 @@ export sbindir = "${exec_prefix}/sbin"
>  export libdir = "${exec_prefix}/${baselib}"
>  export libexecdir = "${exec_prefix}/libexec"
>  export includedir = "${exec_prefix}/include"
> -export oldincludedir = "${exec_prefix}/include"
>  localedir = "${libdir}/locale"
>
>  # Linkage between native/cross/nativesdk layouts
> diff --git a/meta/files/fs-perms-persistent-log.txt b/meta/files/fs-perms-persistent-log.txt
> index 518c1be3c93..61f0a6e26a1 100644
> --- a/meta/files/fs-perms-persistent-log.txt
> +++ b/meta/files/fs-perms-persistent-log.txt
> @@ -38,7 +38,6 @@ ${datadir}/locale     0755    root    root    true    0644    root    root
>
>  # Cleanup headers
>  ${includedir}          0755    root    root    true    0644    root    root
> -${oldincludedir}       0755    root    root    true    0644    root    root
>
>  # Cleanup debug src
>  /usr/src/debug         0755    root    root    true    0644    root    root
> diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt
> index daa4aed840f..48191f504ce 100644
> --- a/meta/files/fs-perms.txt
> +++ b/meta/files/fs-perms.txt
> @@ -38,7 +38,6 @@ ${datadir}/locale     0755    root    root    true    0644    root    root
>
>  # Cleanup headers
>  ${includedir}          0755    root    root    true    0644    root    root
> -${oldincludedir}       0755    root    root    true    0644    root    root
>
>  # Cleanup debug src
>  /usr/src/debug         0755    root    root    true    0644    root    root
> diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
> index 1dd20f85ebd..f69bf9c353c 100644
> --- a/meta/lib/oe/package.py
> +++ b/meta/lib/oe/package.py
> @@ -456,8 +456,7 @@ def fixup_perms(d):
>                  'sbindir',
>                  'libexecdir',
>                  'libdir',
> -                'includedir',
> -                'oldincludedir' ]
> +                'includedir' ]
>
>      for path in target_path_vars:
>          dir = d.getVar(path) or ""
> --
> 2.39.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#190807): https://lists.openembedded.org/g/openembedded-core/message/190807
> Mute This Topic: https://lists.openembedded.org/mt/102630315/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [OE-core] [PATCH 2/2] bitbake.conf: Drop oldincludedir

[Richard Purdie]

On Thu, 2023-11-16 at 13:25 -0800, Khem Raj wrote:
> On Thu, Nov 16, 2023 at 8:53 AM Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > 
> > Autoconf defines this as:
> > 
> > "The directory for installing C header files for non-GCC compilers."
> > 
> > Whilst this is something autoconf does allow changing, I find it hard
> > to believe it has much use in the wild now and that headers don't get
> > split like this in reality, it would probably only be useful on really
> > old unixes.. The values are the same in our configuration anyway.
> > 
> > Drop the value and just use includedir everywhere.
> 
> Maybe alias it to includedir instead. Since some makefiles may assume
> a default value in its absence
> which might change the install behavior. It does not matter much on
> native builds but for cross builds it might.

I did for autoconf itself but I'm struggling to believe there are
generic makefiles out there using this.

We really need to cut down on the amount of environment exports we have
so lets see if this does actually break anything...

Cheers,

Richard

Re: [OE-core] [PATCH 2/2] bitbake.conf: Drop oldincludedir

[Khem Raj]

On Thu, Nov 16, 2023 at 1:29 PM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Thu, 2023-11-16 at 13:25 -0800, Khem Raj wrote:
> > On Thu, Nov 16, 2023 at 8:53 AM Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> > >
> > > Autoconf defines this as:
> > >
> > > "The directory for installing C header files for non-GCC compilers."
> > >
> > > Whilst this is something autoconf does allow changing, I find it hard
> > > to believe it has much use in the wild now and that headers don't get
> > > split like this in reality, it would probably only be useful on really
> > > old unixes.. The values are the same in our configuration anyway.
> > >
> > > Drop the value and just use includedir everywhere.
> >
> > Maybe alias it to includedir instead. Since some makefiles may assume
> > a default value in its absence
> > which might change the install behavior. It does not matter much on
> > native builds but for cross builds it might.
>
> I did for autoconf itself but I'm struggling to believe there are
> generic makefiles out there using this.
>
> We really need to cut down on the amount of environment exports we have
> so lets see if this does actually break anything...
>

yeah other build systemd like cmake, etc also define it, generally I
am in favor of
reducing variable export.

> Cheers,
>
> Richard

Re: [OE-core] [PATCH 1/2] bitbake.conf: Log events by default using BB_DEFAULT_EVENTLOG

[Alexandre Belloni]

For some reason, this is the cause of:
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/6065/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/6062/steps/15/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/6013/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/6078/steps/14/logs/stdio


On 16/11/2023 16:52:49+0000, Richard Purdie wrote:
> By setting this, event data from during the build is saved out. This can
> be used for analytic including toaster to allow builds to be examined
> later. This will use some disk space but it is worth it for the ability
> to look into what happened during the build. Users can set the value to
> something else in local.conf to override if they wish.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/conf/bitbake.conf | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 67ff7690463..12292714d2f 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -934,6 +934,7 @@ BB_DEFAULT_UMASK ??= "022"
>  
>  # Complete output from bitbake
>  BB_CONSOLELOG ?= "${LOG_DIR}/cooker/${MACHINE}/${DATETIME}.log"
> +BB_DEFAULT_EVENTLOG ?= "${LOG_DIR}/eventlog/${DATETIME}.json"
>  
>  # Setup our default hash policy
>  BB_SIGNATURE_HANDLER ?= "OEBasicHash"
> -- 
> 2.39.2
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#190806): https://lists.openembedded.org/g/openembedded-core/message/190806
> Mute This Topic: https://lists.openembedded.org/mt/102630313/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com