aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gnome/gconf_3.2.6.bb
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-03-07 15:27:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-09 06:38:46 +0000
commit9ae273bb17ffc88af390fcfbfc74d4a10ea05cf2 (patch)
tree248d58fd20a7c3cac6200b7fab2e14003be05359 /meta/recipes-gnome/gnome/gconf_3.2.6.bb
parentc5632d833a1be4de1dcda18a67019e134844a8ee (diff)
downloadopenembedded-core-contrib-9ae273bb17ffc88af390fcfbfc74d4a10ea05cf2.tar.gz
gconf: make polkit an option, and disable by default
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gnome/gconf_3.2.6.bb')
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.6.bb19
1 files changed, 10 insertions, 9 deletions
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
index a37bd009a4..a245fa234c 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.6.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
@@ -3,10 +3,7 @@ SECTION = "x11/gnome"
LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
-POLKIT = "polkit"
-POLKIT_libc-uclibc = ""
-
-DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub"
+DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native gobject-introspection-stub"
DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
PR = "r0"
@@ -22,12 +19,16 @@ SRC_URI[archive.sha256sum] = "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e
S = "${WORKDIR}/GConf-${PV}"
-POLKIT_OECONF = "--enable-defaults-service"
-POLKIT_OECONF_class-native = "--disable-defaults-service"
-POLKIT_OECONF_libc-uclibc = "--disable-default-service"
-
EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \
- --disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF} --disable-gtk"
+ --disable-introspection --disable-orbit --with-openldap=no --disable-gtk"
+
+# Disable PolicyKit by default
+PACKAGECONFIG ??= ""
+# We really don't want PolicyKit for native or uclibc
+PACKAGECONFIG_class-native = ""
+PACKAGECONFIG_libc-uclibc = ""
+
+PACKAGECONFIG[policykit] = "--enable-defaults-service,--disable-defaults-service,polkit"
do_install_append() {
# this directory need to be created to avoid an Error 256 at gdm launch