diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-12-18 16:20:04 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-18 17:06:58 +0000 |
| commit | 0289a1c325eea881ce3d68def5262f9e763d4fd2 (patch) | |
| tree | def866ff767bbbd88e7ee771d95df5c5eddd71ba /meta/recipes-core/dbus/dbus/os-test.patch | |
| parent | b117403423f700eb4cc6967b9fb8ff3e2858e279 (diff) | |
| download | openembedded-core-contrib-0289a1c325eea881ce3d68def5262f9e763d4fd2.tar.gz | |
dbus: upgrade to 1.6.18
Drop PR and INC_PR.
Move patches into a non-versioned directory, and update dbus-ptest to match.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dbus/dbus/os-test.patch')
| -rw-r--r-- | meta/recipes-core/dbus/dbus/os-test.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-core/dbus/dbus/os-test.patch b/meta/recipes-core/dbus/dbus/os-test.patch new file mode 100644 index 0000000000..79554b1ee1 --- /dev/null +++ b/meta/recipes-core/dbus/dbus/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 + |