[PATCH 0/4] Various minor improvements

[PATCH 0/4] Various minor improvements

[Dan McGregor]

From: Dan McGregor <danismostlikely@gmail.com>

Fixes a few annoyances we've been experiencing, such as devtool
breaking on recipes that inherit python3native, and the number of
threads affecting the stamp of RPM signing.

Daniel McGregor (4):
  devtool-source.bbclass: Do not export _PYTHON_SYSCONFIGDATA_NAME
  sign_rpm.bbclass: ignore thread count
  systemd-conf: Accept MTU from DHCP
  buildhistory-collect-srcrevs: sort directories

 meta/classes/devtool-source.bbclass                  | 3 +++
 meta/classes/sign_rpm.bbclass                        | 1 +
 meta/recipes-core/systemd/systemd-conf/wired.network | 1 +
 scripts/buildhistory-collect-srcrevs                 | 1 +
 4 files changed, 6 insertions(+)

-- 
2.27.0

[PATCH 1/4] devtool-source.bbclass: Do not export _PYTHON_SYSCONFIGDATA_NAME

[Dan McGregor]

From: Dan McGregor <danismostlikely@gmail.com>

From: Daniel McGregor <daniel.mcgregor@vecima.com>

This varialbe is set to help python3 running inside the build
environment. Unset it so that devtool can fetch recipes that inherit
python3native.

Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
---
 meta/classes/devtool-source.bbclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/classes/devtool-source.bbclass b/meta/classes/devtool-source.bbclass
index 280d6009f3..4032e59b0c 100644
--- a/meta/classes/devtool-source.bbclass
+++ b/meta/classes/devtool-source.bbclass
@@ -46,6 +46,9 @@ python() {
     d.setVar('STAMPS_DIR', os.path.join(tempdir, 'stamps'))
     d.setVar('T', os.path.join(tempdir, 'temp'))
 
+    if bb.data.inherits_class('python3native', d):
+        d.setVarFlag('_PYTHON_SYSCONFIGDATA_NAME', 'export', 0)
+
     # Hook in pre/postfuncs
     is_kernel_yocto = bb.data.inherits_class('kernel-yocto', d)
     if is_kernel_yocto:
-- 
2.27.0

[PATCH 2/4] sign_rpm.bbclass: ignore thread count

[Dan McGregor]

From: Dan McGregor <danismostlikely@gmail.com>

From: Daniel McGregor <daniel.mcgregor@vecima.com>

Similar to sign_ipk, ignore the number of threads used for signing
RPMs.

Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
---
 meta/classes/sign_rpm.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/sign_rpm.bbclass b/meta/classes/sign_rpm.bbclass
index 64ae7ce30e..73a55a512d 100644
--- a/meta/classes/sign_rpm.bbclass
+++ b/meta/classes/sign_rpm.bbclass
@@ -64,6 +64,7 @@ python sign_rpm () {
                      d.getVar('RPM_FSK_PATH'),
                      d.getVar('RPM_FSK_PASSWORD'))
 }
+sign_rpm[vardepsexclude] += "RPM_GPG_SIGN_CHUNK"
 
 do_package_index[depends] += "signing-keys:do_deploy"
 do_rootfs[depends] += "signing-keys:do_populate_sysroot"
-- 
2.27.0

[PATCH 3/4] systemd-conf: Accept MTU from DHCP

[Dan McGregor]

From: Dan McGregor <danismostlikely@gmail.com>

From: Daniel McGregor <daniel.mcgregor@vecima.com>

Many local cloud deployments use MTUs other than 1500. To support
them, accept MTU from DHCP by default.

Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
---
 meta/recipes-core/systemd/systemd-conf/wired.network | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/systemd/systemd-conf/wired.network b/meta/recipes-core/systemd/systemd-conf/wired.network
index ff807ba31f..dcf3534596 100644
--- a/meta/recipes-core/systemd/systemd-conf/wired.network
+++ b/meta/recipes-core/systemd/systemd-conf/wired.network
@@ -6,5 +6,6 @@ KernelCommandLine=!nfsroot
 DHCP=yes
 
 [DHCP]
+UseMTU=yes
 RouteMetric=10
 ClientIdentifier=mac
-- 
2.27.0

[PATCH 4/4] buildhistory-collect-srcrevs: sort directories

[Dan McGregor]

From: Dan McGregor <danismostlikely@gmail.com>

From: Daniel McGregor <daniel.mcgregor@vecima.com>

In order to allow consistent output of buildhistory-collect-srcrevs sort
the list of directories returned by os.walk. Otherwise the list of
SRCREVs is returned in an unspecified order.

We save the output of this command on build, so it creates smaller diffs
between builds.

Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
---
 scripts/buildhistory-collect-srcrevs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/buildhistory-collect-srcrevs b/scripts/buildhistory-collect-srcrevs
index c4d203ff4d..340bee78bb 100755
--- a/scripts/buildhistory-collect-srcrevs
+++ b/scripts/buildhistory-collect-srcrevs
@@ -59,6 +59,7 @@ def main():
 
     all_srcrevs = collections.defaultdict(list)
     for root, dirs, files in os.walk(options.buildhistory_dir):
+        dirs.sort()
         if '.git' in dirs:
             dirs.remove('.git')
         for fn in files:
-- 
2.27.0

Re: [OE-core] [PATCH 1/4] devtool-source.bbclass: Do not export _PYTHON_SYSCONFIGDATA_NAME

[Richard Purdie]

On Mon, 2020-06-15 at 16:01 -0600, Dan McGregor wrote:
> From: Dan McGregor <danismostlikely@gmail.com>
> 
> From: Daniel McGregor <daniel.mcgregor@vecima.com>
> 
> This varialbe is set to help python3 running inside the build
> environment. Unset it so that devtool can fetch recipes that inherit
> python3native.
> 
> Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
> ---
>  meta/classes/devtool-source.bbclass | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta/classes/devtool-source.bbclass
> b/meta/classes/devtool-source.bbclass
> index 280d6009f3..4032e59b0c 100644
> --- a/meta/classes/devtool-source.bbclass
> +++ b/meta/classes/devtool-source.bbclass
> @@ -46,6 +46,9 @@ python() {
>      d.setVar('STAMPS_DIR', os.path.join(tempdir, 'stamps'))
>      d.setVar('T', os.path.join(tempdir, 'temp'))
>  
> +    if bb.data.inherits_class('python3native', d):
> +        d.setVarFlag('_PYTHON_SYSCONFIGDATA_NAME', 'export', 0)
> +
>      # Hook in pre/postfuncs
>      is_kernel_yocto = bb.data.inherits_class('kernel-yocto', d)
>      if is_kernel_yocto:

No. We're seeing requests to add code like this all over the place in
the system and its not the right thing to do. We need to fix devtool so
that its setting PATH correctly when executing bitbake. This just works
around the problem.

Cheers,

Richard