mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-27 16:41:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #323 from marineam/gcc

Browse Source 
Make ldconfig not matter so much
This commit is contained in:
Michael Marineau 2014-08-27 23:01:51 -07:00
commit 30372ccf9a
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build_library/build_image_util.sh
View File

@ -145,10 +145,23 @@ write_contents() {
# Generate a list of installed packages in the format: # Generate a list of installed packages in the format:
# sys-apps/systemd-212-r8::coreos # sys-apps/systemd-212-r8::coreos
write_packages() { write_packages() {
local profile="${BUILD_DIR}/configroot/etc/portage/profile"
info "Writing ${2##*/}" info "Writing ${2##*/}"
ROOT="$1" equery-$BOARD --no-color \ ROOT="$1" equery-$BOARD --no-color \
list '*' --format '$cpv::$repo' \ list '*' --format '$cpv::$repo' \
> "$2" > "$2"
if [[ -f "${profile}/package.provided" ]]; then
cat "${profile}/package.provided" >> "$2"
fi
}
# Add an entry to the image's package.provided
package_provided() {
local p profile="${BUILD_DIR}/configroot/etc/portage/profile"
for p in "$@"; do
info "Writing $p to package.provided"
echo "$p" >> "${profile}/package.provided"
done
} }
start_image() { start_image() {
@ -159,8 +172,10 @@ start_image() {
local disk_img="${BUILD_DIR}/${image_name}" local disk_img="${BUILD_DIR}/${image_name}"
mkdir -p "${BUILD_DIR}"/configroot/etc/portage mkdir -p "${BUILD_DIR}"/configroot/etc/portage/profile
ln -s "${BOARD_ROOT}"/etc/portage/* \ ln -s "${BOARD_ROOT}"/etc/portage/make.* \
"${BOARD_ROOT}"/etc/portage/package.* \
"${BOARD_ROOT}"/etc/portage/repos.conf \
"${BUILD_DIR}"/configroot/etc/portage/ "${BUILD_DIR}"/configroot/etc/portage/
info "Using image type ${disk_layout}" info "Using image type ${disk_layout}"

32
build_library/prod_image_util.sh
View File

@ -5,24 +5,24 @@
# The GCC package includes both its libraries and the compiler. # The GCC package includes both its libraries and the compiler.
# In prod images we only need the shared libraries. # In prod images we only need the shared libraries.
emerge_prod_gcc() { extract_prod_gcc() {
local root_fs_dir="$1"; shift local root_fs_dir="$1"; shift
local mask="${INSTALL_MASK:-$(portageq-$BOARD envvar INSTALL_MASK)}" local gcc=$(portageq-${BOARD} best_version "${BOARD_ROOT}" sys-devel/gcc)
test -n "$mask" || die "INSTALL_MASK not defined" local pkg="$(portageq-${BOARD} pkgdir)/${gcc}.tbz2"
mask="${mask} if [[ ! -f "${pkg}" ]]; then
/usr/bin die "Binary package missing: $pkg"
/usr/*/gcc-bin fi
/usr/lib/gcc/*/*/*.o
/usr/lib/gcc/*/*/include
/usr/lib/gcc/*/*/include-fixed
/usr/lib/gcc/*/*/plugin
/usr/libexec
/usr/share/gcc-data/*/*/c89
/usr/share/gcc-data/*/*/c99
/usr/share/gcc-data/*/*/python"
INSTALL_MASK="${mask}" emerge_to_image "${root_fs_dir}" --nodeps sys-devel/gcc "$@" # Normally GCC's shared libraries are installed to:
# /usr/lib/gcc/x86_64-cros-linux-gnu/$version/*
# Instead we extract them to plain old /usr/lib
qtbz2 -O -t "${pkg}" | \
sudo tar -C "${root_fs_dir}" -xj \
--transform 's#/usr/lib/.*/#/usr/lib/#' \
--wildcards './usr/lib/gcc/*.so*'
package_provided "${gcc}"
} }
create_prod_image() { create_prod_image() {
@ -39,7 +39,7 @@ create_prod_image() {
# Install minimal GCC (libs only) and then everything else # Install minimal GCC (libs only) and then everything else
set_image_profile prod set_image_profile prod
emerge_prod_gcc "${root_fs_dir}" extract_prod_gcc "${root_fs_dir}"
emerge_to_image "${root_fs_dir}" coreos-base/coreos emerge_to_image "${root_fs_dir}" coreos-base/coreos
write_packages "${root_fs_dir}" "${BUILD_DIR}/${image_packages}" write_packages "${root_fs_dir}" "${BUILD_DIR}/${image_packages}"