Re: [PATCH 11/17] eglibc: fix packaging of some of nativesdk packages

Re: [PATCH 11/17] eglibc: fix packaging of some of nativesdk packages

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1127 bytes --]

Hi,

after this patch PKGSUFFIX is probably evaluated too late and this:

# PREFERRED_PROVIDER_glibc-thread-db=eglibc-thread-db
PREFERRED_PROVIDER_glibc-thread-db="eglibc-thread-db"
# RPROVIDES_eglibc-thread-db${PKGSUFFIX}=glibc-thread-db${PKGSUFFIX}
RPROVIDES_eglibc-thread-db="glibc-thread-db"

doesn't seem to work as expected and gdb pulls whole
external-csl-toolchain as glibc-thread-db provider for

RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "

and btw:
ERROR: external-poky-toolchain: Recipe file does not have license file information (LIC_FILES_CHKSUM)
ERROR: Licensing Error: LIC_FILES_CHKSUM does not match, please fix

and sign of this behavior is also qemu-native pulled to build and
warnings like this also for virtual/libc virtual/linux-libc-headers

ERROR: Multiple .bb files are due to be built which each provide virtual/libiconv
(/OE/shr-core/openembedded-core/meta/recipes-core/eglibc/eglibc_2.13.bb
 /OE/shr-core/openembedded-core/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb).

Regards,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 11/17] eglibc: fix packaging of some of nativesdk packages

[Richard Purdie]

On Thu, 2011-09-22 at 14:04 +0200, Martin Jansa wrote:
> Hi,
> 
> after this patch PKGSUFFIX is probably evaluated too late and this:
> 
> # PREFERRED_PROVIDER_glibc-thread-db=eglibc-thread-db
> PREFERRED_PROVIDER_glibc-thread-db="eglibc-thread-db"
> # RPROVIDES_eglibc-thread-db${PKGSUFFIX}=glibc-thread-db${PKGSUFFIX}
> RPROVIDES_eglibc-thread-db="glibc-thread-db"
> 
> doesn't seem to work as expected and gdb pulls whole
> external-csl-toolchain as glibc-thread-db provider for
> 
> RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
> 
> and btw:
> ERROR: external-poky-toolchain: Recipe file does not have license file information (LIC_FILES_CHKSUM)
> ERROR: Licensing Error: LIC_FILES_CHKSUM does not match, please fix
> 
> and sign of this behavior is also qemu-native pulled to build and
> warnings like this also for virtual/libc virtual/linux-libc-headers
> 
> ERROR: Multiple .bb files are due to be built which each provide virtual/libiconv
> (/OE/shr-core/openembedded-core/meta/recipes-core/eglibc/eglibc_2.13.bb
>  /OE/shr-core/openembedded-core/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb).

Agreed, there are problems here. I'm short on time and wanted to unbreak
master so I reverted the patch.

Cheers,

Richard

Re: [PATCH 11/17] eglibc: fix packaging of some of nativesdk packages

[Dmitry Eremin-Solenikov]

On 09/22/2011 04:04 PM, Martin Jansa wrote:
> Hi,
>
> after this patch PKGSUFFIX is probably evaluated too late and this:
>
> # PREFERRED_PROVIDER_glibc-thread-db=eglibc-thread-db
> PREFERRED_PROVIDER_glibc-thread-db="eglibc-thread-db"
> # RPROVIDES_eglibc-thread-db${PKGSUFFIX}=glibc-thread-db${PKGSUFFIX}
> RPROVIDES_eglibc-thread-db="glibc-thread-db"

The strange thing is that if I remove the PKGSUFFIX lines for 
eglibc-thread-db/eglibc-extra-nss, and put the following lines in, 
everyghing is working for me.

RPROVIDES_eglibc-extra-nss = "glibc-extra-nss"
RPROVIDES_eglibc-thread-db = "glibc-thread-db"
RPROVIDES_eglibc-extra-nss-nativesdk = "glibc-extra-nss-nativesdk"
RPROVIDES_eglibc-thread-db-nativesdk = "glibc-thread-db-nativesdk"

Also the following lines seem to work:

RPROVIDES_${PN}-extra-nss = "glibc${PKGSUFFIX}-extra-nss"
RPROVIDES_${PN}-thread-db = "glibc${PKGSUFFIX}-thread-db"


Could you please test that it works for you?

> doesn't seem to work as expected and gdb pulls whole
> external-csl-toolchain as glibc-thread-db provider for
>
> RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
>
> and btw:
> ERROR: external-poky-toolchain: Recipe file does not have license file information (LIC_FILES_CHKSUM)
> ERROR: Licensing Error: LIC_FILES_CHKSUM does not match, please fix
>
> and sign of this behavior is also qemu-native pulled to build and
> warnings like this also for virtual/libc virtual/linux-libc-headers
>
> ERROR: Multiple .bb files are due to be built which each provide virtual/libiconv
> (/OE/shr-core/openembedded-core/meta/recipes-core/eglibc/eglibc_2.13.bb
>   /OE/shr-core/openembedded-core/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb).
>
> Regards,
>
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[PATCH 11/17] eglibc: fix packaging of some of nativesdk packages

[Dmitry Eremin-Solenikov]

eglibc.inc contains packaging rules that depend on PKGSUFFIX expansion.
However that variable wasn't expanded properly in some case. E.g.

PACKAGES = " ... nscd${PKGSUFFIX} ..."
FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"

would be expanded to

PACKAGES = " ... nscd-nativesdk ..."
FILES_nscd = "${sbindir}/nscd*"

Thus leading to empty -nativesdk packages and missing files. To overcome
that use python code blob to properly define PKGSUFFIX variable.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 meta/recipes-core/eglibc/eglibc-locale.inc  |   13 +++++++++----
 meta/recipes-core/eglibc/eglibc-package.inc |    9 +++++++--
 meta/recipes-core/eglibc/eglibc_2.12.bb     |    2 +-
 meta/recipes-core/eglibc/eglibc_2.13.bb     |    2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index 9424ff5..cfc7d84 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -26,10 +26,15 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
 # set "0" for qemu emulation of native localedef for locale generation
 LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
 
-PR = "r16"
-
-PKGSUFFIX = ""
-PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
+PR = "r17"
+
+python __anonymous () {
+    import bb
+    if bb.data.inherits_class("nativesdk", d):
+        bb.data.setVar("PKGSUFFIX", "-nativesdk", d)
+    else:
+        bb.data.setVar("PKGSUFFIX", "", d)
+}
 
 PROVIDES = "virtual/libc-locale${PKGSUFFIX}"
 
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 519a49c..dc6fce0 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -17,8 +17,13 @@ python __anonymous () {
 # Set this to zero if you don't want ldconfig in the output package
 USE_LDCONFIG ?= "1"
 
-PKGSUFFIX = ""
-PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
+python __anonymous () {
+    import bb
+    if bb.data.inherits_class("nativesdk", d):
+        bb.data.setVar("PKGSUFFIX", "-nativesdk", d)
+    else:
+        bb.data.setVar("PKGSUFFIX", "", d)
+}
 
 PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}"
 
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index a9d208b..7a1a569 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -1,7 +1,7 @@
 require eglibc.inc
 
 DEPENDS += "gperf-native"
-PR = "r24"
+PR = "r25"
 
 SRCREV = "14158"
 
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index b549496..e172785 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "14157"
 
 DEPENDS += "gperf-native"
-PR = "r15"
+PR = "r16"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_13"
-- 
1.7.2.5