gconf: fix multilib conflict - org.gnome.GConf.service

PATCH Superseded Chong Lu 2 participants 6 messages Oct 14, 2014

lore

Share & tools

lore

Chong Lu

author

2014-10-14 08:42 UTC #0 lore raw

cover gconf: fix multilib conflict - org.gnome.GConf.service

The following changes since commit ccf5a4d2342c4fd40e4e0b332ea7e34e0bf175d4:

build-appliance-image: Update to dizzy head revision (2014-10-11 08:11:17 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib chonglu/gconf
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/gconf

Chong Lu (1):
gconf: fix multilib conflict - org.gnome.GConf.service

 meta/recipes-gnome/gnome/gconf_3.2.6.bb | 1 +
 1 file changed, 1 insertion(+)

Signature · 1 line

1.9.1

Chong Lu

author

2014-10-14 08:42 UTC #1 lore raw

PATCH 1/1 gconf: fix multilib conflict - org.gnome.GConf.service

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

Changed ${libexecdir} to /usr/libexec to fix this issue.

Signed-off-by Chong Lu <[email protected]>

---
 meta/recipes-gnome/gnome/gconf_3.2.6.bb | 1 +
 1 file changed, 1 insertion(+)

meta/recipes-gnome/gnome/gconf_3.2.6.bb +1 -0

index 17fdafa..81dde74 100644
@@ -19,6 +19,7 @@ SRC_URI[archive.sha256sum] = "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e
 
 S = "${WORKDIR}/GConf-${PV}"
 
+libexecdir = "/usr/libexec"
 EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \
                 --disable-introspection --disable-orbit --with-openldap=no --disable-gtk"

Signature · 1 line

1.9.1

Burton, Ross

2014-10-14 09:53 UTC #2 lore raw

Quoted 8 lines · Chong Lu

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
Changed ${libexecdir} to /usr/libexec to fix this issue.

Haven't we been here before? A better fix is to split the library and the daemon into separate packages, so in a multilib environment you have lib32gconf, lib64gconf, and gconfd (which can be 32- or 64-bit).

Ross

Chong Lu

author

2014-10-14 09:58 UTC #3 lore raw

Quoted 8 lines · Ross

Quoted 7 lines · Chong Lu
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

Quoted 8 lines

Quoted 1 line
Changed ${libexecdir} to /usr/libexec to fix this issue.
Haven't we been here before? A better fix is to split the library and the daemon into separate packages, so in a multilib environment you have lib32gconf, lib64gconf, and gconfd (which can be 32- or 64-bit).
Ross

Hi Ross,

Do you mean we should put /usr/lib64/gconf/gconfd-2 into lib64gconf and /usr/lib/gconf/gconfd-2 into lib32gconf?

Best Regards
Chong

Burton, Ross

2014-10-14 09:59 UTC #4 lore raw

Quoted 2 lines · Chong Lu

Do you mean we should put /usr/lib64/gconf/gconfd-2 into lib64gconf and /usr/lib/gconf/gconfd-2 into lib32gconf?

No, the binary gconfd-2 goes into a separate package, such as gconf.

Ross

Chong Lu

author

2014-10-14 10:02 UTC #5 lore raw

Quoted 7 lines · Ross

Quoted 2 lines · Chong Lu
Do you mean we should put /usr/lib64/gconf/gconfd-2 into lib64gconf and /usr/lib/gconf/gconfd-2 into lib32gconf?
No, the binary gconfd-2 goes into a separate package, such as gconf.
Ross

Got it. Thanks

//Chong