summaryrefslogtreecommitdiffstats
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-10 04:36:52 +0000
commitb00c6f131396b034ac8a2c3df22df19d4b021404 (patch)
tree6fc8b969667f077e957211888ff910b69d5fa9fc
parent8a32acf22ec22c7659843bbc9307df865f7c1392 (diff)
downloadpoky-b00c6f131396b034ac8a2c3df22df19d4b021404.tar.gz
gconf: make polkit an option, and disable by default
(From OE-Core rev: 9ae273bb17ffc88af390fcfbfc74d4a10ea05cf2) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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"
3LICENSE = "LGPLv2+" 3LICENSE = "LGPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" 4LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
5 5
6POLKIT = "polkit" 6DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native gobject-introspection-stub"
7POLKIT_libc-uclibc = ""
8
9DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub"
10DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native" 7DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
11 8
12PR = "r0" 9PR = "r0"
@@ -22,12 +19,16 @@ SRC_URI[archive.sha256sum] = "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e
22 19
23S = "${WORKDIR}/GConf-${PV}" 20S = "${WORKDIR}/GConf-${PV}"
24 21
25POLKIT_OECONF = "--enable-defaults-service"
26POLKIT_OECONF_class-native = "--disable-defaults-service"
27POLKIT_OECONF_libc-uclibc = "--disable-default-service"
28
29EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \ 22EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \
30 --disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF} --disable-gtk" 23 --disable-introspection --disable-orbit --with-openldap=no --disable-gtk"
24
25# Disable PolicyKit by default
26PACKAGECONFIG ??= ""
27# We really don't want PolicyKit for native or uclibc
28PACKAGECONFIG_class-native = ""
29PACKAGECONFIG_libc-uclibc = ""
30
31PACKAGECONFIG[policykit] = "--enable-defaults-service,--disable-defaults-service,polkit"
31 32
32do_install_append() { 33do_install_append() {
33 # this directory need to be created to avoid an Error 256 at gdm launch 34 # this directory need to be created to avoid an Error 256 at gdm launch