summaryrefslogtreecommitdiff
path: root/meta/packages/busybox/busybox-1.15.3/fix
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-05-25 15:36:14 +0100
committerJoshua Lock <josh@linux.intel.com>2010-05-25 15:36:14 +0100
commit615a98ed9a021da245513790c064761a0a5a67e9 (patch)
treecba72ce890e46d97e86edc2845dd379f98712907 /meta/packages/busybox/busybox-1.15.3/fix
parentcd62d697e1c746bad6dd29030f03a36750a1957e (diff)
downloadopenembedded-core-615a98ed9a021da245513790c064761a0a5a67e9.tar.gz
openembedded-core-615a98ed9a021da245513790c064761a0a5a67e9.tar.bz2
openembedded-core-615a98ed9a021da245513790c064761a0a5a67e9.tar.xz
openembedded-core-615a98ed9a021da245513790c064761a0a5a67e9.zip
busybox: bump to 1.15.3 from OE
Import the 1.15.3 recipe from OpenEmbedded and tweak to match Poky style Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/packages/busybox/busybox-1.15.3/fix')
-rw-r--r--meta/packages/busybox/busybox-1.15.3/fix31
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/packages/busybox/busybox-1.15.3/fix b/meta/packages/busybox/busybox-1.15.3/fix
new file mode 100644
index 000000000..544f41b25
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.15.3/fix
@@ -0,0 +1,31 @@
+---
+ util-linux/mdev.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- busybox-1.13.2.orig/util-linux/mdev.c
++++ busybox-1.13.2/util-linux/mdev.c
+@@ -107,11 +107,11 @@ static void make_device(char *path, int
+
+ #if ENABLE_FEATURE_MDEV_CONF
+ parser = config_open2("/etc/mdev.conf", fopen_for_read);
+
+ /* If we have config file, look up user settings */
+- while (config_read(parser, tokens, 4, 3, "# \t", PARSE_NORMAL)) {
++ while (config_read(parser, tokens, 5, 3, "# \t", PARSE_NORMAL)) {
+ regmatch_t off[1 + 9*ENABLE_FEATURE_MDEV_RENAME_REGEXP];
+ char *val;
+
+ /* Fields: regex uid:gid mode [alias] [cmd] */
+
+@@ -211,10 +211,11 @@ static void make_device(char *path, int
+ }
+ #endif /* ENABLE_FEATURE_MDEV_RENAME */
+
+ #if ENABLE_FEATURE_MDEV_EXEC
+ /* The rest (opt): command to run */
++ val = tokens[4];
+ if (!val)
+ break;
+ {
+ const char *s = "@$*";
+ const char *s2 = strchr(s, *val);