[oe-commits] Tom Rini : sysvinit: Upstream patch for newer libcs

[git version control]

Module: openembedded.git
Branch: testing-next
Commit: 25491674784accdf3fd8f102ad094e5c6e624778
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=25491674784accdf3fd8f102ad094e5c6e624778

Author: Tom Rini <tom_rini at mentor.com>
Date:   Fri May 27 10:37:47 2011 -0700

sysvinit: Upstream patch for newer libcs

ENOIOCTLCMD isn't defined in newer libcs.  The fix here comes from Ubuntu
which in turn comes from upstream.

Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 .../sysvinit-2.86/100_fix_ftbfs_enoioctlcmd.patch  |   16 ++++++++++++++++
 recipes/sysvinit/sysvinit_2.86.bb                  |    3 ++-
 2 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/recipes/sysvinit/sysvinit-2.86/100_fix_ftbfs_enoioctlcmd.patch b/recipes/sysvinit/sysvinit-2.86/100_fix_ftbfs_enoioctlcmd.patch
new file mode 100644
index 0000000..d4ed61e
--- /dev/null
+++ b/recipes/sysvinit/sysvinit-2.86/100_fix_ftbfs_enoioctlcmd.patch
@@ -0,0 +1,16 @@
+## Description: fixes FTBFS on natty
+## Origin/Author: http://bazaar.launchpad.net/~vcs-imports/sysvinit/trunk/revision/40
+Index: sysvinit-2.86/src/bootlogd.c
+===================================================================
+--- sysvinit-2.86.orig/src/bootlogd.c
++++ sysvinit-2.86/src/bootlogd.c
+@@ -228,6 +228,9 @@ int consolename(char *res, int rlen)
+ 	}
+ 
+ #ifdef TIOCGDEV
++# ifndef  ENOIOCTLCMD
++#  define ENOIOCTLCMD	515
++# endif
+ 	if (ioctl(0, TIOCGDEV, &kdev) == 0)
+ 		return findtty(res, rlen, (dev_t)kdev);
+ 	if (errno != ENOIOCTLCMD) return -1;
diff --git a/recipes/sysvinit/sysvinit_2.86.bb b/recipes/sysvinit/sysvinit_2.86.bb
index dacc397..e39ff40 100644
--- a/recipes/sysvinit/sysvinit_2.86.bb
+++ b/recipes/sysvinit/sysvinit_2.86.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init."
 SECTION = "base"
 LICENSE = "GPLv2+"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r64"
+PR = "r65"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
@@ -20,6 +20,7 @@ SYSVINIT_ENABLED_GETTYS ?= "1"
 
 SRC_URI = "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-${PV}.tar.gz \
            file://install.patch \
+           file://100_fix_ftbfs_enoioctlcmd.patch \
            file://need \
            file://provide \
            file://inittab \