summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-10-26 11:27:50 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-10-26 11:27:50 +0000
commit33ebd14045389534271f051904f26ebad97a0bd0 (patch)
tree1b8888f2e0cadaa7707418a4de9f39105b3c022d /meta
parent2fe7cc5f9fdacc4321bddcbf132e32ddea21f59b (diff)
downloadopenembedded-core-33ebd14045389534271f051904f26ebad97a0bd0.tar.gz
openembedded-core-33ebd14045389534271f051904f26ebad97a0bd0.tar.bz2
openembedded-core-33ebd14045389534271f051904f26ebad97a0bd0.tar.xz
openembedded-core-33ebd14045389534271f051904f26ebad97a0bd0.zip
module-init-tools: fic uclibc build (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2994 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/module-init-tools/files/module-init-tools-remove-index.patch14
-rw-r--r--meta/packages/module-init-tools/module-init-tools_3.2.2.bb7
2 files changed, 18 insertions, 3 deletions
diff --git a/meta/packages/module-init-tools/files/module-init-tools-remove-index.patch b/meta/packages/module-init-tools/files/module-init-tools-remove-index.patch
new file mode 100644
index 000000000..c56532e00
--- /dev/null
+++ b/meta/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/meta/packages/module-init-tools/module-init-tools_3.2.2.bb b/meta/packages/module-init-tools/module-init-tools_3.2.2.bb
index 727bfaac1..dcf906321 100644
--- a/meta/packages/module-init-tools/module-init-tools_3.2.2.bb
+++ b/meta/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"
@@ -11,11 +11,12 @@ RDEPENDS_${PN} += "module-init-tools-depmod"
FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
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"