Skip to contentSkip to conversation

: Fix the error when building image "core-image-gtk-directfb"

PATCH In review Xiaofeng Yan 4 participants 8 messages Jan 13, 2012 – Jan 17, 2012

lore
Share & tools
lore

Xiaofeng Yan

author
#0 lore raw

cover : Fix the error when building image "core-image-gtk-directfb"

From: Xiaofeng Yan <[email protected]>

Hi Saul,

I remove ${sysconfdir}/* because bitbake will package this directory as default.

The following part was previous description.
----------------------------------------------
Bitbake complain " No package 'cairo-xlib' found" when building image "core-image-gtk-directfb". Misconfiguration of directfb in PACKAGECONFIG causes this problem. I change directfb to gtk-directfb. Another problem is about messy code when running gtk-demo because of no "/etc/pango". I create this directory in pango.inc.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/gtk-directfb
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/gtk-directfb

Thanks,
Xiaofeng Yan <[email protected]>
---

Xiaofeng Yan (3):
gtk.inc: Change configuration of directfb to gtk-directfb cairo.inc: Change configuration of directfb to gtk-directfb pango.inc: add directory "/etc/pango"

 meta/recipes-gnome/gtk+/gtk+.inc      |    2 +-
 meta/recipes-graphics/cairo/cairo.inc |    2 +-
 meta/recipes-graphics/pango/pango.inc |    7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.7
author
#1 lore raw

PATCH 1/3 gtk.inc: Change configuration of directfb to gtk-directfb

From: Xiaofeng Yan <[email protected]>

"direcdtfb" is a wrong configuration in PACKAGECONFIG. It should be "gtk-directfb". PACKAGECONFIG can't select directfb as backend rightly, or else.

[YOCTO #1674]

Signed-off-by Xiaofeng Yan <[email protected]>
---
 meta/recipes-gnome/gtk+/gtk+.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-gnome/gtk+/gtk+.inc +1 -1
index 5eb7eb1..4e03670 100644
@@ -15,7 +15,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native gdk-pixbuf-native docbo
  libgcrypt cairo gdk-pixbuf"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
+ ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}"
 
 # for gtk+ 2.x, have to pick either x11 or directfb not both
 # for gtk+ 3.x, PACKAGECONFIG[gtk-directfb] should be removed because directfb will not be support as
Signature · 1 line
1.7.7
author
#2 lore raw

PATCH 2/3 cairo.inc: Change configuration of directfb to gtk-directfb

In reply to Xiaofeng Yan

From: Xiaofeng Yan <[email protected]>

"direcdtfb" is a wrong configuration in PACKAGECONFIG. It should be "gtk-directfb". PACKAGECONFIG can't select directfb as backend rightly, or else.

[YOCTO #1674]

Signed-off-by Xiaofeng Yan <[email protected]>
---
 meta/recipes-graphics/cairo/cairo.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-graphics/cairo/cairo.inc +1 -1
index 5f8f7b6..930675d 100644
@@ -13,7 +13,7 @@ LICENSE = "MPL-1 & LGPLv2.1"
 X11DEPENDS = "virtual/libx11 libsm libxrender"
 DEPENDS = "libpng fontconfig pixman glib-2.0"
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
-           ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'directfb', '', d)}"
+           ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)}"
 PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"
 PACKAGECONFIG[gtk-directfb] = "--enable-directfb=yes,,directfb"
Signature · 1 line
1.7.7
author
#3 lore raw

PATCH 3/3 pango.inc: add directory "/etc/pango"

In reply to Xiaofeng Yan

From: Xiaofeng Yan <[email protected]>

Command "pango-querymodules > /etc/pango/pango.modules" can't work when \
starting up yocto because of no directory "/etc/pango". It will cause \
messy code when gtk-demo running.

[YOCTO #1674]

Signed-off-by Xiaofeng Yan <[email protected]>
---
 meta/recipes-graphics/pango/pango.inc |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-graphics/pango/pango.inc +6 -1
index b428b9d..06db327 100644
@@ -46,6 +46,11 @@ fi
 
 }
 
+# Command "pango-querymodules > /etc/pango/pango.modules" needs this directory.
+do_install_prepend() {
+	install -d ${D}/${sysconfdir}/pango
+}
+
 python populate_packages_prepend () {
 	prologue = d.getVar("postinst_prologue", 1)
 

@@ -54,6 +59,6 @@ python populate_packages_prepend () {
 	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
 }
 
-FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
+FILES_${PN} += "${bindir}/* ${libdir}/libpango*${SOLIBS}"
 FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
 FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
Signature · 1 line
1.7.7
#4 lore raw

Re: [PATCH 3/3] pango.inc: add directory "/etc/pango"

Quoted 30 lines · Xiaofeng Yan

From: Xiaofeng Yan<[email protected]>

Command "pango-querymodules> /etc/pango/pango.modules" can't work when \
starting up yocto because of no directory "/etc/pango". It will cause \
messy code when gtk-demo running.

[YOCTO #1674]

Signed-off-by Xiaofeng Yan<[email protected]>
---
  meta/recipes-graphics/pango/pango.inc |    7 ++++++-
  1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-graphics/pango/pango.inc +5 -0
index b428b9d..06db327 100644
@@ -46,6 +46,11 @@ fi
 
  }
 
+# Command "pango-querymodules>  /etc/pango/pango.modules" needs this directory.
+do_install_prepend() {
+	install -d ${D}/${sysconfdir}/pango
+}
+
  python populate_packages_prepend () {
  	prologue = d.getVar("postinst_prologue", 1)

meta/recipes-graphics/pango/pango.inc python populate_packages_prepend () { · line 62

Quoted 5 lines
meta/recipes-graphics/pango/pango.inc +1 -1
@@ -54,6 +59,6 @@ python populate_packages_prepend () {
  	do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules>  /etc/pango/pango.modules')
  }
 
-FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
+FILES_${PN} += "${bindir}/* ${libdir}/libpango*${SOLIBS}"

This can actually be removed completed since the default for FILES_${PN} includes bindir/* and libdir/lib*${SOLIBS}

I fixed this up in my testing area.

Sau!

Quoted 2 lines
meta/recipes-graphics/pango/pango.inc +0 -0
  FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
  FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
#5 lore raw

Re: [PATCH 3/3] pango.inc: add directory "/etc/pango"

Quoted 39 lines · Saul Wold
Quoted 38 lines · Xiaofeng Yan

From: Xiaofeng Yan<[email protected]>

Command "pango-querymodules>  /etc/pango/pango.modules" can't work when \
starting up yocto because of no directory "/etc/pango". It will cause \
messy code when gtk-demo running.

[YOCTO #1674]

Signed-off-by Xiaofeng Yan<[email protected]>

---
 meta/recipes-graphics/pango/pango.inc |    7 ++++++-

 1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-graphics/pango/pango.inc +1 -0
index b428b9d..06db327 100644
@@ -46,6 +46,11 @@ fi
 
  }
 
+# Command "pango-querymodules>  /etc/pango/pango.modules" needs this

directory.

meta/recipes-graphics/pango/pango.inc +4 -0
+do_install_prepend() {
+       install -d ${D}/${sysconfdir}/pango
+}
+

 python populate_packages_prepend () { prologue = d.getVar("postinst_prologue", 1)

meta/recipes-graphics/pango/pango.inc +0 -0
@@ -54,6 +59,6 @@ python populate_packages_prepend () {
        do_split_packages(d, modules_root, '^pango-(.*)\.so$',

'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules> /etc/pango/pango.modules')
 }

Quoted 8 lines

meta/recipes-graphics/pango/pango.inc python populate_packages_prepend () { · line 62

Quoted 2 lines
meta/recipes-graphics/pango/pango.inc +1 -1
-FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
+FILES_${PN} += "${bindir}/* ${libdir}/libpango*${SOLIBS}"

This can actually be removed completed since the default for FILES_${PN} includes bindir/* and libdir/lib*${SOLIBS}

I fixed this up in my testing area.

Saul

This seems wrong to me. Since now all the modules will also be bundled in $PN
whereas you want them in pango-modules-* packages since populate_packages_prepend has nothing left to generate out modules packages so please reintroduce the FILES_${PN} as it was (note that it was overwriting the defaults
and not appending to it.)

Quoted 11 lines

Sau!

Quoted 2 lines

 FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#6 lore raw

Re: [PATCH 3/3] pango.inc: add directory "/etc/pango"

Op 17 jan. 2012, om 10:11 heeft Khem Raj het volgende geschreven:

Quoted 49 lines · Saul Wold
Quoted 39 lines · Xiaofeng Yan
Quoted 38 lines

From: Xiaofeng Yan<[email protected]>

Command "pango-querymodules> /etc/pango/pango.modules" can't work when \
starting up yocto because of no directory "/etc/pango". It will cause \
messy code when gtk-demo running.

[YOCTO #1674]

Signed-off-by Xiaofeng Yan<[email protected]>
---
 meta/recipes-graphics/pango/pango.inc |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-graphics/pango/pango.inc +1 -0
index b428b9d..06db327 100644
@@ -46,6 +46,11 @@ fi
 
 }
 
+# Command "pango-querymodules>  /etc/pango/pango.modules" needs this

directory.

meta/recipes-graphics/pango/pango.inc +4 -0
+do_install_prepend() {
+       install -d ${D}/${sysconfdir}/pango
+}
+
 python populate_packages_prepend () {
       prologue = d.getVar("postinst_prologue", 1)

@@ -54,6 +59,6 @@ python populate_packages_prepend () {
       do_split_packages(d, modules_root, '^pango-(.*)\.so$',

'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules>
/etc/pango/pango.modules')
}

Quoted 8 lines

meta/recipes-graphics/pango/pango.inc python populate_packages_prepend () { · line 62

Quoted 2 lines
meta/recipes-graphics/pango/pango.inc +1 -1
-FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
+FILES_${PN} += "${bindir}/* ${libdir}/libpango*${SOLIBS}"

This can actually be removed completed since the default for FILES_${PN} includes bindir/* and libdir/lib*${SOLIBS}

I fixed this up in my testing area.

Quoted 8 lines

Saul

This seems wrong to me. Since now all the modules will also be bundled in $PN whereas you want them in pango-modules-* packages since populate_packages_prepend has nothing left to generate out modules packages so please reintroduce the FILES_${PN} as it was (note that it was overwriting the defaults
and not appending to it.)

The original problem can also be solved by doing the mkdir in the postinst prologue

#7 lore raw
In reply to Xiaofeng Yan
Quoted 17 lines · Xiaofeng Yan

From: Xiaofeng Yan<[email protected]>

Hi Saul,

I remove ${sysconfdir}/* because bitbake will package this directory as default.

The following part was previous description.
----------------------------------------------
Bitbake complain " No package 'cairo-xlib' found" when building image "core-image-gtk-directfb". Misconfiguration of directfb in PACKAGECONFIG causes this problem. I change directfb to gtk-directfb. Another problem is about messy code when running gtk-demo because of no "/etc/pango". I create this directory in pango.inc.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/gtk-directfb
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/gtk-directfb

Quoted 8 lines

Thanks,
Xiaofeng Yan<[email protected]>
---

Xiaofeng Yan (3):
gtk.inc: Change configuration of directfb to gtk-directfb cairo.inc: Change configuration of directfb to gtk-directfb

These first 2 were merged into OE-Core

Quoted 2 lines

pango.inc: add directory "/etc/pango"

This was also merged, but there where a couple of other changes to pango.inc, I think that we need one more change to fix the /etc/pango -> ${sysconfdir} in the FILES_${PN}list.

Sau!

Quoted 5 lines
  meta/recipes-gnome/gtk+/gtk+.inc      |    2 +-
  meta/recipes-graphics/cairo/cairo.inc |    2 +-
  meta/recipes-graphics/pango/pango.inc |    7 ++++++-
  3 files changed, 8 insertions(+), 3 deletions(-)