On 7/23/2013 2:01 AM, Saul Wold wrote:
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.
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 <[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
+
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:[email protected]
Tel: +86 8477 8594
Mobile: +86 138 1027 4745
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
