dbus: Disable X for -native versions, also explicitly disable libaudit

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/dbus/dbus-native_1.2.14.bb b/meta/packages/dbus/dbus-native_1.2.14.bb
index 9e7e049e78cf7502f49c35336032e57bc3b22bf0..0c6f5815f88d1bf2239b0d8f5aa0f11befb16805 100644 (file)
--- a/meta/packages/dbus/dbus-native_1.2.14.bb
+++ b/meta/packages/dbus/dbus-native_1.2.14.bb
@@ -3,7 +3,9 @@ inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
 
-PR = "r5"
+PR = "r6"
+
+EXTRA_OECONF_X = "--without-x"
 
 do_stage() {
        oe_runmake install

diff --git a/meta/packages/dbus/dbus-native_1.2.4.bb b/meta/packages/dbus/dbus-native_1.2.4.bb
index 9e7e049e78cf7502f49c35336032e57bc3b22bf0..0c6f5815f88d1bf2239b0d8f5aa0f11befb16805 100644 (file)
--- a/meta/packages/dbus/dbus-native_1.2.4.bb
+++ b/meta/packages/dbus/dbus-native_1.2.4.bb
@@ -3,7 +3,9 @@ inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
 
-PR = "r5"
+PR = "r6"
+
+EXTRA_OECONF_X = "--without-x"
 
 do_stage() {
        oe_runmake install

diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc
index f425f883ebd00ea5bea8e914f71049ccb5d50316..154db65ba7de2cb0c684f4637c32b95de3638c4b 100644 (file)
--- a/meta/packages/dbus/dbus.inc
+++ b/meta/packages/dbus/dbus.inc
@@ -59,6 +59,8 @@ grep -q netdev: /etc/group || addgroup netdev
 chmod u+s /usr/libexec/dbus-daemon-launch-helper
 }
 
+EXTRA_OECONF_X = "--with-x"
+
 EXTRA_OECONF = "\
   --disable-qt \
   --disable-qt3 \
@@ -67,8 +69,9 @@ EXTRA_OECONF = "\
   --disable-checks \
   --disable-xml-docs \
   --disable-doxygen-docs \
+  --disable-libaudit \
   --with-xml=expat \
-  --with-x \
+  ${EXTRA_OECONF_X} \
 "
 
 do_stage() {

diff --git a/meta/packages/dbus/dbus_1.2.14.bb b/meta/packages/dbus/dbus_1.2.14.bb
index 3d4d00bd2f23ec77b46482e500b8663e6d355296..0d2ed25ecf64dfc1898398ed1123964709ee60a7 100644 (file)
--- a/meta/packages/dbus/dbus_1.2.14.bb
+++ b/meta/packages/dbus/dbus_1.2.14.bb
@@ -1,5 +1,5 @@
 include dbus.inc
 
-PR = "r2"
+PR = "r3"
 
 inherit update-rc.d

diff --git a/meta/packages/dbus/dbus_1.2.4.bb b/meta/packages/dbus/dbus_1.2.4.bb
index 3d4d00bd2f23ec77b46482e500b8663e6d355296..0d2ed25ecf64dfc1898398ed1123964709ee60a7 100644 (file)
--- a/meta/packages/dbus/dbus_1.2.4.bb
+++ b/meta/packages/dbus/dbus_1.2.4.bb
@@ -1,5 +1,5 @@
 include dbus.inc
 
-PR = "r2"
+PR = "r3"
 
 inherit update-rc.d