Skip to contentSkip to conversation

Pull request #9

PATCH Applied Martin Jansa 2 participants 4 messages May 18, 2011 – May 19, 2011

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

cover Pull request #9

Please merge following 2 patches

Pull URL: git://gitorious.org/shr/meta-openembedded.git
Branch: jama/meta-oe
Browse: http://gitorious.org/shr/meta-openembedded/commits/jama/meta-oe

Thanks,
Martin Jansa <[email protected]>
---

Martin Jansa (2):
glib-2.0: use PN instead of glib-2.0 in PACKAGES and FILES glib-2.0: append libffi and python-argparse to
DEPENDS_virtclass-native, drop gdbus-serialization test

 meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb |    4 +++-
 meta-oe/recipes-core/glib-2.0/glib.inc        |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.5.rc3
author
#1 lore raw

PATCH 1/2 glib-2.0: use PN instead of glib-2.0 in PACKAGES and FILES

* otherwise notes like this are shown:
NOTE: multiple providers are available for runtime glib-2.0-utils (glib-2.0-nativesdk, glib-2.0)
NOTE: consider defining a PREFERRED_PROVIDER entry to match glib-2.0-utils

Signed-off-by Martin Jansa <[email protected]>
---
 meta-oe/recipes-core/glib-2.0/glib.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-core/glib-2.0/glib.inc +2 -2
index 8786fe5..9eafbd8 100644
@@ -18,10 +18,10 @@ require glib-2.0.inc
 DEPENDS = "glib-2.0-native gtk-doc-native zip dbus"
 DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native"
 DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
-PACKAGES =+ "glib-2.0-utils "
+PACKAGES =+ "${PN}-utils "
 
 LEAD_SONAME = "libglib-2.0.*"
-FILES_glib-2.0-utils = "${bindir}/*"
+FILES_${PN}-utils = "${bindir}/*"
 
 inherit autotools pkgconfig gettext
Signature · 1 line
1.7.5.rc3
author
#2 lore raw

PATCH 2/2 glib-2.0: append libffi and python-argparse to DEPENDS_virtclass-native, drop gdbus-serialization test

In reply to Martin Jansa

* DEPENDS_virtclass-native is defined in glib.inc so normal DEPENDS are ignored for -native builds
* gdbus-serialization test causes circular dependency dbus-glib, and because we cannot add dbus to DEPENDS then we had to drop this test so apply dcf425c5472fdee74885c4f21a851e39c84e6642 from oe.dev

Signed-off-by Martin Jansa <[email protected]>
---
 meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb +3 -1
index 51b0448..34fcaf6 100644
@@ -6,12 +6,13 @@ PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 DEPENDS += "libffi python-argparse-native"
+DEPENDS_virtclass-native += "libffi-native python-argparse-native"
 
 SRC_URI = "git://git.gnome.org/glib;protocol=git;branch=master \
            file://configure-libtool.patch \
            file://60_wait-longer-for-threads-to-die.patch \
            file://g_once_init_enter.patch \
-	   file://remove.test.for.qsort_r.patch \
+           file://remove.test.for.qsort_r.patch \
           "
 SRCREV = "d97cbc6731deab137770bc0fe9c69b06f689f5b4"
 PV = "2.29.3+gitr${SRCPV}"

@@ -27,4 +28,5 @@ do_configure_prepend() {
   # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native)
   sed -i '/^docs/d' ${S}/configure.ac
   sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am
+  sed -i -e "s:TEST_PROGS += gdbus-serialization::g"  ${S}/gio/tests/Makefile.am
 }
Signature · 1 line
1.7.5.rc3
Applied
#3 lore raw
In reply to Martin Jansa

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 5 lines · Martin Jansa

Please merge following 2 patches

Pull URL: git://gitorious.org/shr/meta-openembedded.git
Branch: jama/meta-oe
Browse: http://gitorious.org/shr/meta-openembedded/commits/jama/meta-oe

thanks, applied

Quoted 6 lines

Thanks,
Martin Jansa <[email protected]>
---

Quoted 9 lines

Martin Jansa (2):
glib-2.0: use PN instead of glib-2.0 in PACKAGES and FILES glib-2.0: append libffi and python-argparse to
DEPENDS_virtclass-native, drop gdbus-serialization test

 meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb |    4 +++-
 meta-oe/recipes-core/glib-2.0/glib.inc        |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFN1McCMkyGM64RGpERAs/8AJ4/brEPwsldBCAAEglfffcNMN4ZTgCfTgCL iPFIL391ehn+ZSRKwdTtDrs=
=Lr/o
-----END PGP SIGNATURE-----