aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric BENARD <eric@eukrea.com>2011-01-10 05:19:55 +0000
committerEric Bénard <eric@eukrea.com>2011-01-10 11:06:28 +0100
commit24db17681abff533c7bea297747d8d926dbab097 (patch)
treea2cd5e88a14dee8e9cb115e07b7e4ba8538a7d58
parentdaaefcb00accf548a54396def63edd95ed30f25d (diff)
downloadopenembedded-24db17681abff533c7bea297747d8d926dbab097.zip
openembedded-24db17681abff533c7bea297747d8d926dbab097.tar.gz
openembedded-24db17681abff533c7bea297747d8d926dbab097.tar.bz2
busybox-1.18.1: add latest fix
modprobe-small: support compressed modules in insmodmaster http://git.busybox.net/busybox/commit/?id=e9d12b57bfb941e754d09a7d5f54c183ca7dbb25 Signed-off-by: Eric Bénard <eric@eukrea.com> Acked-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes/busybox/busybox-1.18.1/busybox-1.18.1-hush.patch2
-rw-r--r--recipes/busybox/busybox-1.18.1/busybox-1.18.1-modprobe-small.patch21
-rw-r--r--recipes/busybox/busybox_1.18.1.bb3
3 files changed, 24 insertions, 2 deletions
diff --git a/recipes/busybox/busybox-1.18.1/busybox-1.18.1-hush.patch b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-hush.patch
index 5281a52..590ed88 100644
--- a/recipes/busybox/busybox-1.18.1/busybox-1.18.1-hush.patch
+++ b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-hush.patch
@@ -1,6 +1,6 @@
diff -urpN busybox-1.18.1/shell/hush.c busybox-1.18.1-hush/shell/hush.c
--- busybox-1.18.1/shell/hush.c 2010-12-21 05:31:04.000000000 +0100
-+++ busybox-1.18.1-hush/shell/hush.c 2011-01-07 14:59:19.649956156 +0100
++++ busybox-1.18.1-hush/shell/hush.c 2011-01-09 21:00:02.000000000 +0100
@@ -913,7 +913,7 @@ static const struct built_in_command blt
*/
#if HUSH_DEBUG
diff --git a/recipes/busybox/busybox-1.18.1/busybox-1.18.1-modprobe-small.patch b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-modprobe-small.patch
new file mode 100644
index 0000000..c1d5615
--- /dev/null
+++ b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-modprobe-small.patch
@@ -0,0 +1,21 @@
+diff -urpN busybox-1.18.1/modutils/modprobe-small.c busybox-1.18.1-modprobe-small/modutils/modprobe-small.c
+--- busybox-1.18.1/modutils/modprobe-small.c 2010-12-20 01:41:27.000000000 +0100
++++ busybox-1.18.1-modprobe-small/modutils/modprobe-small.c 2011-01-09 21:00:26.000000000 +0100
+@@ -844,13 +844,15 @@ int modprobe_main(int argc UNUSED_PARAM,
+ void *map;
+
+ len = MAXINT(ssize_t);
+- map = xmalloc_xopen_read_close(*argv, &len);
++ map = xmalloc_open_zipped_read_close(*argv, &len);
+ if (init_module(map, len,
+ IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "")
+ IF_NOT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("")
+- ) != 0)
++ ) != 0
++ ) {
+ bb_error_msg_and_die("can't insert '%s': %s",
+ *argv, moderror(errno));
++ }
+ return 0;
+ }
+
diff --git a/recipes/busybox/busybox_1.18.1.bb b/recipes/busybox/busybox_1.18.1.bb
index 69daef5..7c7f21f 100644
--- a/recipes/busybox/busybox_1.18.1.bb
+++ b/recipes/busybox/busybox_1.18.1.bb
@@ -1,5 +1,5 @@
require busybox_1.1x.inc
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
SRC_URI += " \
file://busybox-1.18.1-hush.patch \
@@ -7,6 +7,7 @@ SRC_URI += " \
file://busybox-1.18.1-bzip2.patch \
file://busybox-1.18.1-mkswap.patch \
file://busybox-1.18.1-warning.patch \
+ file://busybox-1.18.1-modprobe-small.patch \
"
SRC_URI[md5sum] = "f15fe752d8b7012aa5e59f83b88ccb1c"