summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-13 11:09:37 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-13 11:09:37 +0000
commit96ece54fa3268d08bb07bedd8eb31493eed020d3 (patch)
treeb7bd231dbe9812e9d4a1288f3e3dd905d5f4f77f
parenta338a7a7fd116f4453921da421522c50643383b5 (diff)
downloadopenembedded-core-96ece54fa3268d08bb07bedd8eb31493eed020d3.tar.gz
openembedded-core-96ece54fa3268d08bb07bedd8eb31493eed020d3.tar.bz2
openembedded-core-96ece54fa3268d08bb07bedd8eb31493eed020d3.tar.xz
openembedded-core-96ece54fa3268d08bb07bedd8eb31493eed020d3.zip
dbus: Disable X for -native versions, also explicitly disable libaudit
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/dbus/dbus-native_1.2.14.bb4
-rw-r--r--meta/packages/dbus/dbus-native_1.2.4.bb4
-rw-r--r--meta/packages/dbus/dbus.inc5
-rw-r--r--meta/packages/dbus/dbus_1.2.14.bb2
-rw-r--r--meta/packages/dbus/dbus_1.2.4.bb2
5 files changed, 12 insertions, 5 deletions
diff --git a/meta/packages/dbus/dbus-native_1.2.14.bb b/meta/packages/dbus/dbus-native_1.2.14.bb
index 9e7e049e7..0c6f5815f 100644
--- 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 9e7e049e7..0c6f5815f 100644
--- 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 f425f883e..154db65ba 100644
--- 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 3d4d00bd2..0d2ed25ec 100644
--- 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 3d4d00bd2..0d2ed25ec 100644
--- 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