summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-07-22 12:09:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-22 11:56:51 +0100
commitcf927d85cec21657c876285e91aa15d622e4d6b5 (patch)
treebbd6bbc7f03563f81355265b58770a0937d082c8
parentb42372a4145d9d172ae8024016e63b77aefe2d27 (diff)
downloadpoky-cf927d85cec21657c876285e91aa15d622e4d6b5.tar.gz
gnome-keyring 2.32.1: fix PAM support and make it conditional on DISTRO_FEATURES
The plugin got installed into the wrong dir leading to: gdm-session-worker[515]: PAM unable to dlopen(/lib/security/pam_gnome_keyring.so): /lib/security/pam_gnome_keyring.so: cannot open shared object file: No such file or directory (From OE-Core rev: f31ae697803bad73052066f7b39317f8a01695d4) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
index 3f384012eb..cc9722598a 100644
--- a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
+++ b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
@@ -11,14 +11,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
11 11
12SECTION = "x11/gnome" 12SECTION = "x11/gnome"
13 13
14PR = "r2" 14PR = "r3"
15 15
16inherit autotools gnome pkgconfig 16inherit autotools gnome pkgconfig
17 17
18DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf" 18DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
19RDEPENDS_${PN} = "libgnome-keyring" 19RDEPENDS_${PN} = "libgnome-keyring"
20 20
21EXTRA_OECONF = "--disable-gtk-doc" 21EXTRA_OECONF = "--disable-gtk-doc ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}"
22 22
23SRC_URI += "file://org.gnome.keyring.service" 23SRC_URI += "file://org.gnome.keyring.service"
24 24
@@ -30,6 +30,6 @@ do_install_append () {
30 install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services 30 install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services
31} 31}
32 32
33FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr ${libdir}/security/*.so" 33FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr ${base_libdir}/security/*.so"
34FILES_${PN}-dbg += "${libdir}/gnome-keyring/standalone/.debug/" 34FILES_${PN}-dbg += "${libdir}/gnome-keyring/standalone/.debug/ ${base_libdir}/security/*.la"
35FILES_${PN}-dbg += "${libdir}/gnome-keyring/devel/.debug/" 35FILES_${PN}-dbg += "${libdir}/gnome-keyring/devel/.debug/ ${base_libdir}/security/.debug"