diff options
| author | Michael Smith <msmith@cbnco.com> | 2009-08-17 23:51:25 -0400 |
|---|---|---|
| committer | Michael Smith <msmith@cbnco.com> | 2009-08-20 21:50:41 -0400 |
| commit | 08825f5f1065c6c17d2f8d594b61a9e276a5fd30 (patch) | |
| tree | 064406abbf4cb5de5e7612bb66ace3ba0641995f | |
| parent | fb61d971d4299d0784257dcd150befc13241e7ee (diff) | |
glibc: fix hardcoded /sbin/ldconfig path
Put it in ${base_sbindir} instead of /sbin. Bump INC_PR to r34.
Signed-off-by: Michael Smith <msmith@cbnco.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | recipes/glibc/glibc-package.bbclass | 5 | ||||
| -rw-r--r-- | recipes/glibc/glibc.inc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass index 2da68185c5..0127646f43 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}" diff --git a/recipes/glibc/glibc.inc b/recipes/glibc/glibc.inc index 4efff7842e..6e5ca68404 100644 --- a/recipes/glibc/glibc.inc +++ b/recipes/glibc/glibc.inc @@ -11,7 +11,7 @@ PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" # INC_PR for glibc.inc, glibc-initial.inc and glibc-stage.inc -INC_PR = "r33" +INC_PR = "r34" inherit autotools |