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

bootstrap_sdk: setup /usr/lib correctly before calling set_lsb_release

Browse Source 
os-release is now written to /usr/lib but that is likely a symlink to
/usr/lib64 so a little extra logic is required to avoid clobbering the
symlink.
This commit is contained in:
Michael Marineau 2014-07-14 17:38:37 -07:00
parent 2fb518615a
commit 1016bb323b
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bootstrap_sdk
View File

@ -58,7 +58,12 @@ check_gsutil_opts
if [[ "$STAGES" =~ stage4 ]]; then if [[ "$STAGES" =~ stage4 ]]; then
info "Setting release to ${COREOS_VERSION_STRING}" info "Setting release to ${COREOS_VERSION_STRING}"
rm -rf "${TEMPDIR}/stage4_overlay" rm -rf "${TEMPDIR}/stage4_overlay"
mkdir -p "${TEMPDIR}/stage4_overlay" # need to setup the lib->lib64 symlink correctly
libdir=$(get_sdk_libdir)
mkdir -p "${TEMPDIR}/stage4_overlay/usr/${libdir}"
if [[ "${libdir}" != lib ]]; then
ln -s "${libdir}" "${TEMPDIR}/stage4_overlay/usr/lib"
fi
"${BUILD_LIBRARY_DIR}/set_lsb_release" \ "${BUILD_LIBRARY_DIR}/set_lsb_release" \
--root "${TEMPDIR}/stage4_overlay" --root "${TEMPDIR}/stage4_overlay"
fi fi

5
build_library/toolchain_util.sh
View File

@ -135,6 +135,11 @@ get_sdk_profile() {
echo "coreos:coreos/$(get_sdk_arch)/sdk" echo "coreos:coreos/$(get_sdk_arch)/sdk"
} }
get_sdk_libdir() {
# Looking for LIBDIR_amd64 or similar
portageq envvar "LIBDIR_$(get_sdk_arch)"
}
# Usage: get_sdk_binhost [version...] # Usage: get_sdk_binhost [version...]
# If no versions are specified the current and SDK versions are used. # If no versions are specified the current and SDK versions are used.
get_sdk_binhost() { get_sdk_binhost() {