* [PATCH 1/4] qt4: Enable accessibility and sm option for LSB.
2011-01-19 8:53 [PATCH 0/4][PULL] Add "poky-lsb" distro and add lsb features into related recipes Jingdong Lu
@ 2011-01-19 8:53 ` Jingdong Lu
2011-01-19 8:54 ` [PATCH 2/4] glib-2.0: Enable debug option for LSB test Jingdong Lu
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jingdong Lu @ 2011-01-19 8:53 UTC (permalink / raw)
To: poky
LSB library checks will look for some symbols of qt4 libraries. Enable "accessibility" and "sm" in order to pass the LSB test.
Signed-off-by: Jingdong Lu<jingdong.lu@windriver.com>
---
meta/classes/qmake2.bbclass | 1 +
meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb | 2 +-
meta/recipes-qt/qt4/qt4.inc | 10 +++++++---
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/meta/classes/qmake2.bbclass b/meta/classes/qmake2.bbclass
index 3772189..5eebd8e 100644
--- a/meta/classes/qmake2.bbclass
+++ b/meta/classes/qmake2.bbclass
@@ -19,5 +19,6 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
export OE_QMAKE_LIBS_QT = "qt"
export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
+export OE_QMAKE_LIBS_X11SM = "-lSM -lICE"
export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease4"
export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate4"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
index 0a03e9b..f13b947 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
@@ -1,7 +1,7 @@
require qt4-x11-free.inc
require qt-4.6.3.inc
-PR = "r1"
+PR = "r2"
QT_CONFIG_FLAGS += " -xrandr "
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 16d5beb..3382445 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -5,11 +5,15 @@ DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gst
inherit qmake_base
-QT_CONFIG_FLAGS += "-release -no-cups -no-accessibility -reduce-relocations \
- -shared -no-nas-sound -no-sm -no-nis \
+QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
+QT_DISTRO_FLAGS_poky-lsb = "-sm"
+
+QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
+ -shared -no-nas-sound -no-nis \
-qt-gif -system-libjpeg -system-libpng -system-zlib \
-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite \
- -no-pch -dbus -stl -glib -phonon -webkit"
+ -no-pch -dbus -stl -glib -phonon -webkit \
+ ${QT_DISTRO_FLAGS} "
EXTRA_OEMAKE = "-e"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] glib-2.0: Enable debug option for LSB test.
2011-01-19 8:53 [PATCH 0/4][PULL] Add "poky-lsb" distro and add lsb features into related recipes Jingdong Lu
2011-01-19 8:53 ` [PATCH 1/4] qt4: Enable accessibility and sm option for LSB Jingdong Lu
@ 2011-01-19 8:54 ` Jingdong Lu
2011-01-19 8:54 ` [PATCH 3/4] libxml2: Enable "--with-docbook --with-debug --with-catalog" " Jingdong Lu
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jingdong Lu @ 2011-01-19 8:54 UTC (permalink / raw)
To: poky
Enable "debug" option of glib-2.0 and make "glib_mem_profiler_table" and "g_mem_profile" enabled for LSB test.
Signed-off-by: Jingdong Lu<jingdong.lu@windriver.com>
---
meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb | 2 +-
meta/recipes-core/glib-2.0/glib.inc | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
index 314d942..b26da7b 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
@@ -1,6 +1,6 @@
require glib.inc
-PR = "r2"
+PR = "r3"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.27/glib-${PV}.tar.bz2 \
file://configure-libtool.patch \
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index b0df84e..e1705e7 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -28,6 +28,7 @@ S = "${WORKDIR}/glib-${PV}"
EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
EXTRA_OECONF_virtclass-native = ""
+EXTRA_OECONF_poky-lsb = "--enable-included-printf=no"
FILES_${PN} = "${libdir}/lib*${SOLIBS}"
FILES_${PN}-dev += "${libdir}/glib-2.0/include"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] libxml2: Enable "--with-docbook --with-debug --with-catalog" for LSB test.
2011-01-19 8:53 [PATCH 0/4][PULL] Add "poky-lsb" distro and add lsb features into related recipes Jingdong Lu
2011-01-19 8:53 ` [PATCH 1/4] qt4: Enable accessibility and sm option for LSB Jingdong Lu
2011-01-19 8:54 ` [PATCH 2/4] glib-2.0: Enable debug option for LSB test Jingdong Lu
@ 2011-01-19 8:54 ` Jingdong Lu
2011-01-19 8:54 ` [PATCH 4/4] poky-lsb: Add poky-lsb.conf as distro of lsb image Jingdong Lu
2011-01-20 23:43 ` [PATCH 0/4][PULL] Add "poky-lsb" distro and add lsb features into related recipes Saul Wold
4 siblings, 0 replies; 6+ messages in thread
From: Jingdong Lu @ 2011-01-19 8:54 UTC (permalink / raw)
To: poky
Enable options "--with-doc --with-debug --with-catalog" in order to pass LSB test.
Signed-off-by: Jingdong Lu<jingdong.lu@windriver.com>
---
meta/recipes-core/libxml/libxml2.inc | 1 +
meta/recipes-core/libxml/libxml2_2.7.7.bb | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index 748a7fb..78ee781 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -21,6 +21,7 @@ inherit autotools pkgconfig binconfig
EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n"
+EXTRA_OECONF_poky-lsb = "--without-python --with-debug --without-legacy --with-catalog --with-docbook --with-c14n"
# required for pythong binding
export HOST_SYS
diff --git a/meta/recipes-core/libxml/libxml2_2.7.7.bb b/meta/recipes-core/libxml/libxml2_2.7.7.bb
index 9615a7f..daec3be 100644
--- a/meta/recipes-core/libxml/libxml2_2.7.7.bb
+++ b/meta/recipes-core/libxml/libxml2_2.7.7.bb
@@ -1,6 +1,6 @@
require libxml2.inc
-PR = "r2"
+PR = "r3"
SRC_URI[md5sum] = "9abc9959823ca9ff904f1fbcf21df066"
SRC_URI[sha256sum] = "af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] poky-lsb: Add poky-lsb.conf as distro of lsb image
2011-01-19 8:53 [PATCH 0/4][PULL] Add "poky-lsb" distro and add lsb features into related recipes Jingdong Lu
` (2 preceding siblings ...)
2011-01-19 8:54 ` [PATCH 3/4] libxml2: Enable "--with-docbook --with-debug --with-catalog" " Jingdong Lu
@ 2011-01-19 8:54 ` Jingdong Lu
2011-01-20 23:43 ` [PATCH 0/4][PULL] Add "poky-lsb" distro and add lsb features into related recipes Saul Wold
4 siblings, 0 replies; 6+ messages in thread
From: Jingdong Lu @ 2011-01-19 8:54 UTC (permalink / raw)
To: poky
Signed-off-by: Jingdong Lu<jingdong.lu@windriver.com>
---
meta/conf/distro/poky-lsb.conf | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
create mode 100644 meta/conf/distro/poky-lsb.conf
diff --git a/meta/conf/distro/poky-lsb.conf b/meta/conf/distro/poky-lsb.conf
new file mode 100644
index 0000000..86514d3
--- /dev/null
+++ b/meta/conf/distro/poky-lsb.conf
@@ -0,0 +1,6 @@
+require conf/distro/poky.conf
+
+DISTRO = "poky-lsb"
+
+DISTRO_FEATURES += "pam"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/4][PULL] Add "poky-lsb" distro and add lsb features into related recipes.
2011-01-19 8:53 [PATCH 0/4][PULL] Add "poky-lsb" distro and add lsb features into related recipes Jingdong Lu
` (3 preceding siblings ...)
2011-01-19 8:54 ` [PATCH 4/4] poky-lsb: Add poky-lsb.conf as distro of lsb image Jingdong Lu
@ 2011-01-20 23:43 ` Saul Wold
4 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2011-01-20 23:43 UTC (permalink / raw)
To: Jingdong Lu; +Cc: poky
On 01/19/2011 12:53 AM, Jingdong Lu wrote:
> Create poky-lsb-distro to place some config change in order to pass LSB test.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: jingdonglu/distro
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jingdonglu/distro
>
> Thanks,
> Jingdong Lu<jingdong.lu@windriver.com>
> ---
>
>
> Jingdong Lu (4):
> qt4: Enable accessibility and sm option for LSB.
> glib-2.0: Enable debug option for LSB test.
> libxml2: Enable "--with-docbook --with-debug --with-catalog" for LSB
> test.
> poky-lsb: Add poky-lsb.conf as distro of lsb image
>
> meta/classes/qmake2.bbclass | 1 +
> meta/conf/distro/poky-lsb.conf | 6 ++++++
> meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb | 2 +-
> meta/recipes-core/glib-2.0/glib.inc | 1 +
> meta/recipes-core/libxml/libxml2.inc | 1 +
> meta/recipes-core/libxml/libxml2_2.7.7.bb | 2 +-
> meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb | 2 +-
> meta/recipes-qt/qt4/qt4.inc | 10 +++++++---
> 8 files changed, 19 insertions(+), 6 deletions(-)
> create mode 100644 meta/conf/distro/poky-lsb.conf
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
Jingdong,
This was pulled into Master, I know that you have some additional
packages you want into the lsb image, can you please resend those
changes as well.
We are going set the autobuilder up to build lsb image with
DISTRO=poky-lsb by default.
Thanks
Sau!
^ permalink raw reply [flat|nested] 6+ messages in thread