dbus: fix two issues
cover dbus: fix two issues
From: Jackie Huang <[email protected]>
Test info:
MACHINE = "qemux86-64"
$ bitbake core-image-sato $ runqemu qemux86-64 core-image-sato ext3 nographic root@qemux86-64:~# /etc/init.d/dbus-1 stop Stopping system message bus: dbus. root@qemux86-64:~# /etc/init.d/dbus-1 restart Stopping system message bus: dbus. Starting system message bus: dbus. root@qemux86-64:~# /etc/init.d/dbus-1 start system message bus already started; not starting. Starting system message bus: dbus. root@qemux86-64:~# /etc/init.d/dbus-1 stop Stopping system message bus: dbus. root@qemux86-64:~# /etc/init.d/dbus-1 start Starting system message bus: dbus.
--
The following changes since commit 8fc6904fe97438478119db6cd23b7b4eb33b50aa:
curl: add upstream status to patch (2013-07-18 12:21:13 -0700)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib jhuang0/r_bbappend_dbus_0722_0
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/r_bbappend_dbus_0722_0
Jackie Huang (2):
dbus: remove build host test in configure script
dbus: add -o option into start-stop-daemon arguments
meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init | 4 +- meta/recipes-core/dbus/dbus-1.6.8/os-test.patch | 35 +++++++++++++++++++++++ meta/recipes-core/dbus/dbus.inc | 4 ++- 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-core/dbus/dbus-1.6.8/os-test.patch
Signature · 1 line
1.7.4.1
PATCH 1/2 dbus: remove build host test in configure script
From: Jackie Huang <[email protected]>
The dbus build tests the build host to detect what initscript environment it expects. Remove the test and set it to "redhat" unconditionally as the oe-core initscript has a redhat-style pid file path.
--- meta/recipes-core/dbus/dbus-1.6.8/os-test.patch | 35 +++++++++++++++++++++++ meta/recipes-core/dbus/dbus.inc | 4 ++- 2 files changed, 38 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-core/dbus/dbus-1.6.8/os-test.patch
meta/recipes-core/dbus/dbus-1.6.8/os-test.patch new file +35 -0
@@ -0,0 +1,35 @@ +dbus: remove build host test in configure script + +The dbus build tests the build host to detect what initscript +environment it expects. Remove the test and set it to "redhat" +unconditionally as the oe-core initscript has a redhat-style pid file +path. + +Signed-off-by: Andy Ross <[email protected]> +Upstream-Status: innappropriate [embedded] + +diff -u a/configure.ac b/configure.ac +--- a/configure.ac 2012-08-28 11:23:43.040609874 -0700 ++++ b/configure.ac 2012-08-28 11:54:25.602913945 -0700 +@@ -1348,19 +1348,8 @@ + AS_AC_EXPAND(EXPANDED_LIBEXECDIR, "$libexecdir") + AS_AC_EXPAND(EXPANDED_DATADIR, "$datadir") + +-#### Check our operating system +-operating_system=unknown +-if test -f /etc/redhat-release || test -f $EXPANDED_SYSCONFDIR/redhat-release ; then +- operating_system=redhat +-fi +- +-if test -f /etc/slackware-version || test -f $EXPANDED_SYSCONFDIR/slackware-version ; then +- operating_system=slackware +-fi +- +-if test -f /usr/bin/cygwin1.dll || test -f $EXPANDED_BINDIR/cygwin1.dll ; then +- operating_system=cygwin +-fi ++#### Build host test removed from upstream code, openembedded initscript is redhat-like: ++operating_system=redhat + + #### Sort out init scripts +
meta/recipes-core/dbus/dbus.inc +3 -1
@@ -16,7 +16,9 @@ INC_PR = "r6" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch; \ - file://dbus-1.init" + file://dbus-1.init \ + file://os-test.patch \ +" inherit useradd autotools pkgconfig gettext update-rc.d
Signature · 1 line
1.7.4.1
Re: [PATCH 1/2] dbus: remove build host test in configure script
Quoted 11 lines · On 07/22/2013 01:14 AM, [email protected] wrote:
From: Jackie Huang <[email protected]>
The dbus build tests the build host to detect what initscript environment it expects. Remove the test and set it to "redhat" unconditionally as the oe-core initscript has a redhat-style pid file path.
Signed-off-by Andy Ross <[email protected]Signed-off-by Jackie Huang <[email protected]>--- meta/recipes-core/dbus/dbus-1.6.8/os-test.patch | 35 +++++++++++++++++++++++
This file should be in dbus-1.6.10, please rebase against master.
Thanks
Sau!
Quoted 61 lines
meta/recipes-core/dbus/dbus.inc | 4 ++- 2 files changed, 38 insertions(+), 1 deletions(-)create mode 100644
meta/recipes-core/dbus/dbus-1.6.8/os-test.patchmeta/recipes-core/dbus/dbus-1.6.8/os-test.patch new file +35
-0@@ -0,0 +1,35 @@ +dbus: remove build host test in configure script + +The dbus build tests the build host to detect what initscript +environment it expects. Remove the test and set it to "redhat" +unconditionally as the oe-core initscript has a redhat-style pid file +path. + +Signed-off-by: Andy Ross <[email protected]> +Upstream-Status: innappropriate [embedded] + +diff -u a/configure.ac b/configure.ac +--- a/configure.ac 2012-08-28 11:23:43.040609874 -0700 ++++ b/configure.ac 2012-08-28 11:54:25.602913945 -0700 +@@ -1348,19 +1348,8 @@ + AS_AC_EXPAND(EXPANDED_LIBEXECDIR, "$libexecdir") + AS_AC_EXPAND(EXPANDED_DATADIR, "$datadir") + +-#### Check our operating system +-operating_system=unknown +-if test -f /etc/redhat-release || test -f $EXPANDED_SYSCONFDIR/redhat-release ; then +- operating_system=redhat +-fi +- +-if test -f /etc/slackware-version || test -f $EXPANDED_SYSCONFDIR/slackware-version ; then +- operating_system=slackware +-fi +- +-if test -f /usr/bin/cygwin1.dll || test -f $EXPANDED_BINDIR/cygwin1.dll ; then +- operating_system=cygwin +-fi ++#### Build host test removed from upstream code, openembedded initscript is redhat-like: ++operating_system=redhat + + #### Sort out init scripts +meta/recipes-core/dbus/dbus.inc +3
-1@@ -16,7 +16,9 @@ INC_PR = "r6" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch; \ - file://dbus-1.init" + file://dbus-1.init \ + file://os-test.patch \ +" inherit useradd autotools pkgconfig gettext update-rc.d
Re: [PATCH 1/2] dbus: remove build host test in configure script
Quoted 8 lines · Saul Wold
Quoted 7 lines · On 07/22/2013 01:14 AM, [email protected] wrote:
From: Jackie Huang <[email protected]>
The dbus build tests the build host to detect what initscript environment it expects. Remove the test and set it to "redhat" unconditionally as the oe-core initscript has a redhat-style pid file path.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Andy Ross <[email protected]Signed-off-by Jackie Huang <[email protected]>--- meta/recipes-core/dbus/dbus-1.6.8/os-test.patch | 35+++++++++++++++++++++++
This file should be in dbus-1.6.10, please rebase against master.
rebased:
The following changes since commit 8fc6904fe97438478119db6cd23b7b4eb33b50aa:
curl: add upstream status to patch (2013-07-18 12:21:13 -0700)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib jhuang0/r_bbappend_dbus_0723_0
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/r_bbappend_dbus_0723_0
Jackie Huang (2):
dbus: remove build host test in configure script
dbus: add -o option into start-stop-daemon arguments
meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init | 4 +- meta/recipes-core/dbus/dbus-1.6.10/os-test.patch | 35 ++++++++++++++++++++++ meta/recipes-core/dbus/dbus.inc | 4 ++- 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-core/dbus/dbus-1.6.10/os-test.patch
Thanks,
Jackie
Quoted 73 lines
Thanks
Sau!Quoted 68 lines
meta/recipes-core/dbus/dbus.inc | 4 ++- 2 files changed, 38 insertions(+), 1 deletions(-)create mode 100644
meta/recipes-core/dbus/dbus-1.6.8/os-test.patchmeta/recipes-core/dbus/dbus-1.6.8/os-test.patch new file +20
-0@@ -0,0 +1,35 @@ +dbus: remove build host test in configure script + +The dbus build tests the build host to detect what initscript +environment it expects. Remove the test and set it to "redhat" +unconditionally as the oe-core initscript has a redhat-style pid file +path. + +Signed-off-by: Andy Ross <[email protected]> +Upstream-Status: innappropriate [embedded] + +diff -u a/configure.ac b/configure.ac +--- a/configure.ac 2012-08-28 11:23:43.040609874 -0700 ++++ b/configure.ac 2012-08-28 11:54:25.602913945 -0700 +@@ -1348,19 +1348,8 @@ + AS_AC_EXPAND(EXPANDED_LIBEXECDIR, "$libexecdir") + AS_AC_EXPAND(EXPANDED_DATADIR, "$datadir") + +-#### Check our operating system +-operating_system=unknown +-if test -f /etc/redhat-release || test -f$EXPANDED_SYSCONFDIR/redhat-release ; then
+- operating_system=redhat +-fi +- +-if test -f /etc/slackware-version || test -f $EXPANDED_SYSCONFDIR/slackware-version ; then +- operating_system=slackware +-fi +- +-if test -f /usr/bin/cygwin1.dll || test -f $EXPANDED_BINDIR/cygwin1.dll ; then +- operating_system=cygwin +-fi++#### Build host test removed from upstream code, openembedded initscript is redhat-like:
++operating_system=redhatmeta/recipes-core/dbus/dbus-1.6.8/os-test.patch new file +3
-0+ + #### Sort out init scripts +meta/recipes-core/dbus/dbus.inc +3
-1@@ -16,7 +16,9 @@ INC_PR = "r6" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch; \ - file://dbus-1.init" + file://dbus-1.init \ + file://os-test.patch \ +" inherit useradd autotools pkgconfig gettext update-rc.d
Signature · 5 lines
Jackie Huang WIND RIVER | China Development Center MSN:[email protected] Tel: +86 8477 8594 Mobile: +86 138 1027 4745
PATCH 2/2 dbus: add -o option into start-stop-daemon arguments
In reply to [email protected]From: Jackie Huang <[email protected]>
/etc/init.d/dbus-1 use "set -e" to let the script exit when any command failes. This will cause "dbus-1 restart" command can't start dbus when dbus is stopped. so add --oknodo option to let start-stop-daemon exit with friendly return value. Then commands will work well.
--- meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init +2 -2
@@ -57,7 +57,7 @@ start_it_up() dbus-uuidgen --ensure echo -n "Starting $DESC: " - start-stop-daemon --start --quiet --pidfile $PIDFILE \ + start-stop-daemon -o --start --quiet --pidfile $PIDFILE \ --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS echo "$NAME." if [ -d $EVENTDIR ]; then
@@ -72,7 +72,7 @@ shut_it_down() run-parts --arg=stop $EVENTDIR fi echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + start-stop-daemon -o --stop --quiet --pidfile $PIDFILE \ --user $DAEMONUSER # We no longer include these arguments so that start-stop-daemon # can do its job even given that we may have been upgraded.
Signature · 1 line
1.7.4.1