mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-07 21:16:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Generate_au_zip blacklisting was blacklisting * not nothing.

Browse Source 
Fix the blacklisting logic, and re-add the magic library linux-vdso.so.

BUG=chromium-os:32542
TEST=Run by hand, .zip contents examined by hand.

Change-Id: I94d99bf62e5eb011ac70428d7cebeaa852519a78
Reviewed-on: https://gerrit.chromium.org/gerrit/27398
Reviewed-by: Jay Srinivasan <jaysri@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Commit-Ready: Don Garrett <dgarrett@chromium.org>
This commit is contained in:
Don Garrett 2012-07-13 13:50:31 -07:00 committed by Gerrit
parent 6202bf1190
commit c8e3cb091e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build_library/generate_au_zip.py
View File

@ -113,6 +113,12 @@ def CopyRequiredFiles(dest_files_root):
# We need directories to be copied recursively to a destination within tempdir # We need directories to be copied recursively to a destination within tempdir
recurse_dirs = {'~/trunk/src/scripts/lib/shflags': 'lib/shflags'} recurse_dirs = {'~/trunk/src/scripts/lib/shflags': 'lib/shflags'}
black_list = [
# This library does not exist on disk, but is inserted into the
# executable's memory space when the executable is loaded by the kernel.
'linux-vdso.so',
]
all_files = ldd_files + static_files all_files = ldd_files + static_files
all_files = map(os.path.expanduser, all_files) all_files = map(os.path.expanduser, all_files)
@ -122,7 +128,7 @@ def CopyRequiredFiles(dest_files_root):
sys.exit(1) sys.exit(1)
logging.debug('Given files that need to be copied = %s' % '' .join(all_files)) logging.debug('Given files that need to be copied = %s' % '' .join(all_files))
all_files += DepsToCopy(ldd_files=ldd_files) all_files += DepsToCopy(ldd_files=ldd_files,black_list=black_list)
for file_name in all_files: for file_name in all_files:
logging.debug('Copying file %s to %s', file_name, dest_files_root) logging.debug('Copying file %s to %s', file_name, dest_files_root)
shutil.copy2(file_name, dest_files_root) shutil.copy2(file_name, dest_files_root)
@ -179,6 +185,10 @@ def _ExcludeBlacklist(library_list, black_list=[]):
Returns: Returns:
Filtered library_list Filtered library_list
""" """
if not black_list:
return library_list
return_list = [] return_list = []
pattern = re.compile(r'|'.join(black_list)) pattern = re.compile(r'|'.join(black_list))