From 540284316d0511f1c01ba55c21e258b8d20c3b97 Mon Sep 17 00:00:00 2001 From: Don Garrett Date: Thu, 12 Jul 2012 15:07:38 -0700 Subject: [PATCH] Bundle up ALL dependant libraries for the delta generator. 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 Reviewed-by: Don Garrett Tested-by: Don Garrett --- build_library/generate_au_zip.py | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/build_library/generate_au_zip.py b/build_library/generate_au_zip.py index 32bbe71db9..3e2ca94655 100755 --- a/build_library/generate_au_zip.py +++ b/build_library/generate_au_zip.py @@ -57,7 +57,7 @@ def _SplitAndStrip(data): 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. Args: 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 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 = map(os.path.expanduser, all_files) @@ -139,7 +122,7 @@ def CopyRequiredFiles(dest_files_root): sys.exit(1) 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: logging.debug('Copying file %s to %s', file_name, dest_files_root) shutil.copy2(file_name, dest_files_root)