From 2dfab3fd79194a9c4b1b790e943030e6c4759daa Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 9 Nov 2016 11:44:11 -0800 Subject: [PATCH] build_library: remove extract_docs() Since coreos-doc was removed from coreos-overlay, there are no more files in /usr/share/coreos/doc, causing this function to fail. --- build_library/build_image_util.sh | 9 --------- build_library/oem_aci_util.sh | 1 - build_library/prod_image_util.sh | 1 - 3 files changed, 11 deletions(-) diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh index 9ca779aed2..7ecfa3bb12 100755 --- a/build_library/build_image_util.sh +++ b/build_library/build_image_util.sh @@ -228,15 +228,6 @@ write_licenses() { done > "$2" } -extract_docs() { - local root_fs_dir="$1" - - info "Extracting docs" - tar --create --auto-compress --file="${BUILD_DIR}/doc.tar.bz2" \ - --directory="${root_fs_dir}/usr/share/coreos" doc - sudo rm --recursive --force "${root_fs_dir}/usr/share/coreos/doc" -} - # Add an entry to the image's package.provided package_provided() { local p profile="${BUILD_DIR}/configroot/etc/portage/profile" diff --git a/build_library/oem_aci_util.sh b/build_library/oem_aci_util.sh index 80100818eb..96ff564026 100644 --- a/build_library/oem_aci_util.sh +++ b/build_library/oem_aci_util.sh @@ -34,7 +34,6 @@ create_oem_aci_image() { run_ldconfig "${root_fs_dir}" write_packages "${root_fs_dir}" "${BUILD_DIR}/${image_packages}" write_licenses "${root_fs_dir}" "${BUILD_DIR}/${image_licenses}" - extract_docs "${root_fs_dir}" || : # This is allowed to fail. # clean-ups of things we do not need sudo rm ${root_fs_dir}/etc/csh.env diff --git a/build_library/prod_image_util.sh b/build_library/prod_image_util.sh index d53fde10a3..d132ae81f8 100755 --- a/build_library/prod_image_util.sh +++ b/build_library/prod_image_util.sh @@ -79,7 +79,6 @@ create_prod_image() { run_localedef "${root_fs_dir}" write_packages "${root_fs_dir}" "${BUILD_DIR}/${image_packages}" write_licenses "${root_fs_dir}" "${BUILD_DIR}/${image_licenses}" - extract_docs "${root_fs_dir}" # Assert that if this is supposed to be an official build that the # official update keys have been used.