[oe] [PATCH] glibc: fix hardcoded /sbin/ldconfig path

[Khem Raj]

On Mon, Aug 17, 2009 at 8:54 PM, Michael Smith<msmith at cbnco.com> wrote:
> Put it in ${base_sbindir} instead of /sbin.
>
> Not bumping PR because most people let /sbin be /sbin.
>
> Signed-off-by: Michael Smith <msmith at cbnco.com>

Acked-by: Khem Raj <raj.khem at gmail.com>


> ---
>  recipes/glibc/glibc-package.bbclass |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass
> index 2da6818..0127646 100644
> --- a/recipes/glibc/glibc-package.bbclass
> +++ b/recipes/glibc/glibc-package.bbclass
> @@ -36,11 +36,11 @@ INSANE_SKIP_glibc-dbg = True
>
>  libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc*.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so"
>
> -FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '/sbin/ldconfig', '', d)}"
> +FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}"
>  FILES_ldd = "${bindir}/ldd"
>  FILES_libsegfault = "${base_libdir}/libSegFault*"
>  FILES_glibc-extra-nss = "${base_libdir}/libnss*"
> -FILES_sln = "/sbin/sln"
> +FILES_sln = "${base_sbindir}/sln"
>  FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen"
>  FILES_nscd = "${sbindir}/nscd*"
>  FILES_glibc-utils = "${bindir}/* ${sbindir}/*"
> @@ -66,6 +66,7 @@ def get_glibc_fpu_setting(bb, d):
>     return ""
>
>  EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
> +EXTRA_OEMAKE += "rootsbindir=${base_sbindir}"
>
>  OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
>
> --
> 1.6.3
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>