Skip to contentSkip to conversation

Patch review

PATCH New Steve Sakoman 1 participant 3 messages Oct 5, 2020

lore
Share & tools
lore
#0 lore raw

cover Patch review

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

Passed a-full test on autobuilder:

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

The following changes since commit b9296bdeaacc1dce97aac9c9bf0d70555bb36646:

  wic: Add 512 Byte alignment to --offset (2020-09-30 05:54:58 -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

Chee Yang Lee (1):
perl: fix ptest test count

Tim Orling (1):
oeqa/selftest/cases/devtool.py: avoid .pyc race

 meta/lib/oeqa/selftest/cases/devtool.py               | 3 ++-
 meta/recipes-devtools/perl/files/CVE-2020-12723.patch | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/2 oeqa/selftest/cases/devtool.py: avoid .pyc race

From: Tim Orling <[email protected]>

In certain conditions, most likely under heavy load on the AutoBuilder, the prebuilt .pyc files are attempting to be executed before they have been completely copied. Avoid this by not copying the .pyc files (nor the __pycache__ directory). The impact of python3-native recreating the .pyc files should hopefully be negligible.

YOCTO#13421
YOCTO#13803

---
 meta/lib/oeqa/selftest/cases/devtool.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/devtool.py +2 -1
index 5003f08c75..d8bf4aea08 100644
@@ -56,7 +56,8 @@ def setUpModule():
                     if pth.startswith(canonical_layerpath):
                         if relpth.endswith('/'):
                             destdir = os.path.join(corecopydir, relpth)
-                            shutil.copytree(pth, destdir)
+                            # avoid race condition by not copying .pyc files YPBZ#13421,13803
+                            shutil.copytree(pth, destdir, ignore=ignore_patterns('*.pyc', '__pycache__'))
                         else:
                             destdir = os.path.join(corecopydir, os.path.dirname(relpth))
                             bb.utils.mkdirhier(destdir)
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/2 perl: fix ptest test count

In reply to Steve Sakoman

From: Chee Yang Lee <[email protected]>

patche added in commit c2710903859a5545aa9dd56251f61667ee8d80bd failed ptest perl.t/re/pat. The patch updates incorrect test cases count causes the ptest to fail.
864 test cases before apply the patch while the patch added only 4 test cases so it should be 868 instead of 873.

ptest-runner log :-
PASS: t/re/overload
# Looks like you planned 873 tests but ran 868.
FAIL: t/re/pat
PASS: t/re/pat_advanced

[YOCTO #14071]

---
 meta/recipes-devtools/perl/files/CVE-2020-12723.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/perl/files/CVE-2020-12723.patch +1 -1
index ad195cffab..d25f4d4a74 100644
@@ -265,7 +265,7 @@ index 6a868f4..2869b58 100644
  skip_all_without_unicode_tables();
  
 -plan tests => 864;  # Update this when adding/deleting tests.
-+plan tests => 873;  # Update this when adding/deleting tests.
++plan tests => 868;  # Update this when adding/deleting tests.
  
  run_tests() unless caller;
  
Signature · 1 line
2.17.1