Tweak recipetool and devtool to correclty use UNPACKDIR. This allows some
simplification of the code. This patch makes things basically work but there
are likely deeper improvements that can be made now that WORKDIR != UNPACKDIR.
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
---
scripts/lib/devtool/upgrade.py | 2 +-
scripts/lib/recipetool/create.py | 2 +-
scripts/lib/scriptutils.py | 15 ++-------------
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index fa5b8ef3c77..a8130ed23f5 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -32,7 +32,7 @@ def _run(cmd, cwd=''):
def _get_srctree(tmpdir):
srctree = tmpdir
- dirs = scriptutils.filter_src_subdirs(tmpdir)
+ dirs = os.listdir(tmpdir)
if len(dirs) == 1:
srctree = os.path.join(tmpdir, dirs[0])
else:
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 8e9ff38db6c..066366e34f6 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -528,7 +528,7 @@ def create_recipe(args):
if ftmpdir and args.keep_temp:
logger.info('Fetch temp directory is %s' % ftmpdir)
- dirlist = scriptutils.filter_src_subdirs(srctree)
+ dirlist = os.listdir(srctree)
logger.debug('Directory listing (excluding filtered out):\n %s' % '\n
'.join(dirlist))
if len(dirlist) == 1:
singleitem = os.path.join(srctree, dirlist[0])
diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py
index f23e53cba93..81f0b01fa53 100644
--- a/scripts/lib/scriptutils.py
+++ b/scripts/lib/scriptutils.py
@@ -179,6 +179,8 @@ def fetch_url(tinfoil, srcuri, srcrev, destdir, logger,
preserve_tmp=False, mirr
f.write('SRCREV = "%s"\n' % srcrev)
f.write('PV = "0.0+"\n')
f.write('WORKDIR = "%s"\n' % tmpworkdir)
+ f.write('UNPACKDIR = "%s"\n' % destdir)
+
# Set S out of the way so it doesn't get created under the
workdir
f.write('S = "%s"\n' % os.path.join(tmpdir, 'emptysrc'))
if not mirrors:
@@ -232,10 +234,6 @@ def fetch_url(tinfoil, srcuri, srcrev, destdir, logger,
preserve_tmp=False, mirr
if e.errno != errno.ENOTEMPTY:
raise
- bb.utils.mkdirhier(destdir)
- for fn in os.listdir(tmpworkdir):
- shutil.move(os.path.join(tmpworkdir, fn), destdir)
-
finally:
if not preserve_tmp:
shutil.rmtree(tmpdir)
@@ -271,12 +269,3 @@ def is_src_url(param):
return True
return False
-def filter_src_subdirs(pth):
- """
- Filter out subdirectories of initial unpacked source trees that we do not
care about.
- Used by devtool and recipetool.
- """
- dirlist = os.listdir(pth)
- filterout = ['git.indirectionsymlink', 'source-date-epoch',
'sstate-install-recipe_qa']
- dirlist = [x for x in dirlist if x not in filterout]
- return dirlist
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199282):
https://lists.openembedded.org/g/openembedded-core/message/199282
Mute This Topic: https://lists.openembedded.org/mt/106112376/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
