[oe-commits] John Lee : avahi: fix postinst script error
GIT User account
git at amethyst.openembedded.net
Wed Dec 24 06:40:49 UTC 2008
Module: openembedded.git
Branch: john_lee/openmoko-toolchain
Commit: 21de9babc2da7c7b6d43ac37a22e237c94120426
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=21de9babc2da7c7b6d43ac37a22e237c94120426
Author: John Lee <john_lee at openmoko.com>
Date: Fri Nov 21 23:38:21 2008 +0800
avahi: fix postinst script error
The previous version of dbus-1 will not stop clean if there exists
running 'dbus-daemon --session' in the system. That will cause the
script to believe it should ask for a force-reload of dbus, which
leads to an error exit because the 'dbus-daemon --system' wasn't
really running.
---
packages/avahi/avahi-python_0.6.21.bb | 2 +-
packages/avahi/avahi-ui_0.6.21.bb | 2 +-
packages/avahi/avahi.inc | 9 +++++----
packages/avahi/avahi_0.6.19.bb | 2 +-
packages/avahi/avahi_0.6.20.bb | 2 +-
packages/avahi/avahi_0.6.21.bb | 2 +-
packages/avahi/avahi_0.6.22.bb | 2 +-
packages/avahi/avahi_0.6.23.bb | 2 ++
8 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/packages/avahi/avahi-python_0.6.21.bb b/packages/avahi/avahi-python_0.6.21.bb
index 25ca037..639f1de 100644
--- a/packages/avahi/avahi-python_0.6.21.bb
+++ b/packages/avahi/avahi-python_0.6.21.bb
@@ -1,6 +1,6 @@
require avahi.inc
-PR = "r7"
+PR = "r8"
# FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built
FILES_avahi-discover = ""
diff --git a/packages/avahi/avahi-ui_0.6.21.bb b/packages/avahi/avahi-ui_0.6.21.bb
index 28d4c07..4323b49 100644
--- a/packages/avahi/avahi-ui_0.6.21.bb
+++ b/packages/avahi/avahi-ui_0.6.21.bb
@@ -1,6 +1,6 @@
require avahi.inc
-PR = "r7"
+PR = "r8"
DEPENDS += "avahi gtk+"
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index 9a06855..cbd6ac3 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -76,10 +76,11 @@ pkg_postinst_avahi-daemon () {
grep "^avahi:" /etc/group > /dev/null || addgroup avahi
grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
- DBUSPID=`pidof dbus-daemon`
-
- if [ "x$DBUSPID" != "x" ]; then
- /etc/init.d/dbus-1 force-reload
+ DBUSPID="/var/run/dbus/pid"
+ if [ -f $DBUSPID ]; then
+ if ps `cat $DBUSPID` > /dev/null; then
+ /etc/init.d/dbus-1 force-reload
+ fi
fi
}
diff --git a/packages/avahi/avahi_0.6.19.bb b/packages/avahi/avahi_0.6.19.bb
index 6bc5a70..f3e9c6b 100644
--- a/packages/avahi/avahi_0.6.19.bb
+++ b/packages/avahi/avahi_0.6.19.bb
@@ -1,3 +1,3 @@
require avahi.inc
-PR = "r9"
+PR = "r10"
diff --git a/packages/avahi/avahi_0.6.20.bb b/packages/avahi/avahi_0.6.20.bb
index 6bc5a70..f3e9c6b 100644
--- a/packages/avahi/avahi_0.6.20.bb
+++ b/packages/avahi/avahi_0.6.20.bb
@@ -1,3 +1,3 @@
require avahi.inc
-PR = "r9"
+PR = "r10"
diff --git a/packages/avahi/avahi_0.6.21.bb b/packages/avahi/avahi_0.6.21.bb
index c6236ad..04f92f1 100644
--- a/packages/avahi/avahi_0.6.21.bb
+++ b/packages/avahi/avahi_0.6.21.bb
@@ -1,6 +1,6 @@
require avahi.inc
-PR = "r9"
+PR = "r10"
SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
SRC_URI += "file://avr32-ipv6-fix.patch;patch=1"
diff --git a/packages/avahi/avahi_0.6.22.bb b/packages/avahi/avahi_0.6.22.bb
index 43c1b15..f1f82a0 100644
--- a/packages/avahi/avahi_0.6.22.bb
+++ b/packages/avahi/avahi_0.6.22.bb
@@ -1,6 +1,6 @@
require avahi.inc
DEPENDS += "intltool-native"
-PR = "r9"
+PR = "r10"
PACKAGES =+ "libavahi-gobject"
diff --git a/packages/avahi/avahi_0.6.23.bb b/packages/avahi/avahi_0.6.23.bb
index 15f56ff..61a62a5 100644
--- a/packages/avahi/avahi_0.6.23.bb
+++ b/packages/avahi/avahi_0.6.23.bb
@@ -1,5 +1,7 @@
require avahi.inc
+PR = "r1"
+
DEPENDS += "intltool-native"
PACKAGES =+ "libavahi-gobject"
More information about the Openembedded-commits
mailing list