[PATCH 0/2] Pending patches in O.S. Systems' tree

[PATCH 0/2] Pending patches in O.S. Systems' tree

[Otavio Salvador]

The following changes since commit 22194a04f224864dd687660e351a3a10da1f06fa:

  scripts/hob: Launch the new hob (2012-02-24 18:05:46 +0000)

are available in the git repository at:
  git://github.com/OSSystems/oe-core master
  https://github.com/OSSystems/oe-core/tree/HEAD

Otavio Salvador (2):
  qt4-native: set headerdir as done in regular builds
  useradd.bbclass: override USERADDSETSCENEDEPS to empty when building
    cross packages

 meta/classes/useradd.bbclass       |    1 +
 meta/recipes-qt/qt4/qt4-native.inc |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

-- 
1.7.2.5

[PATCH 1/2] qt4-native: set headerdir as done in regular builds

[Otavio Salvador]

qmake uses a generated qt.conf file that expects headers to be found
at ${includedir}/qt4 but qt4-native were not following this layout
breaking the builds of native binaries that use qt4.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-qt/qt4/qt4-native.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 86f2440..70adec4 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
                     file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
                     file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
 
-INC_PR = "r13"
+INC_PR = "r14"
 
 inherit native
 
@@ -29,6 +29,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
                 -no-nas-sound \
                 -no-nis -no-openssl \
                 -verbose -release \
+                -headerdir ${includedir}/qt4 \
                 -embedded -no-freetype -no-glib -no-iconv \
                 -exceptions -xmlpatterns \
                 -qt3support \
-- 
1.7.2.5

[PATCH 2/2] useradd.bbclass: override USERADDSETSCENEDEPS to empty when building cross packages

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/classes/useradd.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 1fed755..db874bc 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -115,6 +115,7 @@ SYSROOTPOSTFUNC_virtclass-native = ""
 SYSROOTPOSTFUNC_virtclass-nativesdk = ""
 
 USERADDSETSCENEDEPS = "base-passwd:do_populate_sysroot_setscene shadow-native:do_populate_sysroot_setscene shadow-sysroot:do_populate_sysroot_setscene"
+USERADDSETSCENEDEPS_virtclass-cross = ""
 USERADDSETSCENEDEPS_virtclass-native = ""
 USERADDSETSCENEDEPS_virtclass-nativesdk = ""
 do_package_setscene[depends] = "${USERADDSETSCENEDEPS}"
-- 
1.7.2.5

Re: [PATCH 0/2] Pending patches in O.S. Systems' tree

[Saul Wold]

On 02/24/2012 12:50 PM, Otavio Salvador wrote:
> The following changes since commit 22194a04f224864dd687660e351a3a10da1f06fa:
>
>    scripts/hob: Launch the new hob (2012-02-24 18:05:46 +0000)
>
> are available in the git repository at:
>    git://github.com/OSSystems/oe-core master
>    https://github.com/OSSystems/oe-core/tree/HEAD
>
> Otavio Salvador (2):
>    qt4-native: set headerdir as done in regular builds
>    useradd.bbclass: override USERADDSETSCENEDEPS to empty when building
>      cross packages
>
The useradd change was merged, still reviewing the qt4 one.

Thanks
	Sau!


>   meta/classes/useradd.bbclass       |    1 +
>   meta/recipes-qt/qt4/qt4-native.inc |    3 ++-
>   2 files changed, 3 insertions(+), 1 deletions(-)
>