mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-09 14:06:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

build_library: remove extract_docs()

Browse Source 
Since coreos-doc was removed from coreos-overlay, there are no more
files in /usr/share/coreos/doc, causing this function to fail.
This commit is contained in:
David Michael 2016-11-09 11:44:11 -08:00
parent 1d651dbf96
commit 2dfab3fd79
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build_library/build_image_util.sh
View File

@ -228,15 +228,6 @@ write_licenses() {
done > "$2" 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 # Add an entry to the image's package.provided
package_provided() { package_provided() {
local p profile="${BUILD_DIR}/configroot/etc/portage/profile" local p profile="${BUILD_DIR}/configroot/etc/portage/profile"

1
build_library/oem_aci_util.sh
View File

@ -34,7 +34,6 @@ create_oem_aci_image() {
run_ldconfig "${root_fs_dir}" run_ldconfig "${root_fs_dir}"
write_packages "${root_fs_dir}" "${BUILD_DIR}/${image_packages}" write_packages "${root_fs_dir}" "${BUILD_DIR}/${image_packages}"
write_licenses "${root_fs_dir}" "${BUILD_DIR}/${image_licenses}" 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 # clean-ups of things we do not need
sudo rm ${root_fs_dir}/etc/csh.env sudo rm ${root_fs_dir}/etc/csh.env

1
build_library/prod_image_util.sh
View File

@ -79,7 +79,6 @@ create_prod_image() {
run_localedef "${root_fs_dir}" run_localedef "${root_fs_dir}"
write_packages "${root_fs_dir}" "${BUILD_DIR}/${image_packages}" write_packages "${root_fs_dir}" "${BUILD_DIR}/${image_packages}"
write_licenses "${root_fs_dir}" "${BUILD_DIR}/${image_licenses}" 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 # Assert that if this is supposed to be an official build that the
# official update keys have been used. # official update keys have been used.