[PATCH v2 0/5] Make oecore default images buildable with uclibc

[PATCH v2 0/5] Make oecore default images buildable with uclibc

[Khem Raj]

Changes On top of v1

Fixed gettext class to not disable nls for non target recipes

Build core-image-minimal for qemuarm qemumips qemuppc and booted on qemu
successfully

Build for TCLIBC=uclibc from scratch succeeds

The following changes since commit 3d2c1ca9096790e4c6922b65b83ea1dffb90c362:

  util-linux: Replace sigsetmask with posix compliant functions (2011-07-15 18:52:49 -0700)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib kraj/uclibc-oecore
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/uclibc-oecore

Khem Raj (5):
  bitbake.conf: Change TERM default fallback to XTERM instead of
    GNOME_TERM
  oe-buildenv-internal: Replace POKYMODE POKYLIBC with TCMODE and
    TCLIBC
  default-distrovars: Add largefile to DISTRO_FEATURES
  acl,attr: Fix build failures when NLS is disabled on uclibc
  classes/gettext: Do not disable nls for non target recipes

 meta/classes/gettext.bbclass                    |    2 +-
 meta/conf/bitbake.conf                          |    4 ++--
 meta/conf/distro/include/default-distrovars.inc |    3 +--
 meta/recipes-support/attr/acl_2.2.51.bb         |    2 +-
 meta/recipes-support/attr/attr.inc              |    4 ----
 meta/recipes-support/attr/attr_2.4.46.bb        |    2 +-
 meta/recipes-support/attr/ea-acl.inc            |    3 +++
 scripts/oe-buildenv-internal                    |    2 +-
 8 files changed, 10 insertions(+), 12 deletions(-)

-- 
1.7.4.1

[PATCH 1/5] bitbake.conf: Change TERM default fallback to XTERM instead of GNOME_TERM

[Khem Raj]

Its better to use xterm since some folks may not be using gnome
or KDE. Chances of having xterm on build machines are lot more
than having gnome-terminal.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/conf/bitbake.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 463991d..128b0b6 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -571,8 +571,8 @@ KONSOLE_TERMCMD = 'konsole -T "$TERMWINDOWTITLE"'
 KONSOLE_TERMCMDRUN = '${KONSOLE_TERMCMD} -e $SHELLCMDS'
 
 # Set a default
-TERMCMD ?= "${GNOME_TERMCMD}"
-TERMCMDRUN ?= "${GNOME_TERMCMDRUN}"
+TERMCMD ?= "${XTERM_TERMCMD}"
+TERMCMDRUN ?= "${XTERM_TERMCMDRUN}"
 
 ##################################################################
 # Miscellaneous utilities.
-- 
1.7.4.1

[PATCH 2/5] oe-buildenv-internal: Replace POKYMODE POKYLIBC with TCMODE and TCLIBC

[Khem Raj]

These are new variable names in oe-core

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 scripts/oe-buildenv-internal |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 09dbf02..c13fc40 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -55,4 +55,4 @@ unset BITBAKEDIR
 export BUILDDIR
 export PATH
 
-export BB_ENV_EXTRAWHITE="MACHINE DISTRO POKYMODE POKYLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND"
+export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND"
-- 
1.7.4.1

[PATCH 3/5] default-distrovars: Add largefile to DISTRO_FEATURES

[Khem Raj]

This is needed for packages that go into core-image-minimal
highlighted by uclibc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/conf/distro/include/default-distrovars.inc |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index fe8ed22..f9d44a6 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -16,8 +16,7 @@ DISTRO_FEATURES_LIBC ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-
 					libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \
 					libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
 					libc-posix-wchar-io"
-
-DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci 3g ${DISTRO_FEATURES_LIBC}"
+DISTRO_FEATURES ?= "alsa bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi nfs zeroconf pci 3g ${DISTRO_FEATURES_LIBC}"
 
 IMAGE_FEATURES ?= ""
 
-- 
1.7.4.1

[PATCH 4/5] acl, attr: Fix build failures when NLS is disabled on uclibc

[Khem Raj]

Disable gettext support when NLS is not enabled

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-support/attr/acl_2.2.51.bb  |    2 +-
 meta/recipes-support/attr/attr.inc       |    4 ----
 meta/recipes-support/attr/attr_2.4.46.bb |    2 +-
 meta/recipes-support/attr/ea-acl.inc     |    3 +++
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-support/attr/acl_2.2.51.bb b/meta/recipes-support/attr/acl_2.2.51.bb
index 301d44a..18aac7c 100644
--- a/meta/recipes-support/attr/acl_2.2.51.bb
+++ b/meta/recipes-support/attr/acl_2.2.51.bb
@@ -1,6 +1,6 @@
 require acl.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "3fc0ce99dc5253bdcce4c9cd437bc267"
 SRC_URI[sha256sum] = "06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225"
diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc
index b2ed9a1..c110340 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -20,7 +20,3 @@ do_install_append() {
 	sed -i ${D}${libdir}/libattr.la -e \
 	    s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
 }
-
-# Only append ldflags for target recipe
-LDFLAGS_libc-uclibc += "${@['', '-lintl']['${PN}' == '${BPN}']}"
-
diff --git a/meta/recipes-support/attr/attr_2.4.46.bb b/meta/recipes-support/attr/attr_2.4.46.bb
index 9fef41b..fe8ab79 100644
--- a/meta/recipes-support/attr/attr_2.4.46.bb
+++ b/meta/recipes-support/attr/attr_2.4.46.bb
@@ -1,6 +1,6 @@
 require attr.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "db557c17fdfa4f785333ecda08654010"
 SRC_URI[sha256sum] = "dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f"
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index afe2f1c..9af5960 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -32,3 +32,6 @@ FILES_lib${PN}-doc = "${mandir}/man2 \
                       ${mandir}/man3"
 
 BBCLASSEXTEND = "native"
+# Only append ldflags for target recipe and if USE_NLS is enabled
+LDFLAGS_append_libc-uclibc = "${@['', ' -lintl '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'yes')]}"
+EXTRA_OECONF_append_libc-uclibc = "${@['', ' --disable-gettext '][(bb.data.getVar('PN', d, True) == bb.data.getVar('BPN', d , True)) and (bb.data.getVar('USE_NLS', d, True) == 'no')]}"
-- 
1.7.4.1

[PATCH 5/5] classes/gettext: Do not disable nls for non target recipes

[Khem Raj]

nls disabling is target specific but USE_NLS=no will
disable nls even for other kind of recipes. We should
let them build with nls

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/classes/gettext.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
index 86b505b..d5b3d70 100644
--- a/meta/classes/gettext.bbclass
+++ b/meta/classes/gettext.bbclass
@@ -7,7 +7,7 @@ def gettext_dependencies(d):
 
 def gettext_oeconf(d):
     # Remove the NLS bits if USE_NLS is no.
-    if d.getVar('USE_NLS', True) == 'no':
+    if d.getVar('USE_NLS', True) == 'no' and not oe.utils.inherits(d, 'native', 'nativesdk', 'cross', 'cross-canadian'):
         return '--disable-nls'
     return "--enable-nls"
 
-- 
1.7.4.1

Re: [PATCH v2 0/5] Make oecore default images buildable with uclibc

[Saul Wold]

On 07/15/2011 11:33 PM, Khem Raj wrote:
> Changes On top of v1
>
> Fixed gettext class to not disable nls for non target recipes
>
> Build core-image-minimal for qemuarm qemumips qemuppc and booted on qemu
> successfully
>
> Build for TCLIBC=uclibc from scratch succeeds
>
> The following changes since commit 3d2c1ca9096790e4c6922b65b83ea1dffb90c362:
>
>    util-linux: Replace sigsetmask with posix compliant functions (2011-07-15 18:52:49 -0700)
>
> are available in the git repository at:
>    git://git.openembedded.org/openembedded-core-contrib kraj/uclibc-oecore
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/uclibc-oecore
>
> Khem Raj (5):
>    bitbake.conf: Change TERM default fallback to XTERM instead of
>      GNOME_TERM
>    oe-buildenv-internal: Replace POKYMODE POKYLIBC with TCMODE and
>      TCLIBC
Merged these 2, others were pulled at submitter's request.

Thanks
	Sau!

>    default-distrovars: Add largefile to DISTRO_FEATURES
>    acl,attr: Fix build failures when NLS is disabled on uclibc
>    classes/gettext: Do not disable nls for non target recipes
>
>   meta/classes/gettext.bbclass                    |    2 +-
>   meta/conf/bitbake.conf                          |    4 ++--
>   meta/conf/distro/include/default-distrovars.inc |    3 +--
>   meta/recipes-support/attr/acl_2.2.51.bb         |    2 +-
>   meta/recipes-support/attr/attr.inc              |    4 ----
>   meta/recipes-support/attr/attr_2.4.46.bb        |    2 +-
>   meta/recipes-support/attr/ea-acl.inc            |    3 +++
>   scripts/oe-buildenv-internal                    |    2 +-
>   8 files changed, 10 insertions(+), 12 deletions(-)
>