summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-06-03 09:57:28 +0100
committerJoshua Lock <josh@linux.intel.com>2010-06-04 20:02:01 +0100
commitf5d0471541ddc29f11c2f17075fd8d46adea740d (patch)
treedde1ba55a9b8903cb724ce3a36a9911d7a3bc4be
parentfe4e6fc997431751968d51e0bd07098ac51ac7cb (diff)
downloadopenembedded-core-f5d0471541ddc29f11c2f17075fd8d46adea740d.tar.gz
openembedded-core-f5d0471541ddc29f11c2f17075fd8d46adea740d.tar.bz2
openembedded-core-f5d0471541ddc29f11c2f17075fd8d46adea740d.tar.xz
openembedded-core-f5d0471541ddc29f11c2f17075fd8d46adea740d.zip
busybox: Fix redirection of fd 0 in ash interactive
Backported change from the 1.16.1 ash patches. Signed-off-by: Joshua Lock <josh@linux.intel.com>
-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 000000000..5c791271e
--- /dev/null
+++ b/meta/packages/busybox/busybox-1.15.3/ash_fix_redirection_of_fd_0.patch
@@ -0,0 +1,21 @@
+Fix redirection of fd 0 in scripts sourced from interactive ash
+
+Based on Busybox git 08d8b3cee1329d390f91bce419e2b4dadf484952 by
+Denys Vlasenko <vda.linux@googlemail.com>.
+
+Can be removed when we bump to 1.16.1 + patches or later
+
+JL 03/06/10
+Index: busybox-1.15.3/shell/ash.c
+===================================================================
+--- busybox-1.15.3.orig/shell/ash.c 2009-12-12 21:16:38.000000000 +0000
++++ busybox-1.15.3/shell/ash.c 2010-06-03 09:44:59.484647637 +0100
+@@ -5071,7 +5071,7 @@
+ return 0;
+ pf = g_parsefile;
+ while (pf) {
+- if (fd == pf->fd) {
++ if (pf->fd > 0 && fd == pf->fd) {
+ return 1;
+ }
+ pf = pf->prev;
diff --git a/meta/packages/busybox/busybox_1.15.3.bb b/meta/packages/busybox/busybox_1.15.3.bb
index 4e465825c..c0b5872e2 100644
--- a/meta/packages/busybox/busybox_1.15.3.bb
+++ b/meta/packages/busybox/busybox_1.15.3.bb
@@ -1,15 +1,16 @@
require busybox.inc
-PR = "2"
+PR = "3"
SRC_URI = "\
http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
- file://udhcpscript.patch;patch=1 \
- file://udhcpc-fix-nfsroot.patch;patch=1 \
- file://B921600.patch;patch=1 \
- file://get_header_tar.patch;patch=1 \
- file://busybox-appletlib-dependency.patch;patch=1 \
- file://0000-wget-no-check-certificate.patch;patch=1 \
- file://run-parts.in.usr-bin.patch;patch=1 \
+ file://udhcpscript.patch \
+ file://udhcpc-fix-nfsroot.patch \
+ file://B921600.patch \
+ file://get_header_tar.patch \
+ file://busybox-appletlib-dependency.patch \
+ file://0000-wget-no-check-certificate.patch \
+ file://run-parts.in.usr-bin.patch \
+ file://ash_fix_redirection_of_fd_0.patch \
file://find-touchscreen.sh \
file://busybox-cron \
file://busybox-httpd \
@@ -24,4 +25,4 @@ SRC_URI = "\
file://defconfig \
"
-EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" \ No newline at end of file
+EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"