mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/selftest: also copy local changes from the 'scripts/' dir

Browse Source 
The 'devtool' cases make a copy of 'poky', but before this patch, that
only included modifications to the 'meta/' subdirectory.

It's very frustrating to make changes to scripts/ and have them be
silently ignored by oe-selftest.

(From OE-Core rev: 35de7080c53808ade526b3b97cb54f528357deca)

Signed-off-by: Chris Laplante <chris.laplante@agilent.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chris Laplante
2025-01-29 15:20:16 -05:00
committed by Richard Purdie
parent e85a3c8f2c
commit 4a7b6f254d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/selftest/cases/devtool.py
+5 -1
View File
@@ -64,11 +64,15 @@ def setUpModule():
# under COREBASE and we don't want to copy that, so we have # under COREBASE and we don't want to copy that, so we have
# to be selective. # to be selective.
result = runCmd('git status --porcelain', cwd=oldreporoot) result = runCmd('git status --porcelain', cwd=oldreporoot)
# Also copy modifications to the 'scripts/' directory
canonical_layerpath_scripts = os.path.normpath(canonical_layerpath + "../scripts")
for line in result.output.splitlines(): for line in result.output.splitlines():
if line.startswith(' M ') or line.startswith('?? '): if line.startswith(' M ') or line.startswith('?? '):
relpth = line.split()[1] relpth = line.split()[1]
pth = os.path.join(oldreporoot, relpth) pth = os.path.join(oldreporoot, relpth)
if pth.startswith(canonical_layerpath): if pth.startswith(canonical_layerpath) or pth.startswith(canonical_layerpath_scripts):
if relpth.endswith('/'): if relpth.endswith('/'):
destdir = os.path.join(corecopydir, relpth) destdir = os.path.join(corecopydir, relpth)
# avoid race condition by not copying .pyc files YPBZ#13421,13803 # avoid race condition by not copying .pyc files YPBZ#13421,13803