On 10/24/2014 02:10 PM, Koen Kooi wrote:
Op 22 okt. 2014, om 09:09 heeft Chong Lu <chong...@windriver.com> het volgende 
geschreven:

The gconfd-2 will be called in org.gnome.GConf.service file and the path of
gconfd-2 is ${libexecdir}, this will get following error when multilib exported
in the sdk:
error: file /usr/share/dbus-1/services/org.gnome.GConf.service from install
of gconf-3.2.6-r0.0.lib32_x86 conflicts with file from package
gconf-3.2.6-r0.0.x86_64

Move org.gnome.GConf.service to ${libdir}, then the conflict was fixed.
And I suspect its dbus service won't work anymore after moving the files. How 
have you tested this change?

I just focus on the conflicts, not to test dbus service.
Or do you have any suggestion to fix this conflicts?

Best Regards
Chong


Add split out the client libraries into a separate package.

Signed-off-by: Chong Lu <chong...@windriver.com>
---
meta/recipes-gnome/gnome/gconf_3.2.6.bb | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/gnome/gconf_3.2.6.bb 
b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
index 17fdafa..bbb13b2 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.6.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
@@ -19,6 +19,8 @@ SRC_URI[archive.sha256sum] = 
"1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e

S = "${WORKDIR}/GConf-${PV}"

+PACKAGES =+ "libgconf"
+
EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \
                 --disable-introspection --disable-orbit --with-openldap=no 
--disable-gtk"

@@ -37,6 +39,8 @@ do_install_append() {
        # this stuff is unusable
        rm -f ${D}${libdir}/GConf/*/*.*a
        rm -f ${D}${libdir}/gio/*/*.*a
+
+       mv ${D}${datadir}/dbus-1 ${D}${libdir}/
}

do_install_append_class-native() {
@@ -47,13 +51,15 @@ do_install_append_class-native() {
# disable dbus-x11 when x11 isn't in DISTRO_FEATURES
RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', 
d)}"
RDEPENDS_${PN}_class-native = ""
+RDEPENDS_${PN} += "libgconf"

FILES_${PN} += "${libdir}/GConf/* \
-                ${libdir}/gio/*/*.so \
                 ${datadir}/polkit* \
-                ${datadir}/dbus-1/services/*.service \
                 ${datadir}/dbus-1/system-services/*.service \
                "
+FILES_libgconf = "${libdir}/lib*${SOLIBS} ${libdir}/gio/modules/*.so \
+                  ${libdir}/dbus-1/services/*.service"
+
FILES_${PN}-dbg += "${libdir}/*/*/.debug"
FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd"

--
1.9.1

--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core




--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to