Skip to contentSkip to conversation

Pending patches in O.S. Systems' tree

PATCH In review Otavio Salvador 2 participants 4 messages Feb 24, 2012 – Feb 26, 2012

lore
Share & tools
lore

Otavio Salvador

author
#0 lore raw

cover Pending patches in O.S. Systems' tree

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(-)
Signature · 1 line
1.7.2.5
author
#1 lore raw

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

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 <[email protected]>
---
 meta/recipes-qt/qt4/qt4-native.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-qt/qt4/qt4-native.inc +2 -1
index 86f2440..70adec4 100644
@@ -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 \
Signature · 1 line
1.7.2.5
author
#2 lore raw

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

In reply to Otavio Salvador
Signed-off-by Otavio Salvador <[email protected]>
---
 meta/classes/useradd.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta/classes/useradd.bbclass +1 -0
index 1fed755..db874bc 100644
@@ -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}"
Signature · 1 line
1.7.2.5
#3 lore raw
In reply to Otavio Salvador
Quoted 4 lines · Otavio Salvador

The following changes since commit 22194a04f224864dd687660e351a3a10da1f06fa:

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

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!

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