commit 83554a38cbd50e1179aa666803cbbaf1df7aead4
author Don Garrett <dgarrett@google.com> Thu Sep 18 19:46:06 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Sep 20 03:58:23 2014 +0000
tree 8974967fd4f7353427eb7a43f1cc04a87053f339
parent 88cc16215544c86e601abef8f522eb6dc862a2ec

build_image: Enable license credits file creation for base image.

After emerging the packages onto our base image, create the license
credits file for those packages and store it on the rootfs.

BUG=chromium:197970 chromium:356543
TEST=Ran build image, and examined the results.

Change-Id: I2f9dc554072874bef879f31cca539b81ee064443
Reviewed-on: https://chromium-review.googlesource.com/218947
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>

build_library/base_image_util.sh

diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh
index 19d2144..1065db8 100755
--- a/build_library/base_image_util.sh
+++ b/build_library/base_image_util.sh
@@ -125,16 +125,33 @@
   # trim the image size as much as possible.
   emerge_to_image --root="${root_fs_dir}" ${BASE_PACKAGE}
 
+  #
+  # Take a somewhat arbitrary number of post-emerge tasks and run them
+  # in parallel to speed things up.
+  #
+
+  # Generate the license credits page for the packages installed on this
+  # image in a location that will be used by Chrome.
+  sudo mkdir -p "${root_fs_dir}/opt/google/chrome/resources"
+  sudo "${GCLIENT_ROOT}/chromite/licensing/licenses" \
+    --board="${BOARD}" \
+    --log-level error \
+    --output \
+    "${root_fs_dir}/opt/google/chrome/resources/about_os_credits.html" &
+
   # Remove unreferenced gconv charsets.
   # gconv charsets are .so modules loaded dynamically by iconv_open(3),
   # installed by glibc. Applications using them don't explicitly depend on them
   # and we don't known which ones will be used until all the applications are
   # installed. This script looks for the charset names on all the binaries
   # installed on the the ${root_fs_dir} and removes the unreferenced ones.
-  sudo "${GCLIENT_ROOT}/chromite/bin/gconv_strip" "${root_fs_dir}"
+  sudo "${GCLIENT_ROOT}/chromite/bin/gconv_strip" "${root_fs_dir}" &
 
   # Run ldconfig to create /etc/ld.so.cache.
-  run_ldconfig "${root_fs_dir}"
+  run_ldconfig "${root_fs_dir}" &
+
+  # Wait for all pending background tasks to complete.
+  wait
 
   # Set /etc/lsb-release on the image.
   "${OVERLAY_CHROMEOS_DIR}/scripts/cros_set_lsb_release" \