From 215f9061236daca9dfee77022a2cd21bbf58cb0c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 5 Nov 2012 16:28:30 -0500 Subject: [PATCH] build_image: use an array for excludes This makes a follow up commit easier to document excludes. BUG=chromium-os:22939 TEST=build_image for daisy installs same set of files Change-Id: I09a9b3fe6f8c1d1fd9dd4d094f2fb7c81ce24880 Reviewed-on: https://gerrit.chromium.org/gerrit/37377 Reviewed-by: David James Commit-Ready: Mike Frysinger Tested-by: Mike Frysinger --- build_library/base_image_util.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh index fd9510e188..898d433f95 100755 --- a/build_library/base_image_util.sh +++ b/build_library/base_image_util.sh @@ -170,10 +170,16 @@ create_base_image() { "--board=${BOARD} to update the version of libc installed on that board." fi + # Strip out files we don't need in the final image at runtime. + local libc_excludes=( + # Compile-time headers. + 'usr/include' 'sys-include' + # Link-time objects. + '*.[ao]' + ) pbzip2 -dc --ignore-trailing-garbage=1 "${LIBC_PATH}" | \ sudo tar xpf - -C "${root_fs_dir}" ./usr/${CHOST} \ - --strip-components=3 --exclude=usr/include --exclude=sys-include \ - --exclude=*.a --exclude=*.o + --strip-components=3 "${libc_excludes[@]/#/--exclude=}" board_ctarget=$(get_ctarget_from_board "${BOARD}") for atom in $(portageq match / cross-$board_ctarget/gcc); do