[e]glibc-package.inc: fix multiple providers for glibc-gconv-iso8859-1
This commit fixes the following error while doing this: bitbake poky-image-sato ERROR: Conflicting PREFERRED_PROVIDER entries were found which resulted in an attempt to select multiple providers (['virtual:nativesdk:/distro/dcui/dexuan/meta/recipes-core/eglibc/eglibc_2.12.bb', '/distro/dcui/dexuan/meta/recipes-core/eglibc/eglibc_2.12.bb']) for runtime dependency glibc-gconv-iso8859-1 The entries resulting in this conflict were: ['PREFERRED_PROVIDER_virtual/libc-nativesdk = eglibc-nativesdk', 'PREFERRED_PROVIDER_virtual/libc = eglibc'] NOTE: multiple providers are available for runtime glibc-gconv-iso8859-1 (eglibc, eglibc-nativesdk, glibc-nativesdk, glibc, external-csl-toolchain, external-poky-toolchain) NOTE: consider defining a PREFERRED_PROVIDER entry to match glibc-gconv-iso8859-1 And bumped PR. This partly fixes [BUGID #329] Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
This commit is contained in:
parent
11a92051e7
commit
8c33bfc84a
|
@ -35,7 +35,7 @@ PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
|
|||
PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} localedef${PKGSUFFIX} ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc eglibc-locale libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db eglibc-pcprofile"
|
||||
|
||||
PACKAGES_DYNAMIC = " \
|
||||
glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* \
|
||||
glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* \
|
||||
eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \
|
||||
locale-base-*"
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ require eglibc.inc
|
|||
|
||||
DEPENDS += "gperf-native"
|
||||
FILESPATHPKG =. "eglibc-svn:"
|
||||
PR = "r6"
|
||||
PR = "r7"
|
||||
SRCREV="10809"
|
||||
EGLIBC_BRANCH="eglibc-2_12"
|
||||
SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
|
||||
|
|
|
@ -35,7 +35,7 @@ PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFI
|
|||
${PN}-locale libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \
|
||||
${PN}-pcprofile"
|
||||
|
||||
PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* \
|
||||
PACKAGES_DYNAMIC = "glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* locale-base-* \
|
||||
glibc-binary-localedata-*"
|
||||
|
||||
libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* \
|
||||
|
|
|
@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
|
|||
PACKAGES_DYNAMIC = "libc6*"
|
||||
RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
|
||||
|
||||
PR = "r4"
|
||||
PR = "r5"
|
||||
|
||||
# the -isystem in bitbake.conf screws up glibc do_stage
|
||||
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
|
||||
|
|
Loading…
Reference in New Issue