libsoft: Remove runtime ldconfig support for libsoft
Remove the runtime support for running ldconfig at boot to cache lists of libsoft libbraries. Sponsored by: Netflix
This commit is contained in:
parent
b68d6892ba
commit
d418bc27e6
@ -652,17 +652,11 @@ ldconfig_paths="/usr/lib/compat ${_localbase}/lib ${_localbase}/lib/compat/pkg"
|
|||||||
# shared library search paths
|
# shared library search paths
|
||||||
ldconfig32_paths="/usr/lib32 /usr/lib32/compat"
|
ldconfig32_paths="/usr/lib32 /usr/lib32/compat"
|
||||||
# 32-bit compatibility shared library search paths
|
# 32-bit compatibility shared library search paths
|
||||||
ldconfigsoft_paths="/usr/libsoft /usr/libsoft/compat ${_localbase}/libsoft"
|
|
||||||
# soft float compatibility shared library search paths
|
|
||||||
# Note: temporarily with extra stuff for transition
|
|
||||||
ldconfig_local_dirs="${_localbase}/libdata/ldconfig"
|
ldconfig_local_dirs="${_localbase}/libdata/ldconfig"
|
||||||
# Local directories with ldconfig configuration files.
|
# Local directories with ldconfig configuration files.
|
||||||
ldconfig_local32_dirs="${_localbase}/libdata/ldconfig32"
|
ldconfig_local32_dirs="${_localbase}/libdata/ldconfig32"
|
||||||
# Local directories with 32-bit compatibility ldconfig
|
# Local directories with 32-bit compatibility ldconfig
|
||||||
# configuration files.
|
# configuration files.
|
||||||
ldconfig_localsoft_dirs="${_localbase}/libdata/ldconfigsoft"
|
|
||||||
# Local directories with soft float compatibility ldconfig
|
|
||||||
# configuration files.
|
|
||||||
kern_securelevel_enable="NO" # kernel security level (see security(7))
|
kern_securelevel_enable="NO" # kernel security level (see security(7))
|
||||||
kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure
|
kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure
|
||||||
# Note that setting securelevel to 0 will result
|
# Note that setting securelevel to 0 will result
|
||||||
|
@ -64,27 +64,6 @@ ldconfig_start()
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
case ${machine_arch} in
|
|
||||||
armv[67])
|
|
||||||
for i in ${ldconfig_localsoft_dirs}; do
|
|
||||||
if [ -d "${i}" ]; then
|
|
||||||
_files=`find ${i} -type f`
|
|
||||||
if [ -n "${_files}" ]; then
|
|
||||||
ldconfigsoft_paths="${ldconfigsoft_paths} `cat ${_files} | sort -u`"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
_LDC=""
|
|
||||||
for i in ${ldconfigsoft_paths}; do
|
|
||||||
if [ -r "${i}" ]; then
|
|
||||||
_LDC="${_LDC} ${i}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
check_startmsgs &&
|
|
||||||
echo 'Soft Float compatibility ldconfig path:' ${_LDC}
|
|
||||||
${ldconfig} -soft ${_ins} ${_LDC}
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user