diff options
51 files changed, 167 insertions, 181 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 59febd1022..801896a5b9 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -191,7 +191,7 @@ def preferred_ml_updates(d): for v in versions: val = d.getVar(v, False) pkg = v.replace("PREFERRED_VERSION_", "") - if pkg.endswith("-native") or pkg.endswith("-nativesdk"): + if pkg.endswith("-native") or pkg.startswith("nativesdk-"): continue for p in prefixes: newname = "PREFERRED_VERSION_" + p + "-" + pkg @@ -201,7 +201,7 @@ def preferred_ml_updates(d): for prov in providers: val = d.getVar(prov, False) pkg = prov.replace("PREFERRED_PROVIDER_", "") - if pkg.endswith("-native") or pkg.endswith("-nativesdk"): + if pkg.endswith("-native") or pkg.startswith("nativesdk-"): continue virt = "" if pkg.startswith("virtual/"): @@ -218,7 +218,7 @@ def preferred_ml_updates(d): mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split() extramp = [] for p in mp: - if p.endswith("-native") or p.endswith("-nativesdk"): + if p.endswith("-native") or p.startswith("nativesdk-"): continue virt = "" if p.startswith("virtual/"): @@ -359,15 +359,18 @@ python () { subs = a.split("/", 1)[1] newappends.append("virtual/" + prefix + subs + extension) else: - newappends.append(prefix + a + extension) + if a.startswith(prefix): + newappends.append(a + extension) + else: + newappends.append(prefix + a + extension) return newappends def appendVar(varname, appends): if not appends: return if varname.find("DEPENDS") != -1: - if pn.endswith("-nativesdk"): - appends = expandFilter(appends, "-nativesdk", "") + if pn.startswith("nativesdk-"): + appends = expandFilter(appends, "", "nativesdk-") if pn.endswith("-native"): appends = expandFilter(appends, "-native", "") if mlprefix: @@ -456,7 +459,7 @@ python () { dont_want_license = d.getVar('INCOMPATIBLE_LICENSE', True) - if dont_want_license and not pn.endswith("-native") and not pn.endswith("-cross") and not pn.endswith("-cross-initial") and not pn.endswith("-cross-intermediate") and not pn.endswith("-crosssdk-intermediate") and not pn.endswith("-crosssdk") and not pn.endswith("-crosssdk-initial") and not pn.endswith("-cross-canadian-%s" % d.getVar('TRANSLATED_TARGET_ARCH', True)) and not pn.endswith("-nativesdk"): + if dont_want_license and not pn.endswith("-native") and not pn.endswith("-cross") and not pn.endswith("-cross-initial") and not pn.endswith("-cross-intermediate") and not pn.endswith("-crosssdk-intermediate") and not pn.endswith("-crosssdk") and not pn.endswith("-crosssdk-initial") and not pn.endswith("-cross-canadian-%s" % d.getVar('TRANSLATED_TARGET_ARCH', True)) and not pn.startswith("nativesdk-"): # Internally, we'll use the license mapping. This way INCOMPATIBLE_LICENSE = "GPLv2" and # INCOMPATIBLE_LICENSE = "GPLv2.0" will pick up all variations of GPL-2.0 spdx_license = return_spdx(d, dont_want_license) diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index ed53118a2f..aec7301981 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -52,7 +52,7 @@ LDFLAGS = "${BUILDSDK_LDFLAGS} \ -Wl,-rpath-link,${STAGING_LIBDIR}/.. \ -Wl,-rpath,${libdir}/.. " -DEPENDS_GETTEXT = "gettext-native gettext-nativesdk" +DEPENDS_GETTEXT = "gettext-native nativesdk-gettext" # Path mangling needed by the cross packaging # Note that we use := here to ensure that libdir and includedir are diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index f196df5f56..0da10a1dd1 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass @@ -33,10 +33,10 @@ python do_distrodata_np() { localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) bb.data.update_data(localdata) - if pn.find("-nativesdk") != -1: - pnstripped = pn.split("-nativesdk") + if pn.find("nativesdk-") != -1: + pnstripped = pn.replace("nativesdk-", "") bb.note("Native Split: %s" % pnstripped) - localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) + localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES', True)) bb.data.update_data(localdata) if pn.find("-cross") != -1: diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 8b6f05413d..6de14e0cac 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -195,7 +195,7 @@ def package_qa_check_dev(path, name, d, elf, messages): Check for ".so" library symlinks in non-dev packages """ - if not name.endswith("-dev") and not name.endswith("-dbg") and not name.endswith("-nativesdk") and path.endswith(".so") and os.path.islink(path): + if not name.endswith("-dev") and not name.endswith("-dbg") and not name.startswith("nativesdk-") and path.endswith(".so") and os.path.islink(path): messages.append("non -dev/-dbg/-nativesdk package contains symlink .so: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) @@ -726,7 +726,7 @@ Rerun configure task after fixing this. The path was '%s'""" % root) if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d): gt = "gettext-native" elif bb.data.inherits_class('cross-canadian', d): - gt = "gettext-nativesdk" + gt = "nativesdk-gettext" else: gt = "virtual/" + ml + "gettext" deps = bb.utils.explode_deps(d.getVar('DEPENDS', True) or "") diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 8c0cd5bea1..3334817da0 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -52,8 +52,6 @@ baselib = "lib" export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" -PKGSUFFIX = "-nativesdk" - python nativesdk_virtclass_handler () { if not isinstance(e, bb.event.RecipePreFinalise): return diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 2c4c89a256..742f292307 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -1114,7 +1114,7 @@ python do_package_rpm () { targetsys = d.getVar('TARGET_SYS', True) targetvendor = d.getVar('TARGET_VENDOR', True) package_arch = d.getVar('PACKAGE_ARCH', True) or "" - if package_arch not in "all any noarch".split(): + if package_arch not in "all any noarch".split() and not package_arch.endswith("-nativesdk"): ml_prefix = (d.getVar('MLPREFIX', True) or "").replace("-", "_") d.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch) else: diff --git a/meta/classes/pkgconfig.bbclass b/meta/classes/pkgconfig.bbclass index ddcf878220..5908b7f42d 100644 --- a/meta/classes/pkgconfig.bbclass +++ b/meta/classes/pkgconfig.bbclass @@ -2,6 +2,6 @@ DEPENDS_prepend = "pkgconfig-native " PKGCONFIGRDEP = "pkgconfig" PKGCONFIGRDEP_virtclass-native = "" -PKGCONFIGRDEP_virtclass-nativesdk = "pkgconfig-nativesdk" +PKGCONFIGRDEP_virtclass-nativesdk = "nativesdk-pkgconfig" RDEPENDS_${PN}-dev += "${PKGCONFIGRDEP}" diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass index e5bb54026e..f64a911b72 100644 --- a/meta/classes/populate_sdk.bbclass +++ b/meta/classes/populate_sdk.bbclass @@ -4,3 +4,4 @@ inherit populate_sdk_base addtask populate_sdk after do_install before do_build + diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index a1cb12a24a..c9fb00de48 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -7,7 +7,7 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk" SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${MULTIMACH_TARGET_SYS}" -TOOLCHAIN_HOST_TASK ?= "task-sdk-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}" +TOOLCHAIN_HOST_TASK ?= "nativesdk-task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= "" TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg" TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= "" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 7dfeda32aa..1d56813a6b 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -194,7 +194,7 @@ EXTENDPKGV ?= "${EXTENDPKGEVER}${PKGV}-${PKGR}" # Base package name # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" # otherwise it is the same as PN and P -SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -nativesdk -crosssdk -cross-canadian" +SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -crosssdk -cross-canadian" BPN = "${@base_prune_suffix(d.getVar('PN', True), d.getVar('SPECIAL_PKGSUFFIX', True).split(), d)}" BP = "${BPN}-${PV}" @@ -250,7 +250,7 @@ PROVIDES = "" PROVIDES_prepend = "${P} ${PF} ${PN} " RPROVIDES = "" -MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/libintl-nativesdk virtual/xserver virtual/update-alternatives-native virtual/update-alternatives" +MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/nativesdk-libintl virtual/xserver virtual/update-alternatives-native virtual/update-alternatives" SOLIBS = ".so.*" SOLIBS_darwin = ".*.dylib" diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 28d2f8eac7..2d8a17dee9 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -27,12 +27,12 @@ PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf" PREFERRED_PROVIDER_libgcc ?= "libgcc" -PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk" +PREFERRED_PROVIDER_nativesdk-libgcc ?= "nativesdk-libgcc" PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" -PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-libc-headers-nativesdk" +PREFERRED_PROVIDER_nativesdk-linux-libc-headers ?= "nativesdk-linux-libc-headers" PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" PREFERRED_PROVIDER_opkg ?= "opkg" PREFERRED_PROVIDER_opkg-native ?= "opkg-native" -PREFERRED_PROVIDER_opkg-nativesdk ?= "opkg-nativesdk" +PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" PREFERRED_PROVIDER_console-tools ?= "kbd" PREFERRED_PROVIDER_gzip-native ?= "pigz-native" diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc index 4f5607f226..1c9e7e9de9 100644 --- a/meta/conf/distro/include/tclibc-eglibc.inc +++ b/meta/conf/distro/include/tclibc-eglibc.inc @@ -9,10 +9,10 @@ LIBCOVERRIDE = ":libc-glibc" OVERRIDES .= "${LIBCOVERRIDE}" PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" -PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" +PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc" -PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk" +PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-eglibc" PREFERRED_PROVIDER_virtual/libc-locale ?= "eglibc-locale" CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 2bfa225efd..91936918a4 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -12,9 +12,9 @@ PREFERRED_PROVIDER_gdb = "gdb" # Default libc config PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-nativesdk" +PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc ?= "nativesdk-${TCLIBC}" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "${TCLIBC}-initial-nativesdk" +PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial = "nativesdk-${TCLIBC}-initial" PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "4.7%" @@ -33,20 +33,20 @@ PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}" PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}" PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-runtime-nativesdk ?= "${SDKGCCVERSION}" +PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" -PREFERRED_VERSION_libgcc-nativesdk ?= "${SDKGCCVERSION}" +PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" PREFERRED_VERSION_binutils ?= "${BINUVERSION}" PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}" PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}" PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" -PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}" +PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}" PREFERRED_VERSION_eglibc ?= "${EGLIBCVERSION}" PREFERRED_VERSION_eglibc-locale ?= "${EGLIBCVERSION}" -PREFERRED_VERSION_eglibc-nativesdk ?= "${EGLIBCVERSION}" +PREFERRED_VERSION_nativesdk-eglibc ?= "${EGLIBCVERSION}" PREFERRED_VERSION_eglibc-initial ?= "${EGLIBCVERSION}" -PREFERRED_VERSION_eglibc-initial-nativesdk ?= "${EGLIBCVERSION}" +PREFERRED_VERSION_nativesdk-eglibc-initial ?= "${EGLIBCVERSION}" PREFERRED_VERSION_cross-localedef-native ?= "${EGLIBCVERSION}" PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}" PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}" diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 20d94b218b..50b4027bd6 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -7,7 +7,7 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache): def isCross(x): return x.endswith("-cross") or x.endswith("-cross-initial") or x.endswith("-cross-intermediate") def isNativeSDK(x): - return x.endswith("-nativesdk") + return x.startswith("nativesdk-") def isKernel(fn): inherits = " ".join(dataCache.inherits[fn]) return inherits.find("module-base.bbclass") != -1 or inherits.find("linux-kernel-base.bbclass") != -1 diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 1984c74c6d..8f35f56d1b 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ X11DEPENDS = "virtual/libx11 libsm" DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" DEPENDS_virtclass-native = "expat-native virtual/libintl-native" -DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11" +DEPENDS_virtclass-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11" INC_PR = "r3" diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc index d6bdcb5f2e..296afdef6e 100644 --- a/meta/recipes-core/eglibc/eglibc-locale.inc +++ b/meta/recipes-core/eglibc/eglibc-locale.inc @@ -17,7 +17,7 @@ do_compile[noexec] = "1" # default to disabled ENABLE_BINARY_LOCALE_GENERATION ?= "0" -ENABLE_BINARY_LOCALE_GENERATION_pn-eglibc-locale-nativesdk = "0" +ENABLE_BINARY_LOCALE_GENERATION_pn-nativesdk-eglibc-locale = "0" #enable locale generation on these arches # BINARY_LOCALE_ARCHES is a space separated list of regular expressions @@ -29,16 +29,13 @@ LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" PR = "r22" -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" +PROVIDES = "virtual/libc-locale" -PROVIDES = "virtual/libc-locale${PKGSUFFIX}" - -PACKAGES = "localedef${PKGSUFFIX} ${PN}-dbg" +PACKAGES = "localedef ${PN}-dbg" PACKAGES_DYNAMIC = "locale-base-* \ eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ - glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" + glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" # Create a eglibc-binaries package ALLOW_EMPTY_${BPN}-binaries = "1" @@ -67,7 +64,7 @@ DESCRIPTION_localedef = "eglibc: compile locale definition files" # Explicitly add ${MLPREFIX} for FILES_eglibc-gconv. FILES_${MLPREFIX}eglibc-gconv = "${libdir}/gconv/*" FILES_${PN}-dbg += "${libdir}/gconv/.debug/*" -FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" +FILES_localedef = "${bindir}/localedef" LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}" @@ -93,6 +90,6 @@ do_install () { inherit libc-package -do_install[depends] += "virtual/${MLPREFIX}libc${PKGSUFFIX}:do_populate_sysroot" +do_install[depends] += "virtual/${MLPREFIX}libc:do_populate_sysroot" BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index af784565d4..bd46cb8561 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -17,47 +17,44 @@ python __anonymous () { # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" - -PACKAGES = "${PN}-dbg catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-mtrace ${PN}-utils eglibc-thread-db${PKGSUFFIX} ${PN}-pic libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN} eglibc-extra-nss${PKGSUFFIX}" +PACKAGES = "${PN}-dbg catchsegv sln nscd ldd ${PN}-mtrace ${PN}-utils eglibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN} eglibc-extra-nss" # The ld.so in this eglibc supports the GNU_HASH -RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)" -RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" -RPROVIDES_${PN}-mtrace = "glibc${PKGSUFFIX}-mtrace libc-mtrace" -RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" -RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" -RPROVIDES_${PN}-staticdev = "glibc${PKGSUFFIX}-staticdev" -RPROVIDES_${PN}-doc = "glibc${PKGSUFFIX}-doc" -RPROVIDES_eglibc-extra-nss${PKGSUFFIX} = "glibc-extra-nss${PKGSUFFIX}" -RPROVIDES_eglibc-thread-db${PKGSUFFIX} = "glibc-thread-db${PKGSUFFIX}" -RPROVIDES_${PN}-pcprofile = "glibc${PKGSUFFIX}-pcprofile" -RPROVIDES_${PN}-dbg = "glibc-dbg${PKGSUFFIX}" +RPROVIDES_${PN} = "glibc rtld(GNU_HASH)" +RPROVIDES_${PN}-utils = "glibc-utils" +RPROVIDES_${PN}-mtrace = "glibc-mtrace libc-mtrace" +RPROVIDES_${PN}-pic = "glibc-pic" +RPROVIDES_${PN}-dev = "glibc-dev" +RPROVIDES_${PN}-staticdev = "glibc-staticdev" +RPROVIDES_${PN}-doc = "glibc-doc" +RPROVIDES_eglibc-extra-nss = "glibc-extra-nss" +RPROVIDES_eglibc-thread-db = "glibc-thread-db" +RPROVIDES_${PN}-pcprofile = "glibc-pcprofile" +RPROVIDES_${PN}-dbg = "glibc-dbg" 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}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}" -FILES_ldd${PKGSUFFIX} = "${bindir}/ldd" -FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*" -FILES_libcidn${PKGSUFFIX} = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" -FILES_libmemusage${PKGSUFFIX} = "${base_libdir}/libmemusage.so" -FILES_eglibc-extra-nss${PKGSUFFIX} = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" -FILES_sln${PKGSUFFIX} = "/sbin/sln" +FILES_ldd = "${bindir}/ldd" +FILES_libsegfault = "${base_libdir}/libSegFault*" +FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" +FILES_libmemusage = "${base_libdir}/libmemusage.so" +FILES_eglibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" +FILES_sln = "/sbin/sln" FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" -FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so" +FILES_libsotruss = "${libdir}/audit/sotruss-lib.so" FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" FILES_${PN}-dev += "${bindir}/rpcgen ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" -FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" +FILES_nscd = "${sbindir}/nscd*" FILES_${PN}-mtrace = "${bindir}/mtrace" FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" -FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" -RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" +FILES_catchsegv = "${bindir}/catchsegv" +RDEPENDS_catchsegv = "libsegfault" RDEPENDS_${PN}-utils += "bash" RDEPENDS_${PN}-mtrace += "perl" FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" -FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" +FILES_eglibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" RPROVIDES_${PN}-dev += "libc-dev" RPROVIDES_${PN}-staticdev += "libc-staticdev" @@ -65,8 +62,8 @@ SUMMARY_sln = "The static ln." DESCRIPTION_sln = "Similar to the 'ln' utility, but statically linked. sln is useful to make symbolic links to dynamic libraries if the dynamic linking system, for some reason, is not functional." SUMMARY_nscd = "Name service cache daemon" DESCRIPTION_nscd = "nscd, name service cache daemon, caches name service lookups for the passwd, group and hosts information. It can damatically improvide performance with remote, such as NIS or NIS+, name services." -SUMMARY_eglibc-extra-nss${PKGSUFFIX} = "hesiod, NIS and NIS+ nss libraries" -DESCRIPTION_eglibc-extra-nss${PKGSUFFIX} = "eglibc: nis, nisplus and hesiod search services." +SUMMARY_eglibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" +DESCRIPTION_eglibc-extra-nss = "eg |