[PATCH 0/2] Few bugfixes

[PATCH 0/2] Few bugfixes

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

The following changes since commit 46600e37cf87e9aa68e70f1d21caad8eac974a24:

  elfutils: disable lzma (and bzip2 for native) (2012-04-03 21:32:34 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib nitin/bugfixes
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/bugfixes

Nitin A Kamble (2):
  gcc-cross-intermediate: fix do_install for x32
  eglibc packaging: locale packaging configuration

 meta/classes/libc-package.bbclass                  |    8 ++++++++
 meta/recipes-core/eglibc/eglibc-options.inc        |    6 ------
 .../gcc/gcc-cross-intermediate.inc                 |    3 ++-
 3 files changed, 10 insertions(+), 7 deletions(-)

-- 
1.7.7.6

[PATCH 1/2] gcc-cross-intermediate: fix do_install for x32

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

This Fixes [Ycoto #2223] bug.

The gcc osdir is obtained in the do_install by invocation of
command "gcc -print-multi-os-directory". For x32 it returns gcc
osdir for the default abi which is x86_64. Fix this by adding
target abi parameter to the gcc command line to get correct gcc
osdir with invocation of command "gcc -mx32 -print-multi-os-directory"

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../gcc/gcc-cross-intermediate.inc                 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index 316a764..1995725 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -35,9 +35,10 @@ do_compile () {
 }
 
 do_install () {
+	set -x
 	oe_runmake 'DESTDIR=${D}' install
 	install -d ${D}${target_base_libdir}/
-	osdir=`${D}${STAGING_BINDIR_TOOLCHAIN}.${PN}/${TARGET_PREFIX}gcc -print-multi-os-directory`
+	osdir=`${D}${STAGING_BINDIR_TOOLCHAIN}.${PN}/${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} -print-multi-os-directory`
 	mv ${D}${exec_prefix}/${TARGET_SYS}/lib/$osdir/* ${D}${target_base_libdir}/
 
 	# We don't really need this (here shares/ contains man/, info/, locale/).
-- 
1.7.7.6

[PATCH 2/2] eglibc packaging: locale packaging configuration

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

The PACKAGE_NO_GCONV var manipulations ware happening in the
eglibc-options.inc file, and the eglibc-locale recipe do not
see it. Moving that into the libc-package.bbclass which is
common to eglibc & eglibc-locale recipes.

This fixes bug: [YOCTO #2089]

This avoids this error for poky-tiny
NOTE: package eglibc-locale-2.13-r19: task do_populate_sysroot: Started
ERROR: Error executing a python function in
/opt/poky.git/meta/recipes-core/eglibc/eglibc-locale_2.13.bb:
OSError: [Errno 2] No such file or directory:
'/home/rchatre/concordia/dev/ccd-distro-work/tmp/work/core2-poky-linux/eglibc-locale-2.13-r19/package/usr/lib/gconv'

ERROR: The stack trace of python calls that resulted in this exception/failure
was:
ERROR:   File "package_do_split_gconvs", line 264, in <module>
ERROR:·
ERROR:   File "package_do_split_gconvs", line 45, in package_do_split_gconvs
ERROR:·
ERROR:   File "package.bbclass", line 30, in do_split_packages
ERROR:·
ERROR: The code that was being executed was:
ERROR:      0260:»------»-------bb.note("generation of binary locales disabled.
this may break i18n!")
ERROR:      0261:
ERROR:      0262:
ERROR:      0263:
ERROR:  *** 0264:package_do_split_gconvs(d)
ERROR:      0265:
ERROR: (file: 'package_do_split_gconvs', lineno: 264, function: <module>)
ERROR:      0041:»------»-------»-------d.setVar('RPROVIDES_%s' % pkg,
pkg.replace(bpn, 'glibc'))
ERROR:      0042:
ERROR:      0043:»------do_split_packages(d, gconv_libdir,
file_regex='^(.*)\.so$', output_pattern=bpn+'-gconv-%s', \
ERROR:      0044:»------»-------description='gconv module for character set
%s', hook=calc_gconv_deps, \
ERROR:  *** 0045:»------»-------extra_depends=bpn+'-gconv')
ERROR:      0046:
ERROR:      0047:»------def calc_charmap_deps(fn, pkg, file_regex,
output_pattern, group):
ERROR:      0048:»------»-------deps = []
ERROR:      0049:»------»-------f = open(fn, "r")
ERROR: (file: 'package_do_split_gconvs', lineno: 45, function:
package_do_split_gconvs)
ERROR: Function failed: package_do_split_gconvs
ERROR: Logfile of failure stored in:
/home/rchatre/concordia/dev/ccd-distro-work/tmp/work/core2-poky-linux/eglibc-locale-2.13-r19/temp/log.do_package.31042
NOTE: package eglibc-locale-2.13-r19: task do_package: Failed
ERROR: Task 552 (/opt/poky.git/meta/recipes-core/eglibc/eglibc-locale_2.13.bb,
do_package) failed with exit code '1'

Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/classes/libc-package.bbclass           |    8 ++++++++
 meta/recipes-core/eglibc/eglibc-options.inc |    6 ------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 957243d..7cde770 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -35,6 +35,14 @@ python __anonymous () {
                 d.setVar("DEPENDS", depends)
                 d.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "compile")
                 break
+
+    distro_features = (d.getVar('DISTRO_FEATURES', True) or '').split()
+
+    # try to fix disable charsets/locales/locale-code compile fail
+    if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features:
+        d.setVar('PACKAGE_NO_GCONV', '0')
+    else:
+        d.setVar('PACKAGE_NO_GCONV', '1')
 }
 
 OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc
index baf4f4b..bd90ee7 100644
--- a/meta/recipes-core/eglibc/eglibc-options.inc
+++ b/meta/recipes-core/eglibc/eglibc-options.inc
@@ -126,10 +126,4 @@ def features_to_eglibc_settings(d):
         eglibc_cfg('libc-posix-regexp-glibc',      distro_features, 'OPTION_POSIX_REGEXP_GLIBC', cnf)
         eglibc_cfg('libc-posix-wchar-io',      distro_features, 'OPTION_POSIX_WIDE_CHAR_DEVICE_IO', cnf)
 
-        # try to fix disable charsets/locales/locale-code compile fail
-        if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features:
-            d.setVar('PACKAGE_NO_GCONV', '0')
-        else:
-            d.setVar('PACKAGE_NO_GCONV', '1')
-
         return "\n".join(cnf)
-- 
1.7.7.6

Re: [PATCH 1/2] gcc-cross-intermediate: fix do_install for x32

[Kamble, Nitin A]

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> nitin.a.kamble@intel.com
> Sent: Tuesday, April 03, 2012 3:58 PM
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 1/2] gcc-cross-intermediate: fix do_install
> for x32
> 
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
> 
> This Fixes [Ycoto #2223] bug.
> 
> The gcc osdir is obtained in the do_install by invocation of command
> "gcc -print-multi-os-directory". For x32 it returns gcc osdir for the
> default abi which is x86_64. Fix this by adding target abi parameter to
> the gcc command line to get correct gcc osdir with invocation of
> command "gcc -mx32 -print-multi-os-directory"
> 
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
>  .../gcc/gcc-cross-intermediate.inc                 |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
> b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
> index 316a764..1995725 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
> +++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
> @@ -35,9 +35,10 @@ do_compile () {
>  }
> 
>  do_install () {
> +	set -x

I have removed this debug line from the commit on the contrib branch.
Nitin


>  	oe_runmake 'DESTDIR=${D}' install
>  	install -d ${D}${target_base_libdir}/
> -	osdir=`${D}${STAGING_BINDIR_TOOLCHAIN}.${PN}/${TARGET_PREFIX}gcc
> -print-multi-os-directory`
> +	osdir=`${D}${STAGING_BINDIR_TOOLCHAIN}.${PN}/${TARGET_PREFIX}gcc
> +${TARGET_CC_ARCH} -print-multi-os-directory`
>  	mv ${D}${exec_prefix}/${TARGET_SYS}/lib/$osdir/*
> ${D}${target_base_libdir}/
> 
>  	# We don't really need this (here shares/ contains man/, info/,
> locale/).
> --
> 1.7.7.6
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 2/2] eglibc packaging: locale packaging configuration

[Darren Hart]

On 04/03/2012 03:57 PM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
> 
> The PACKAGE_NO_GCONV var manipulations ware happening in the
> eglibc-options.inc file, and the eglibc-locale recipe do not
> see it. Moving that into the libc-package.bbclass which is
> common to eglibc & eglibc-locale recipes.
> 
> This fixes bug: [YOCTO #2089]

This looks like a better fix to me!

--
Darren

> 
> This avoids this error for poky-tiny
> NOTE: package eglibc-locale-2.13-r19: task do_populate_sysroot: Started
> ERROR: Error executing a python function in
> /opt/poky.git/meta/recipes-core/eglibc/eglibc-locale_2.13.bb:
> OSError: [Errno 2] No such file or directory:
> '/home/rchatre/concordia/dev/ccd-distro-work/tmp/work/core2-poky-linux/eglibc-locale-2.13-r19/package/usr/lib/gconv'
> 
> ERROR: The stack trace of python calls that resulted in this exception/failure
> was:
> ERROR:   File "package_do_split_gconvs", line 264, in <module>
> ERROR:·
> ERROR:   File "package_do_split_gconvs", line 45, in package_do_split_gconvs
> ERROR:·
> ERROR:   File "package.bbclass", line 30, in do_split_packages
> ERROR:·
> ERROR: The code that was being executed was:
> ERROR:      0260:»------»-------bb.note("generation of binary locales disabled.
> this may break i18n!")
> ERROR:      0261:
> ERROR:      0262:
> ERROR:      0263:
> ERROR:  *** 0264:package_do_split_gconvs(d)
> ERROR:      0265:
> ERROR: (file: 'package_do_split_gconvs', lineno: 264, function: <module>)
> ERROR:      0041:»------»-------»-------d.setVar('RPROVIDES_%s' % pkg,
> pkg.replace(bpn, 'glibc'))
> ERROR:      0042:
> ERROR:      0043:»------do_split_packages(d, gconv_libdir,
> file_regex='^(.*)\.so$', output_pattern=bpn+'-gconv-%s', \
> ERROR:      0044:»------»-------description='gconv module for character set
> %s', hook=calc_gconv_deps, \
> ERROR:  *** 0045:»------»-------extra_depends=bpn+'-gconv')
> ERROR:      0046:
> ERROR:      0047:»------def calc_charmap_deps(fn, pkg, file_regex,
> output_pattern, group):
> ERROR:      0048:»------»-------deps = []
> ERROR:      0049:»------»-------f = open(fn, "r")
> ERROR: (file: 'package_do_split_gconvs', lineno: 45, function:
> package_do_split_gconvs)
> ERROR: Function failed: package_do_split_gconvs
> ERROR: Logfile of failure stored in:
> /home/rchatre/concordia/dev/ccd-distro-work/tmp/work/core2-poky-linux/eglibc-locale-2.13-r19/temp/log.do_package.31042
> NOTE: package eglibc-locale-2.13-r19: task do_package: Failed
> ERROR: Task 552 (/opt/poky.git/meta/recipes-core/eglibc/eglibc-locale_2.13.bb,
> do_package) failed with exit code '1'
> 
> Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
>  meta/classes/libc-package.bbclass           |    8 ++++++++
>  meta/recipes-core/eglibc/eglibc-options.inc |    6 ------
>  2 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
> index 957243d..7cde770 100644
> --- a/meta/classes/libc-package.bbclass
> +++ b/meta/classes/libc-package.bbclass
> @@ -35,6 +35,14 @@ python __anonymous () {
>                  d.setVar("DEPENDS", depends)
>                  d.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "compile")
>                  break
> +
> +    distro_features = (d.getVar('DISTRO_FEATURES', True) or '').split()
> +
> +    # try to fix disable charsets/locales/locale-code compile fail
> +    if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features:
> +        d.setVar('PACKAGE_NO_GCONV', '0')
> +    else:
> +        d.setVar('PACKAGE_NO_GCONV', '1')
>  }
>  
>  OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
> diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc
> index baf4f4b..bd90ee7 100644
> --- a/meta/recipes-core/eglibc/eglibc-options.inc
> +++ b/meta/recipes-core/eglibc/eglibc-options.inc
> @@ -126,10 +126,4 @@ def features_to_eglibc_settings(d):
>          eglibc_cfg('libc-posix-regexp-glibc',      distro_features, 'OPTION_POSIX_REGEXP_GLIBC', cnf)
>          eglibc_cfg('libc-posix-wchar-io',      distro_features, 'OPTION_POSIX_WIDE_CHAR_DEVICE_IO', cnf)
>  
> -        # try to fix disable charsets/locales/locale-code compile fail
> -        if 'libc-charsets' in distro_features and 'libc-locales' in distro_features and 'libc-locale-code' in distro_features:
> -            d.setVar('PACKAGE_NO_GCONV', '0')
> -        else:
> -            d.setVar('PACKAGE_NO_GCONV', '1')
> -
>          return "\n".join(cnf)

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Re: [PATCH 0/2] Few bugfixes

[Saul Wold]

On 04/03/2012 03:57 PM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble<nitin.a.kamble@intel.com>
>
> The following changes since commit 46600e37cf87e9aa68e70f1d21caad8eac974a24:
>
>    elfutils: disable lzma (and bzip2 for native) (2012-04-03 21:32:34 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib nitin/bugfixes
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/bugfixes
>
> Nitin A Kamble (2):
>    gcc-cross-intermediate: fix do_install for x32
>    eglibc packaging: locale packaging configuration
>
>   meta/classes/libc-package.bbclass                  |    8 ++++++++
>   meta/recipes-core/eglibc/eglibc-options.inc        |    6 ------
>   .../gcc/gcc-cross-intermediate.inc                 |    3 ++-
>   3 files changed, 10 insertions(+), 7 deletions(-)
>

Merged into OE-Core

Thanks
	Sau!

Re: [PATCH 1/2] gcc-cross-intermediate: fix do_install for x32

[Khem Raj]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 04/03/2012 04:01 PM, Kamble, Nitin A wrote:
> 
> 
>> -----Original Message----- From:
>> openembedded-core-bounces@lists.openembedded.org 
>> [mailto:openembedded-core-bounces@lists.openembedded.org] On
>> Behalf Of nitin.a.kamble@intel.com Sent: Tuesday, April 03, 2012
>> 3:58 PM To: openembedded-core@lists.openembedded.org Subject:
>> [OE-core] [PATCH 1/2] gcc-cross-intermediate: fix do_install for
>> x32
>> 
>> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>> 
>> This Fixes [Ycoto #2223] bug.
>> 
>> The gcc osdir is obtained in the do_install by invocation of
>> command "gcc -print-multi-os-directory". For x32 it returns gcc
>> osdir for the default abi which is x86_64. Fix this by adding
>> target abi parameter to the gcc command line to get correct gcc
>> osdir with invocation of command "gcc -mx32
>> -print-multi-os-directory"


how does it do on ppc64 multilib ?

>> 
>> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> --- 
>> .../gcc/gcc-cross-intermediate.inc                 |    3 ++- 1
>> files changed, 2 insertions(+), 1 deletions(-)
>> 
>> diff --git
>> a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc 
>> b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc index
>> 316a764..1995725 100644 ---
>> a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc +++
>> b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc @@ -35,9
>> +35,10 @@ do_compile () { }
>> 
>> do_install () { +	set -x
> 
> I have removed this debug line from the commit on the contrib
> branch. Nitin
> 
> 
>> oe_runmake 'DESTDIR=${D}' install install -d
>> ${D}${target_base_libdir}/ -
>> osdir=`${D}${STAGING_BINDIR_TOOLCHAIN}.${PN}/${TARGET_PREFIX}gcc 
>> -print-multi-os-directory` +
>> osdir=`${D}${STAGING_BINDIR_TOOLCHAIN}.${PN}/${TARGET_PREFIX}gcc 
>> +${TARGET_CC_ARCH} -print-multi-os-directory` mv
>> ${D}${exec_prefix}/${TARGET_SYS}/lib/$osdir/* 
>> ${D}${target_base_libdir}/
>> 
>> # We don't really need this (here shares/ contains man/, info/, 
>> locale/). -- 1.7.7.6
>> 
>> 
>> _______________________________________________ Openembedded-core
>> mailing list Openembedded-core@lists.openembedded.org 
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>> 
> _______________________________________________ Openembedded-core
> mailing list Openembedded-core@lists.openembedded.org 
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk9/2UUACgkQuwUzVZGdMxRRvwCeN8ulkeVxnXLliRUElg8anFfq
7aMAn0WU8GI58qHMxJxTjXOuQr4p5bPE
=A/xt
-----END PGP SIGNATURE-----

Re: [PATCH 2/2] eglibc packaging: locale packaging configuration

[Khem Raj]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 04/03/2012 03:57 PM, nitin.a.kamble@intel.com wrote:
> + +    distro_features = (d.getVar('DISTRO_FEATURES', True) or 
> '').split() + +    # try to fix disable 
> charsets/locales/locale-code compile fail +    if 'libc-charsets' 
> in distro_features and 'libc-locales' in distro_features and 
> 'libc-locale-code' in distro_features:

can this be implemented using set instead of this long list of if and
and ?

declare a set of libc-charsets libc-locales libc-locale-code
and then check if its disjoint with set constructed from distro_features


> +        d.setVar('PACKAGE_NO_GCONV', '0') +    else: + 
> d.setVar('PACKAGE_NO_GCONV', '1') }

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk9/3WYACgkQuwUzVZGdMxTCCQCfTPWYILOG3TL4zfrKygAl3CTl
DCAAn0B/CtTNVog6FpmRK0MoZpKpBB2b
=vil2
-----END PGP SIGNATURE-----