* [PATCH 0/2] dbus: fix two issues @ 2013-07-22 8:14 jackie.huang 2013-07-22 8:14 ` [PATCH 1/2] dbus: remove build host test in configure script jackie.huang 2013-07-22 8:14 ` [PATCH 2/2] dbus: add -o option into start-stop-daemon arguments jackie.huang 0 siblings, 2 replies; 5+ messages in thread From: jackie.huang @ 2013-07-22 8:14 UTC (permalink / raw) To: openembedded-core From: Jackie Huang <jackie.huang@windriver.com> 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 -- 1.7.4.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] dbus: remove build host test in configure script 2013-07-22 8:14 [PATCH 0/2] dbus: fix two issues jackie.huang @ 2013-07-22 8:14 ` jackie.huang 2013-07-22 18:01 ` Saul Wold 2013-07-22 8:14 ` [PATCH 2/2] dbus: add -o option into start-stop-daemon arguments jackie.huang 1 sibling, 1 reply; 5+ messages in thread From: jackie.huang @ 2013-07-22 8:14 UTC (permalink / raw) To: openembedded-core From: Jackie Huang <jackie.huang@windriver.com> 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 <andy.ross@windriver.com Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- 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 diff --git a/meta/recipes-core/dbus/dbus-1.6.8/os-test.patch b/meta/recipes-core/dbus/dbus-1.6.8/os-test.patch new file mode 100644 index 0000000..79554b1 --- /dev/null +++ b/meta/recipes-core/dbus/dbus-1.6.8/os-test.patch @@ -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 <andy.ross@windriver.com> +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 + diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index b07aefa..580a936 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -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 -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] dbus: remove build host test in configure script 2013-07-22 8:14 ` [PATCH 1/2] dbus: remove build host test in configure script jackie.huang @ 2013-07-22 18:01 ` Saul Wold 2013-07-23 5:27 ` jhuang0 0 siblings, 1 reply; 5+ messages in thread From: Saul Wold @ 2013-07-22 18:01 UTC (permalink / raw) To: jackie.huang; +Cc: openembedded-core On 07/22/2013 01:14 AM, jackie.huang@windriver.com wrote: > From: Jackie Huang <jackie.huang@windriver.com> > > 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 <andy.ross@windriver.com > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> > --- > 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! > 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 > > diff --git a/meta/recipes-core/dbus/dbus-1.6.8/os-test.patch b/meta/recipes-core/dbus/dbus-1.6.8/os-test.patch > new file mode 100644 > index 0000000..79554b1 > --- /dev/null > +++ b/meta/recipes-core/dbus/dbus-1.6.8/os-test.patch > @@ -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 <andy.ross@windriver.com> > +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 > + > diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc > index b07aefa..580a936 100644 > --- a/meta/recipes-core/dbus/dbus.inc > +++ b/meta/recipes-core/dbus/dbus.inc > @@ -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 > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] dbus: remove build host test in configure script 2013-07-22 18:01 ` Saul Wold @ 2013-07-23 5:27 ` jhuang0 0 siblings, 0 replies; 5+ messages in thread From: jhuang0 @ 2013-07-23 5:27 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core On 7/23/2013 2:01 AM, Saul Wold wrote: > On 07/22/2013 01:14 AM, jackie.huang@windriver.com wrote: >> From: Jackie Huang <jackie.huang@windriver.com> >> >> 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 <andy.ross@windriver.com >> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> >> --- >> 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 > > Thanks > Sau! > >> 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 >> >> diff --git a/meta/recipes-core/dbus/dbus-1.6.8/os-test.patch >> b/meta/recipes-core/dbus/dbus-1.6.8/os-test.patch >> new file mode 100644 >> index 0000000..79554b1 >> --- /dev/null >> +++ b/meta/recipes-core/dbus/dbus-1.6.8/os-test.patch >> @@ -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 <andy.ross@windriver.com> >> +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 >> + >> diff --git a/meta/recipes-core/dbus/dbus.inc >> b/meta/recipes-core/dbus/dbus.inc >> index b07aefa..580a936 100644 >> --- a/meta/recipes-core/dbus/dbus.inc >> +++ b/meta/recipes-core/dbus/dbus.inc >> @@ -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 >> >> > -- Jackie Huang WIND RIVER | China Development Center MSN:jackielily@hotmail.com Tel: +86 8477 8594 Mobile: +86 138 1027 4745 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] dbus: add -o option into start-stop-daemon arguments 2013-07-22 8:14 [PATCH 0/2] dbus: fix two issues jackie.huang 2013-07-22 8:14 ` [PATCH 1/2] dbus: remove build host test in configure script jackie.huang @ 2013-07-22 8:14 ` jackie.huang 1 sibling, 0 replies; 5+ messages in thread From: jackie.huang @ 2013-07-22 8:14 UTC (permalink / raw) To: openembedded-core From: Jackie Huang <jackie.huang@windriver.com> /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. Signed-off-by: Song.Li <Song.Li@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init b/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init index 64f2170..0351190 100644 --- a/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init +++ b/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init @@ -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. -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-07-23 5:27 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-07-22 8:14 [PATCH 0/2] dbus: fix two issues jackie.huang 2013-07-22 8:14 ` [PATCH 1/2] dbus: remove build host test in configure script jackie.huang 2013-07-22 18:01 ` Saul Wold 2013-07-23 5:27 ` jhuang0 2013-07-22 8:14 ` [PATCH 2/2] dbus: add -o option into start-stop-daemon arguments jackie.huang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox