summaryrefslogtreecommitdiff
path: root/packages/module-init-tools
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-05-13 08:35:14 +0000
committerKoen Kooi <koen@openembedded.org>2007-05-13 08:35:14 +0000
commit1021872a44c22e64466ceab4cbebcca19baec63c (patch)
treee4f43e121adcfec4eba3f425c0ad2ad80921abf1 /packages/module-init-tools
parent73e75043bb77a03b49734f89c5e5d0495a60840d (diff)
module-init-tools: fix build against uclibc
Diffstat (limited to 'packages/module-init-tools')
-rw-r--r--packages/module-init-tools/files/module-init-tools-remove-index.patch14
-rw-r--r--packages/module-init-tools/module-init-tools_3.2.2.bb5
2 files changed, 17 insertions, 2 deletions
diff --git a/packages/module-init-tools/files/module-init-tools-remove-index.patch b/packages/module-init-tools/files/module-init-tools-remove-index.patch
new file mode 100644
index 0000000000..c56532e007
--- /dev/null
+++ b/packages/module-init-tools/files/module-init-tools-remove-index.patch
@@ -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;
+
diff --git a/packages/module-init-tools/module-init-tools_3.2.2.bb b/packages/module-init-tools/module-init-tools_3.2.2.bb
index c7782cb54c..dcf9063219 100644
--- a/packages/module-init-tools/module-init-tools_3.2.2.bb
+++ b/packages/module-init-tools/module-init-tools_3.2.2.bb
@@ -3,7 +3,7 @@ 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/utils/kernel/module-init-tools/module-i
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"