[PATCH 0/5] Misc fixings of nativesdk

[PATCH 0/5] Misc fixings of nativesdk

[Lianhao Lu]

This patch serie fixed bunch of things for nativesdk recipes, including:

1. Fixed the issue of reading in incorrect pkgdata files of do_package_write_xxx.
2. Avoided crosssdk tasks generating different task hashs for different MACHINE.
3. Dropped unnecessary target tasks for nativesdk.

The following changes since commit 627998726ca3ee2ed2510c0f666747f688d06c56:
  Steffen Sledz (1):
        docbook-utils-native: fix syntax problem in jw.in

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib llu/nativesdkfixing
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/nativesdkfixing

Lianhao Lu (5):
  nativesdk.bbclass: Set PACKAGE_ARCHS to SDK_PACKAGE_ARCHS.
  crosssdk.bbclass: Set TUNE_PKGARCH to SDK_PKGARCH.
  autotools.bbclass: Drop -nativesdk dependency to lib-cross.
  eglibc-nativesdk: Set GCC_ADDONS.
  pkgconfig.bbclass: corrected dependency for -nativesdk.

 meta/classes/autotools.bbclass          |    1 +
 meta/classes/crosssdk.bbclass           |    5 +++++
 meta/classes/nativesdk.bbclass          |    8 +-------
 meta/classes/pkgconfig.bbclass          |    1 +
 meta/recipes-core/eglibc/eglibc_2.13.bb |    3 ++-
 meta/recipes-core/eglibc/eglibc_2.15.bb |    3 ++-
 6 files changed, 12 insertions(+), 9 deletions(-)

[PATCH 1/5] nativesdk.bbclass: Set PACKAGE_ARCHS to SDK_PACKAGE_ARCHS.

[Lianhao Lu]

This patch fixed the issue of reading incorrect pkgdata files. Previous
appending '-nativesdk' suffix to PACKAGE_ARCHS would result the
i686-nativesdk recipes reading in x86_64-nativesdk pkgdata files if the
MACHINE is set to qemux86-64.

Fixed bug [YOCTO #2203].

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
 meta/classes/nativesdk.bbclass |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 97c460c..9e20834 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -13,13 +13,7 @@ LIBCOVERRIDE = ""
 # Update PACKAGE_ARCH and PACKAGE_ARCHS
 #
 PACKAGE_ARCH = "${SDK_ARCH}-nativesdk"
-python () {
-    archs = d.getVar('PACKAGE_ARCHS', True).split()
-    sdkarchs = []
-    for arch in archs:
-        sdkarchs.append(arch + '-nativesdk')
-    d.setVar('PACKAGE_ARCHS', " ".join(sdkarchs))
-}
+PACKAGE_ARCHS = "${SDK_PACKAGE_ARCHS}"
 
 STAGING_DIR_HOST = "${STAGING_DIR}/${MULTIMACH_HOST_SYS}"
 STAGING_DIR_TARGET = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}"
-- 
1.7.0.4

[PATCH 2/5] crosssdk.bbclass: Set TUNE_PKGARCH to SDK_PKGARCH.

[Lianhao Lu]

The TUNE_PKGARCH of crosssdk should be set to SDK_ARCH, not the one
from target machine's configuration.

Fixed bug [YOCTO #2206]

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
 meta/classes/crosssdk.bbclass |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass
index 83753b4..67df236 100644
--- a/meta/classes/crosssdk.bbclass
+++ b/meta/classes/crosssdk.bbclass
@@ -1,6 +1,11 @@
 inherit cross
 
 PACKAGE_ARCH = "${SDK_ARCH}"
+python () {
+	# set TUNE_PKGARCH to SDK_ARCH
+	d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH', True))
+}
+
 STAGING_DIR_TARGET = "${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
 STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
 
-- 
1.7.0.4

[PATCH 3/5] autotools.bbclass: Drop -nativesdk dependency to lib-cross.

[Lianhao Lu]

-nativesdk recipes should not have dependency to lib-cross, which is
never used. This unnecessary dependency would result different task hash
values in sstate for different MACHINE settings.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
 meta/classes/autotools.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 66eba9f..941c06d 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -12,6 +12,7 @@ def autotools_dep_prepend(d):
 	if not pn in ['libtool', 'libtool-native'] and not pn.endswith("libtool-cross"):
 		deps += 'libtool-native '
 		if not bb.data.inherits_class('native', d) \
+                        and not bb.data.inherits_class('nativesdk', d) \
                         and not bb.data.inherits_class('cross', d) \
                         and not d.getVar('INHIBIT_DEFAULT_DEPS', True):
                     deps += 'libtool-cross '
-- 
1.7.0.4

[PATCH 4/5] eglibc-nativesdk: Set GCC_ADDONS.

[Lianhao Lu]

Set only necessary GCC_ADDONS for eglibc-nativesdk so that it is not
dependant on the target eglibc's GCC_ADDONS settings.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
 meta/recipes-core/eglibc/eglibc_2.13.bb |    3 ++-
 meta/recipes-core/eglibc/eglibc_2.15.bb |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index e02c80f..e480772 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 = "15508"
 
 DEPENDS += "gperf-native"
-PR = "r22"
+PR = "r23"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_13"
@@ -37,6 +37,7 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
 GLIBC_ADDONS ?= "ports,nptl,libidn"
+GLIBC_ADDONS_virtclass-nativesdk = "nptl"
 
 GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
 
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index 75ccace..4e7fe1e 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "17386"
 
 DEPENDS += "gperf-native"
-PR = "r2"
+PR = "r3"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_15"
@@ -42,6 +42,7 @@ BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
 GLIBC_ADDONS ?= "ports,nptl,libidn"
+GLIBC_ADDONS_virtclass-nativesdk = "nptl"
 
 GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
 
-- 
1.7.0.4

Re: [PATCH 4/5] eglibc-nativesdk: Set GCC_ADDONS.

[Richard Purdie]

On Sat, 2012-03-31 at 14:49 +0800, Lianhao Lu wrote:
> Set only necessary GCC_ADDONS for eglibc-nativesdk so that it is not
> dependant on the target eglibc's GCC_ADDONS settings.

You mean GLIBC_ADDONS, right? :)

> Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
> ---
>  meta/recipes-core/eglibc/eglibc_2.13.bb |    3 ++-
>  meta/recipes-core/eglibc/eglibc_2.15.bb |    3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)

This is a tricky problem as this is only correct for SDKMACHINEs which
are IA based (which the only tested combinations are atm).

Ideally this would go in conf/machine-sdk/* as SDK_GLIBC_ADDONS and then
in eglibc.inc we'd do:

GLIBC_ADDONS ?= "ports,nptl,libidn"
SDK_GLIBC_ADDONS ?= "${GLIBC_ADDONS}"
GLIBC_ADDONS_virtclass-nativesdk = "${SDK_GLIBC_ADDONS}"

which I appreciate is more complex but I think its more correct in case
someone wants to try a different SDKMACHINE.

Cheers,

Richard

Re: [PATCH 4/5] eglibc-nativesdk: Set GCC_ADDONS.

[Khem Raj]

On Fri, Mar 30, 2012 at 11:49 PM, Lianhao Lu <lianhao.lu@intel.com> wrote:
>
>  GLIBC_ADDONS ?= "ports,nptl,libidn"
> +GLIBC_ADDONS_virtclass-nativesdk = "nptl"

nptl is bogus now a days. so please delete it completely.

Re: [PATCH 4/5] eglibc-nativesdk: Set GCC_ADDONS.

[Khem Raj]

On Sat, Mar 31, 2012 at 7:39 AM, Khem Raj <raj.khem@gmail.com> wrote:
> nptl is bogus now a days. so please delete it completely.

heh I must have said in GLIBC_ADDON context its bogus. Since its _the_
only thread implementation in eglibc/glibc

Re: [PATCH 4/5] eglibc-nativesdk: Set GCC_ADDONS.

[Lu, Lianhao]

I've recreated the patches per Richard's comment. However, removing nptl from the add-on settings resulted an eglibc configure error saying that it is an required add-on. 

-Lianhao

Khem Raj wrote on 2012-03-31:
> On Sat, Mar 31, 2012 at 7:39 AM, Khem Raj <raj.khem@gmail.com> wrote:
>> nptl is bogus now a days. so please delete it completely.
> 
> heh I must have said in GLIBC_ADDON context its bogus. Since its _the_
> only thread implementation in eglibc/glibc
> 
> _______________________________________________ Openembedded-core
> mailing list Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 4/5] eglibc-nativesdk: Set GCC_ADDONS.

[Khem Raj]

On Mon, Apr 2, 2012 at 5:22 PM, Lu, Lianhao <lianhao.lu@intel.com> wrote:
> I've recreated the patches per Richard's comment. However, removing nptl from the add-on settings resulted an eglibc configure error saying that it is an required add-on.

hmm interesting. I will see whats going on there.

[PATCH 5/5] pkgconfig.bbclass: corrected dependency for -nativesdk.

[Lianhao Lu]

For -nativesdk, the dependency should be pkgconfig-nativesdk instead of
pkgconfig.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
 meta/classes/pkgconfig.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/classes/pkgconfig.bbclass b/meta/classes/pkgconfig.bbclass
index 53e793a..ddcf878 100644
--- a/meta/classes/pkgconfig.bbclass
+++ b/meta/classes/pkgconfig.bbclass
@@ -2,5 +2,6 @@ DEPENDS_prepend = "pkgconfig-native "
 
 PKGCONFIGRDEP = "pkgconfig"
 PKGCONFIGRDEP_virtclass-native = ""
+PKGCONFIGRDEP_virtclass-nativesdk = "pkgconfig-nativesdk"
 
 RDEPENDS_${PN}-dev += "${PKGCONFIGRDEP}"
-- 
1.7.0.4

Re: [PATCH 0/5] Misc fixings of nativesdk

[Richard Purdie]

On Sat, 2012-03-31 at 14:49 +0800, Lianhao Lu wrote:
> This patch serie fixed bunch of things for nativesdk recipes, including:
> 
> 1. Fixed the issue of reading in incorrect pkgdata files of do_package_write_xxx.
> 2. Avoided crosssdk tasks generating different task hashs for different MACHINE.
> 3. Dropped unnecessary target tasks for nativesdk.
> 
> The following changes since commit 627998726ca3ee2ed2510c0f666747f688d06c56:
>   Steffen Sledz (1):
>         docbook-utils-native: fix syntax problem in jw.in
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib llu/nativesdkfixing
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/nativesdkfixing
> 
> Lianhao Lu (5):
>   nativesdk.bbclass: Set PACKAGE_ARCHS to SDK_PACKAGE_ARCHS.
>   crosssdk.bbclass: Set TUNE_PKGARCH to SDK_PKGARCH.
>   autotools.bbclass: Drop -nativesdk dependency to lib-cross.
>   eglibc-nativesdk: Set GCC_ADDONS.
>   pkgconfig.bbclass: corrected dependency for -nativesdk.

I merged these apart from the eglibc patch which needs some small tweaks
before it goes in.

Cheers,

Richard