summaryrefslogtreecommitdiffstats
path: root/meta/packages/busybox
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/busybox')
-rw-r--r--meta/packages/busybox/busybox-1.15.3/ash_fix_redirection_of_fd_0.patch21
-rw-r--r--meta/packages/busybox/busybox_1.15.3.bb19
2 files changed, 31 insertions, 9 deletions
diff --git a/meta/packages/busybox/busybox-1.15.3/ash_fix_redirection_of_fd_0.patch b/meta/packages/busybox/busybox-1.15.3/ash_fix_redirection_of_fd_0.patch
new file mode 100644
index 0000000000..5c791271e5
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.15.3/ash_fix_redirection_of_fd_0.patch
@@ -0,0 +1,21 @@
1Fix redirection of fd 0 in scripts sourced from interactive ash
2
3Based on Busybox git 08d8b3cee1329d390f91bce419e2b4dadf484952 by
4Denys Vlasenko <vda.linux@googlemail.com>.
5
6Can be removed when we bump to 1.16.1 + patches or later
7
8JL 03/06/10
9Index: busybox-1.15.3/shell/ash.c
10===================================================================
11--- busybox-1.15.3.orig/shell/ash.c 2009-12-12 21:16:38.000000000 +0000
12+++ busybox-1.15.3/shell/ash.c 2010-06-03 09:44:59.484647637 +0100
13@@ -5071,7 +5071,7 @@
14 return 0;
15 pf = g_parsefile;
16 while (pf) {
17- if (fd == pf->fd) {
18+ if (pf->fd > 0 && fd == pf->fd) {
19 return 1;
20 }
21 pf = pf->prev;
diff --git a/meta/packages/busybox/busybox_1.15.3.bb b/meta/packages/busybox/busybox_1.15.3.bb
index 4e465825ce..c0b5872e27 100644
--- a/meta/packages/busybox/busybox_1.15.3.bb
+++ b/meta/packages/busybox/busybox_1.15.3.bb
@@ -1,15 +1,16 @@
1require busybox.inc 1require busybox.inc
2PR = "2" 2PR = "3"
3 3
4SRC_URI = "\ 4SRC_URI = "\
5 http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 5 http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
6 file://udhcpscript.patch;patch=1 \ 6 file://udhcpscript.patch \
7 file://udhcpc-fix-nfsroot.patch;patch=1 \ 7 file://udhcpc-fix-nfsroot.patch \
8 file://B921600.patch;patch=1 \ 8 file://B921600.patch \
9 file://get_header_tar.patch;patch=1 \ 9 file://get_header_tar.patch \
10 file://busybox-appletlib-dependency.patch;patch=1 \ 10 file://busybox-appletlib-dependency.patch \
11 file://0000-wget-no-check-certificate.patch;patch=1 \ 11 file://0000-wget-no-check-certificate.patch \
12 file://run-parts.in.usr-bin.patch;patch=1 \ 12 file://run-parts.in.usr-bin.patch \
13 file://ash_fix_redirection_of_fd_0.patch \
13 file://find-touchscreen.sh \ 14 file://find-touchscreen.sh \
14 file://busybox-cron \ 15 file://busybox-cron \
15 file://busybox-httpd \ 16 file://busybox-httpd \
@@ -24,4 +25,4 @@ SRC_URI = "\
24 file://defconfig \ 25 file://defconfig \
25" 26"
26 27
27EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" \ No newline at end of file 28EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"