aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2008-11-22 06:49:33 +0000
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2008-11-22 06:49:33 +0000
commit50def0e4950ec82e96d79c297c455f5eaf78fc14 (patch)
treeb6e0751d55449d329153192a90f4c2232cd467cf /package
parent1776132d63531afa966c1c581f57d8dd549c27a5 (diff)
downloadbuildroot-50def0e4950ec82e96d79c297c455f5eaf78fc14.tar.gz
buildroot-50def0e4950ec82e96d79c297c455f5eaf78fc14.tar.bz2
busybox: updated 1.13.0 ash fix
Diffstat (limited to 'package')
-rw-r--r--package/busybox/busybox-1.13.0-ash.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/package/busybox/busybox-1.13.0-ash.patch b/package/busybox/busybox-1.13.0-ash.patch
index 6bfb7219b4..c3ab30a492 100644
--- a/package/busybox/busybox-1.13.0-ash.patch
+++ b/package/busybox/busybox-1.13.0-ash.patch
@@ -1,7 +1,6 @@
-diff -urpN busybox-1.13.0/shell/ash.c busybox-1.13.0-ash/shell/ash.c
---- busybox-1.13.0/shell/ash.c 2008-10-30 08:41:32.000000000 +0100
-+++ busybox-1.13.0-ash/shell/ash.c 2008-11-21 11:38:04.000000000 +0100
-@@ -536,6 +536,7 @@ static const char dolatstr[] ALIGN1 = {
+--- busybox-1.13.0/shell/ash.c Thu Oct 30 08:41:32 2008
++++ busybox-1.13.0-ash/shell/ash.c Sat Nov 22 02:31:06 2008
+@@ -536,6 +536,7 @@
#define NHERE 24
#define NXHERE 25
#define NNOT 26
@@ -9,7 +8,7 @@ diff -urpN busybox-1.13.0/shell/ash.c busybox-1.13.0-ash/shell/ash.c
union node;
-@@ -7546,43 +7547,44 @@ commandcmd(int argc UNUSED_PARAM, char *
+@@ -7546,43 +7547,46 @@
/* ============ eval.c */
@@ -74,7 +73,9 @@ diff -urpN busybox-1.13.0/shell/ash.c busybox-1.13.0-ash/shell/ash.c
+ [NDEFUN ] = SHELL_ALIGN(sizeof(struct narg)),
+ [NARG ] = SHELL_ALIGN(sizeof(struct narg)),
+ [NTO ] = SHELL_ALIGN(sizeof(struct nfile)),
++#if ENABLE_ASH_BASH_COMPAT
+ [NTO2 ] = SHELL_ALIGN(sizeof(struct nfile)),
++#endif
+ [NCLOBBER ] = SHELL_ALIGN(sizeof(struct nfile)),
+ [NFROM ] = SHELL_ALIGN(sizeof(struct nfile)),
+ [NFROMTO ] = SHELL_ALIGN(sizeof(struct nfile)),