mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-28 14:01:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bundle up ALL dependant libraries for the delta generator.

Browse Source 
We were blacklisting some dependant libraries for the delta generator when
we bundle them all up together. When glibc in the chroot was update to be
newer than glibc on our workstations, this broke payload generation.

The real fix is to link delta_generator statically so we don't have to do
this goofy library bundling business (chromium-os:32544). In the mean time,
bundle everything up to get us working again.

BUG=chromium-os:32544
TEST=Trybot run, but not fully verified.

Change-Id: I7b7d247f4edd8ecbab772807f6d2c4e7fdfd414a
Reviewed-on: https://gerrit.chromium.org/gerrit/27327
Commit-Ready: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
This commit is contained in:
Don Garrett 2012-07-12 15:07:38 -07:00 committed by Don Garrett
parent 359d3e119d
commit 540284316d
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build_library/generate_au_zip.py
View File

@ -57,7 +57,7 @@ def _SplitAndStrip(data):
return return_list return return_list
def DepsToCopy(ldd_files, black_list): def DepsToCopy(ldd_files, black_list=[]):
"""Returns a list of deps for a given dynamic executables list. """Returns a list of deps for a given dynamic executables list.
Args: Args:
ldd_files: List of dynamic files that needs to have the deps evaluated ldd_files: List of dynamic files that needs to have the deps evaluated
@ -113,23 +113,6 @@ 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'}
# Feel free to delete any file here if the chroot version is newer than
# the goobuntu workstation version. Otherwise delta generator will break
# when used by the release team to generate a delta.
black_list = [
'linux-vdso.so',
'libgcc_s.so',
'libgthread-2.0.so',
'libpthread.so',
'librt.so',
'libgcc_s.so',
'libc.so',
'ld-linux-x86-64',
'libm.so',
'libdl.so',
'libresolv.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)
@ -139,7 +122,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,black_list=black_list) all_files += DepsToCopy(ldd_files=ldd_files)
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)