mirror of
https://github.com/flatcar/scripts.git
synced 2026-04-03 04:31:23 +02:00
Stop trying to create lib->lib64 symlink
We stopped using profiles with a lib->lib64 symlink a while ago, so there is no point in checking for this any more. We weren't checking against the target SDK architecture anyway. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
This commit is contained in:
parent
992213439e
commit
31cfacb174
@ -65,16 +65,7 @@ ROOT_OVERLAY=${TEMPDIR}/stage4_overlay
|
||||
if [[ "$STAGES" =~ stage4 ]]; then
|
||||
info "Setting release to ${FLATCAR_VERSION}"
|
||||
rm -rf "${ROOT_OVERLAY}"
|
||||
# need to setup the lib->lib64 symlink correctly
|
||||
libdir=$(get_sdk_libdir)
|
||||
mkdir -p "${ROOT_OVERLAY}/usr/${libdir}"
|
||||
if [[ "${libdir}" != lib ]]; then
|
||||
if [[ "$(get_sdk_symlink_lib)" == "yes" ]]; then
|
||||
ln -s "${libdir}" "${ROOT_OVERLAY}/usr/lib"
|
||||
else
|
||||
mkdir -p "${ROOT_OVERLAY}/usr/lib"
|
||||
fi
|
||||
fi
|
||||
mkdir -p "${ROOT_OVERLAY}"
|
||||
"${BUILD_LIBRARY_DIR}/set_lsb_release" \
|
||||
--root "${ROOT_OVERLAY}"
|
||||
fi
|
||||
|
||||
@ -42,6 +42,7 @@ sudo ln -sf "../usr/share/flatcar/lsb-release" "${ROOT_FS_DIR}/etc/lsb-release"
|
||||
|
||||
# And the new standard, os-release
|
||||
# https://www.freedesktop.org/software/systemd/man/os-release.html
|
||||
sudo mkdir -p "${ROOT_FS_DIR}/usr/lib"
|
||||
sudo_clobber "${ROOT_FS_DIR}/usr/lib/os-release" <<EOF
|
||||
NAME="$BRANDING_OS_NAME"
|
||||
ID="$BRANDING_OS_ID"
|
||||
|
||||
@ -164,10 +164,6 @@ get_sdk_libdir() {
|
||||
portageq envvar "LIBDIR_$(get_sdk_arch)"
|
||||
}
|
||||
|
||||
get_sdk_symlink_lib() {
|
||||
portageq envvar "SYMLINK_LIB"
|
||||
}
|
||||
|
||||
# Usage: get_sdk_binhost [version...]
|
||||
# If no versions are specified the current and SDK versions are used.
|
||||
get_sdk_binhost() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user