From 1033aa088c69f3c4669e4d62ec2fc51c0f8e571a Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 5 Jul 2024 14:19:11 +0100 Subject: [PATCH] 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 --- bootstrap_sdk | 11 +---------- build_library/set_lsb_release | 1 + build_library/toolchain_util.sh | 4 ---- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/bootstrap_sdk b/bootstrap_sdk index c7c40a3c42..052b363bb4 100755 --- a/bootstrap_sdk +++ b/bootstrap_sdk @@ -78,16 +78,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 diff --git a/build_library/set_lsb_release b/build_library/set_lsb_release index f86c968909..4681cb5eda 100755 --- a/build_library/set_lsb_release +++ b/build_library/set_lsb_release @@ -45,6 +45,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" <