Skip to contentSkip to conversation

Patch review

PATCH New Steve Sakoman 1 participant 4 messages Mar 8, 2022

lore
Share & tools
lore
#0 lore raw

cover Patch review

Please review this set of patches for dunfell and have comments back by end of day Thursday.

Passed a-full on autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/3335

The following changes since commit 51844f2d60d77fb8cb46ffe460402f76ae216ca5:

uninative: Upgrade to 3.5 (2022-03-03 07:43:07 -1000)

are available in the Git repository at:

git://git.openembedded.org/openembedded-core-contrib stable/dunfell-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-nut

Jose Quaresma (1):
sstate: inside the threadedpool don't write to the shared localdata

Richard Purdie (1):
systemd: Ensure uid/gid ranges are set deterministically

Ross Burton (1):
asciidoc: update git repository

 meta/classes/sstate.bbclass                      | 2 +-
 meta/recipes-core/systemd/systemd_244.5.bb       | 2 ++
 meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/3 asciidoc: update git repository

From: Ross Burton <[email protected]>

The asciidoc-py3 repository has been renamed to asciidoc-py.

---
 meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb +1 -1
index 62738dc8d9..325ff9aa15 100644
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
                     file://COPYRIGHT;md5=029ad5428ba5efa20176b396222d4069"
 
-SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=main \
+SRC_URI = "git://github.com/asciidoc/asciidoc-py;protocol=https;branch=main \
            file://auto-catalogs.patch \
            file://detect-python-version.patch"
 SRCREV = "618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/3 systemd: Ensure uid/gid ranges are set deterministically

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

meson.build will fall back to greping /etc/login.defs for values of these if they're not set. Different distros set them (Centos 7/8 does, Ubuntu does not) so output was not deterministic. Avoid this by setting to the default values. We now match the vaules from login.defs from shadow.

(cherry picked from commit 77a6ac0ac266d71e4fe67fd332662081f30cd7bf)
---
 meta/recipes-core/systemd/systemd_244.5.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-core/systemd/systemd_244.5.bb +2 -0
index 66446e2a7c..a648272bc0 100644
@@ -216,6 +216,8 @@ EXTRA_OEMESON += "-Dnobody-user=nobody \
                   -Drootlibdir=${rootlibdir} \
                   -Drootprefix=${rootprefix} \
                   -Ddefault-locale=C \
+                  -Dsystem-uid-max=999 \
+                  -Dsystem-gid-max=999 \
                   "
 
 # Hardcode target binary paths to avoid using paths from sysroot
Signature · 1 line
2.25.1
#3 lore raw

PATCH 3/3 sstate: inside the threadedpool don't write to the shared localdata

In reply to Steve Sakoman

From: Jose Quaresma <[email protected]>

When inside the threadedpool we make a copy of the localdata to avoid some race condition, so we need to use this new localdata2 and stop write the shared localdata.

(cherry picked from commit 90fe6948a9df0b43c58120a9358adb3da1ceb5b9)
---
 meta/classes/sstate.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/sstate.bbclass +1 -1
index 00a0e8fbd7..3d6fb84d63 100644
@@ -961,7 +961,7 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True,
 
             localdata2 = bb.data.createCopy(localdata)
             srcuri = "file://" + sstatefile
-            localdata.setVar('SRC_URI', srcuri)
+            localdata2.setVar('SRC_URI', srcuri)
             bb.debug(2, "SState: Attempting to fetch %s" % srcuri)
 
             try:
Signature · 1 line
2.25.1