mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
devtool: fix devtool upgrade with reproducible_builds class
If the reproducible_build class is inherited then there may be a "source-date-epoch" subdirectory in a fetched source tree; devtool upgrade was not expecting that in the upgraded source. Take a small snippet of code from recipetool create which already handles this, and make it a shared function that can be used in both places. Additionally, fix an assumption that the source is always in a subdirectory in the cleanup code that blocked debugging this. [YOCTO #13635] (From OE-Core rev: 0d642861cd9cf034b8d4951433980addc215d4fd) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
81cd5f7714
commit
ea01bd31c3
@@ -268,3 +268,13 @@ def is_src_url(param):
|
||||
elif param.startswith('git@') or ('@' in param and param.endswith('.git')):
|
||||
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']
|
||||
dirlist = [x for x in dirlist if x not in filterout]
|
||||
return dirlist
|
||||
|
||||
Reference in New Issue
Block a user