mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 19:56:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-apps/baselayout: Drop dead code installing lib to lib64 symlinks

Browse Source 
We have moved away from it already in production images already. With
the change of profile from 17.0 to 17.1, SYMLINK_LIB is always "no",
so some code will never be executed. Drop it.
This commit is contained in:
Krzesimir Nowak 2023-03-07 11:55:41 +01:00
parent 1d1a7f9f40
commit 6592be18db
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r8.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r9.ebuild vendored
View File

27
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild vendored
View File

@ -42,7 +42,6 @@ MOUNT_POINTS=(
/sys
)
declare -A LIB_SYMS # list of /lib->lib64 symlinks
declare -A USR_SYMS # list of /foo->usr/foo symlinks
declare -a BASE_DIRS # list of absolute paths that should be directories
@ -57,24 +56,16 @@ check_sym() {
}
pkg_setup() {
local libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
local libdirs=$(get_all_libdirs)
if [[ -z "${libdirs}" || -z "${def_libdir}" ]]; then
if [[ -z "${libdirs}" ]]; then
die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
fi
# figure out which paths should be symlinks and which should be directories
local d
for d in bin sbin ${libdirs} ; do
if [[ "${SYMLINK_LIB}" == "yes" && "${d}" == "lib" ]] ; then
if use symlink-usr; then
USR_SYMS["/lib"]="usr/${def_libdir}"
else
LIB_SYMS["/lib"]="${def_libdir}"
fi
LIB_SYMS["/usr/lib"]="${def_libdir}"
LIB_SYMS["/usr/local/lib"]="${def_libdir}"
elif use symlink-usr; then
if use symlink-usr; then
USR_SYMS["/$d"]="usr/$d"
BASE_DIRS+=( "/usr/$d" "/usr/local/$d" )
else
@ -84,9 +75,6 @@ pkg_setup() {
# make sure any pre-existing symlinks map to the expected locations.
local sym
for sym in "${!LIB_SYMS[@]}" ; do
check_sym "${sym}" "${LIB_SYMS[$sym]}"
done
if use symlink-usr; then
for sym in "${!USR_SYMS[@]}" ; do
check_sym "${sym}" "${USR_SYMS[$sym]}"
@ -108,12 +96,7 @@ src_compile() {
}
src_install() {
# lib symlinks must be in place before make install
dodir "${BASE_DIRS[@]}"
local sym
for sym in "${!LIB_SYMS[@]}" ; do
dosym "${LIB_SYMS[$sym]}" "${sym}"
done
if use cros_host; then
# Since later systemd-tmpfiles --root is used only users from
@ -221,10 +204,6 @@ pkg_postinst() {
for dir in "${BASE_DIRS[@]}"; do
mkdir -p "${ROOT}/usr/lib/debug/${dir}"
done
local sym
for sym in "${!LIB_SYMS[@]}" ; do
ln -sfT "${LIB_SYMS[$sym]}" "${ROOT}/usr/lib/debug/${sym}"
done
if use symlink-usr; then
for sym in "${!USR_SYMS[@]}" ; do
ln -sfT "${USR_SYMS[$sym]}" "${ROOT}/usr/lib/debug/${sym}"