summaryrefslogtreecommitdiffstats
path: root/meta/packages/module-init-tools
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/packages/module-init-tools
parent2fe7cc5f9fdacc4321bddcbf132e32ddea21f59b (diff)
downloadpoky-33ebd14045389534271f051904f26ebad97a0bd0.tar.gz
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/packages/module-init-tools')
-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 0000000000..c56532e007
--- /dev/null
+++ b/meta/packages/module-init-tools/files/module-init-tools-remove-index.patch
@@ -0,0 +1,14 @@
1http://uclibc.org/cgi-bin/viewcvs.cgi/trunk/buildroot/package/module-init-tools/module-init-tools-remove-index.patch?rev=16782&view=auto
2
3diff -ur module-init-tools-3.2.2/modprobe.c module-init-tools-3.2.2-patched/modprobe.c
4--- module-init-tools-3.2.2/modprobe.c 2005-12-01 17:42:09.000000000 -0600
5+++ module-init-tools-3.2.2-patched/modprobe.c 2006-12-04 19:50:50.353237649 -0600
6@@ -270,7 +270,7 @@
7 char *modname;
8
9 /* Ignore lines without : or which start with a # */
10- ptr = index(line, ':');
11+ ptr = strchr(line, ':');
12 if (ptr == NULL || line[strspn(line, "\t ")] == '#')
13 return 0;
14
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 727bfaac1b..dcf9063219 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 \
3the same function that the modutils package serves for Linux 2.4." 3the same function that the modutils package serves for Linux 2.4."
4LICENSE = "GPL" 4LICENSE = "GPL"
5SECTION = "base" 5SECTION = "base"
6PR = "r2" 6PR = "r3"
7 7
8PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" 8PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
9RDEPENDS_${PN} += "module-init-tools-depmod" 9RDEPENDS_${PN} += "module-init-tools-depmod"
@@ -11,11 +11,12 @@ RDEPENDS_${PN} += "module-init-tools-depmod"
11FILES_module-init-tools-depmod = "${sbindir}/depmod.26" 11FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
12FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" 12FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
13 13
14SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ 14SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
15 file://ignore_arch_directory;patch=1 \ 15 file://ignore_arch_directory;patch=1 \
16 file://modutils_extension;patch=1 \ 16 file://modutils_extension;patch=1 \
17 file://no_man_rebuild;patch=1 \ 17 file://no_man_rebuild;patch=1 \
18 file://manpagesopt;patch=1 " 18 file://manpagesopt;patch=1 \
19 file://module-init-tools-remove-index.patch;patch=1 "
19S = "${WORKDIR}/module-init-tools-${PV}" 20S = "${WORKDIR}/module-init-tools-${PV}"
20 21
21EXTRA_OECONF = "--disable-manpages" 22EXTRA_OECONF = "--disable-manpages"