[oe-commits] org.oe.dev module-init-tools: fix build against uclibc

[koen commit]

module-init-tools: fix build against uclibc

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: b0e020cac71f7e0d99397a7095aec04585472e20
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b0e020cac71f7e0d99397a7095aec04585472e20
Files:
1
packages/module-init-tools/files/module-init-tools-remove-index.patch
packages/module-init-tools/module-init-tools_3.2.2.bb
Diffs:

#
# mt diff -re1470d183e2b9baf8c524d7bb31150bc26f2d191 -rb0e020cac71f7e0d99397a7095aec04585472e20
#
# 
# 
# add_file "packages/module-init-tools/files/module-init-tools-remove-index.patch"
#  content [ec50fc017e8caf223e1d8a322d8ae795f938cff1]
# 
# patch "packages/module-init-tools/module-init-tools_3.2.2.bb"
#  from [846fd8eb3c0c50ecfeda250b2311af45de726c3c]
#    to [1d5b1ad8d6dc2914d2df0713ce7d55d2f7ed9269]
# 
============================================================
--- packages/module-init-tools/files/module-init-tools-remove-index.patch	ec50fc017e8caf223e1d8a322d8ae795f938cff1
+++ packages/module-init-tools/files/module-init-tools-remove-index.patch	ec50fc017e8caf223e1d8a322d8ae795f938cff1
@@ -0,0 +1,14 @@
+http://uclibc.org/cgi-bin/viewcvs.cgi/trunk/buildroot/package/module-init-tools/module-init-tools-remove-index.patch?rev=16782&view=auto
+
+diff -ur module-init-tools-3.2.2/modprobe.c module-init-tools-3.2.2-patched/modprobe.c
+--- module-init-tools-3.2.2/modprobe.c	2005-12-01 17:42:09.000000000 -0600
++++ module-init-tools-3.2.2-patched/modprobe.c	2006-12-04 19:50:50.353237649 -0600
+@@ -270,7 +270,7 @@
+ 	char *modname;
+ 
+ 	/* Ignore lines without : or which start with a # */
+-	ptr = index(line, ':');
++	ptr = strchr(line, ':');
+ 	if (ptr == NULL || line[strspn(line, "\t ")] == '#')
+ 		return 0;
+ 
============================================================
--- packages/module-init-tools/module-init-tools_3.2.2.bb	846fd8eb3c0c50ecfeda250b2311af45de726c3c
+++ packages/module-init-tools/module-init-tools_3.2.2.bb	1d5b1ad8d6dc2914d2df0713ce7d55d2f7ed9269
@@ -1,9 +1,9 @@ SECTION = "base"
 DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
 removing kernel modules for Linux (versions 2.5.48 and above). It serves \
 the same function that the modutils package serves for Linux 2.4."
 LICENSE = "GPL"
 SECTION = "base"
-PR = "r2"
+PR = "r3"
 
 PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
 RDEPENDS_${PN} += "module-init-tools-depmod"
@@ -15,7 +15,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
 	   file://ignore_arch_directory;patch=1 \
 	   file://modutils_extension;patch=1 \
 	   file://no_man_rebuild;patch=1 \
-	   file://manpagesopt;patch=1 "
+	   file://manpagesopt;patch=1 \
+           file://module-init-tools-remove-index.patch;patch=1 "
 S = "${WORKDIR}/module-init-tools-${PV}"
 
 EXTRA_OECONF = "--disable-manpages"