Skip to contentSkip to conversation

Various minor improvements

PATCH In review Dan McGregor 2 participants 6 messages Jun 15, 2020 – Jun 16, 2020

lore
Share & tools
lore
#0 lore raw

cover Various minor improvements

From: Dan McGregor <[email protected]>

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(+)
Signature · 1 line
2.27.0
#1 lore raw

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

From: Dan McGregor <[email protected]>

From: Daniel McGregor <[email protected]>

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

---
 meta/classes/devtool-source.bbclass | 3 +++
 1 file changed, 3 insertions(+)
meta/classes/devtool-source.bbclass +3 -0
index 280d6009f3..4032e59b0c 100644
@@ -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:
Signature · 1 line
2.27.0
#2 lore raw

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

Quoted 19 lines · Dan McGregor

From: Dan McGregor <[email protected]>

From: Daniel McGregor <[email protected]>

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

---
 meta/classes/devtool-source.bbclass | 3 +++
 1 file changed, 3 insertions(+)
meta/classes/devtool-source.bbclass +0 -0
index 280d6009f3..4032e59b0c 100644

meta/classes/devtool-source.bbclass python() { · line 54

Quoted 9 lines
meta/classes/devtool-source.bbclass +3 -0
@@ -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

#3 lore raw

PATCH 2/4 sign_rpm.bbclass: ignore thread count

In reply to Dan McGregor

From: Dan McGregor <[email protected]>

From: Daniel McGregor <[email protected]>

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

---
 meta/classes/sign_rpm.bbclass | 1 +
 1 file changed, 1 insertion(+)
meta/classes/sign_rpm.bbclass +1 -0
index 64ae7ce30e..73a55a512d 100644
@@ -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"
Signature · 1 line
2.27.0
#4 lore raw

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

In reply to Dan McGregor

From: Dan McGregor <[email protected]>

From: Daniel McGregor <[email protected]>

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

---
 meta/recipes-core/systemd/systemd-conf/wired.network | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-core/systemd/systemd-conf/wired.network +1 -0
index ff807ba31f..dcf3534596 100644
@@ -6,5 +6,6 @@ KernelCommandLine=!nfsroot
 DHCP=yes
 
 [DHCP]
+UseMTU=yes
 RouteMetric=10
 ClientIdentifier=mac
Signature · 1 line
2.27.0
#5 lore raw

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

In reply to Dan McGregor

From: Dan McGregor <[email protected]>

From: Daniel McGregor <[email protected]>

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.

---
 scripts/buildhistory-collect-srcrevs | 1 +
 1 file changed, 1 insertion(+)
scripts/buildhistory-collect-srcrevs +1 -0
index c4d203ff4d..340bee78bb 100755
@@ -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:
Signature · 1 line
2.27.0