Skip to contentSkip to conversation

Add "poky-lsb" distro and add lsb features into related recipes.

GIT PULL New Jingdong Lu 2 participants 6 messages Jan 19, 2011 – Jan 20, 2011

lore
Share & tools
lore
#0 lore raw

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 <[email protected]>
---

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
#1 lore raw

PATCH 1/4 qt4: Enable accessibility and sm option for LSB.

LSB library checks will look for some symbols of qt4 libraries. Enable "accessibility" and "sm" in order to pass the LSB test.

---
 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(-)
meta/classes/qmake2.bbclass +1 -0
index 3772189..5eebd8e 100644
@@ -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"
meta/recipes-qt/qt4/qt4-x11-free_4.6.3.bb +1 -1
index 0a03e9b..f13b947 100644
@@ -1,7 +1,7 @@
 require qt4-x11-free.inc
 require qt-4.6.3.inc
 
-PR = "r1"
+PR = "r2"
 
 QT_CONFIG_FLAGS += " -xrandr "
 
meta/recipes-qt/qt4/qt4.inc +7 -3
index 16d5beb..3382445 100644
@@ -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"
 
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 2/4 glib-2.0: Enable debug option for LSB test.

In reply to Jingdong Lu

Enable "debug" option of glib-2.0 and make "glib_mem_profiler_table" and "g_mem_profile" enabled for LSB test.

---
 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(-)
meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb +1 -1
index 314d942..b26da7b 100644
@@ -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 \
meta/recipes-core/glib-2.0/glib.inc +1 -0
index b0df84e..e1705e7 100644
@@ -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"
Signature · 1 line
1.7.0.4
#3 lore raw

PATCH 3/4 libxml2: Enable "--with-docbook --with-debug --with-catalog" for LSB test.

In reply to Jingdong Lu

Enable options "--with-doc --with-debug --with-catalog" in order to pass LSB test.

---
 meta/recipes-core/libxml/libxml2.inc      |    1 +
 meta/recipes-core/libxml/libxml2_2.7.7.bb |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-core/libxml/libxml2.inc +1 -0
index 748a7fb..78ee781 100644
@@ -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
meta/recipes-core/libxml/libxml2_2.7.7.bb +1 -1
index 9615a7f..daec3be 100644
@@ -1,6 +1,6 @@
 require libxml2.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "9abc9959823ca9ff904f1fbcf21df066"
 SRC_URI[sha256sum] = "af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68"
Signature · 1 line
1.7.0.4
#4 lore raw

PATCH 4/4 poky-lsb: Add poky-lsb.conf as distro of lsb image

In reply to Jingdong Lu
---
 meta/conf/distro/poky-lsb.conf |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
 create mode 100644 meta/conf/distro/poky-lsb.conf
meta/conf/distro/poky-lsb.conf new file +6 -0
new file mode 100644
index 0000000..86514d3
@@ -0,0 +1,6 @@
+require conf/distro/poky.conf
+
+DISTRO = "poky-lsb"
+
+DISTRO_FEATURES += "pam"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
Signature · 1 line
1.7.0.4
#5 lore raw
In reply to Jingdong Lu
Quoted 27 lines · Jingdong Lu

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<[email protected]>
---

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(-)
Quoted 7 lines

create mode 100644 meta/conf/distro/poky-lsb.conf

_______________________________________________
poky mailing list
[email protected]
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!