From 9e879e3346d710464bd41f9fd755432f7a3fe3ea Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 24 Apr 2013 17:11:45 +0100 Subject: [PATCH] gnome-keyring: remove, nothing uses it in oe-core (From OE-Core rev: fbefbf60fd18dae135b96d0bfd2db832f568fea9) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/conf/distro/include/seperatebuilddir.inc | 1 - .../gnome/gnome-keyring/org.gnome.keyring.service | 3 -- meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 44 ---------------------- 3 files changed, 48 deletions(-) delete mode 100644 meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service delete mode 100644 meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc index 20376bb..f70ae68 100644 --- a/meta/conf/distro/include/seperatebuilddir.inc +++ b/meta/conf/distro/include/seperatebuilddir.inc @@ -188,7 +188,6 @@ B_pn-gnome-desktop = "${SEPB}" #B_pn-gnome-doc-utils = "${SEPB}" #B_pn-gnome-doc-utils-native = "${SEPB}" B_pn-gnome-icon-theme = "${SEPB}" -B_pn-gnome-keyring = "${SEPB}" B_pn-gnome-mime-data = "${SEPB}" B_pn-gnupg = "${SEPB}" ## libtool: link: warning: library `.../usr/lib/libgcrypt.la' was moved. diff --git a/meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service b/meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service deleted file mode 100644 index 96ea061..0000000 --- a/meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.gnome.keyring -Exec=/usr/bin/gnome-keyring-daemon diff --git a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb deleted file mode 100644 index a1cd8f9..0000000 --- a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "Password and keyring managing daemon" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://gcr/gcr.h;endline=22;md5=a272df1e633e27ecf35e74fb5576250e \ - file://egg/egg-dbus.h;endline=25;md5=eb6f531af37165dc53420c073d774e61 \ - file://gp11/gp11.h;endline=24;md5=bd8c7a8a21d6c28d40536d96a35e3469 \ - file://pkcs11/pkcs11i.h;endline=24;md5=e72cfbb718389b76a4dae838d1c1f439" - -SECTION = "x11/gnome" - -PR = "r11" - -inherit autotools gnome gtk-doc pkgconfig gsettings - -DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" - -EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}" - -SRC_URI += "file://org.gnome.keyring.service" - -SRC_URI[archive.md5sum] = "9a8aa74e03361676f29d6e73155786fc" -SRC_URI[archive.sha256sum] = "31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9" - -do_install_append () { - install -d ${D}${datadir}/dbus-1/services - install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services -} - -FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr" - - -FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \ - ${libdir}/${BPN}/devel/*${SOLIBSDEV} \ - ${libdir}/${BPN}/standalone/*.la \ - ${base_libdir}/security/*.la \ - ${base_libdir}/security/*${SOLIBSDEV}" - -FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \ - ${libdir}/${BPN}/devel/.debug/ \ - ${base_libdir}/security/.debug/" -- 2.7.4