From 104fd4956517eee3a76add15b8f6cc6dc3047e96 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 15 Apr 2011 07:49:45 +0200
Subject: finetune, generate UUID and enable X support

---
 package/dbus/Makefile            | 3 ++-
 package/dbus/files/dbus.init     | 3 ++-
 package/dbus/files/dbus.postinst | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'package/dbus')

diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index a86beb442..94f473121 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -30,13 +30,13 @@ $(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-tests \
 			--disable-abstract-sockets \
-			--without-x \
 			--enable-checks \
 			--with-xml=expat \
 			--with-session-socket-dir=/var/tmp \
 			--disable-dnotify \
 			--disable-kqueue \
 			--disable-xml-docs \
+			--with-x \
 			--disable-doxygen-docs
 CONFIGURE_ENV+=		ac_cv_have_abstract_sockets=no
 
@@ -52,6 +52,7 @@ dbus-install:
 	${CP} ${WRKINST}/usr/lib/libdbus-1.so* ${IDIR_DBUS}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-uuidgen ${IDIR_DBUS}/usr/bin
 
 dbus-dev-install:
 	${INSTALL_DIR} ${IDIR_DBUS_DEV}/usr/include
diff --git a/package/dbus/files/dbus.init b/package/dbus/files/dbus.init
index 0ccdaad2a..9659a13f5 100644
--- a/package/dbus/files/dbus.init
+++ b/package/dbus/files/dbus.init
@@ -10,7 +10,8 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	mkdir -p /var/run/dbus
+	mkdir -p /var/run/dbus /var/lib
+	ln -sf /lib/dbus /var/lib/dbus
 	/usr/bin/dbus-daemon --config-file=/etc/dbus-1/system.conf
 	;;
 stop)
diff --git a/package/dbus/files/dbus.postinst b/package/dbus/files/dbus.postinst
index 8dd0a50c8..713c1c63a 100644
--- a/package/dbus/files/dbus.postinst
+++ b/package/dbus/files/dbus.postinst
@@ -4,3 +4,6 @@ gid=$(get_next_gid)
 add_group messagebus $gid
 add_user messagebus $(get_next_uid) $gid /var/run/dbus
 add_rcconf dbus dbus NO
+echo Generating UUID
+mkdir /lib/dbus /var/lib && ln -sf /lib/dbus /var/lib/dbus
+dbus-uuidgen --ensure
-- 
cgit v1.2.3