sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: 25dc927009252151cc976b13c3f5bd19131cc4e8)

Signed-off-by: Andy Ross <andy.ross@windriver.com
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jackie Huang 2013-07-22 03:45:41 -04:00 committed by Richard Purdie
parent 16ce101c3f
commit c313d60aed
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-core/dbus/dbus-1.6.10/os-test.patch Normal file
View File

@ -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

4
meta/recipes-core/dbus/dbus.inc
View File

@ -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