wok-4.x rev 751
busybox/script: catch EOF (was hanging with screen=text)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue May 06 15:21:54 2008 +0000 (2008-05-06) |
parents | 686bb38ec018 |
children | 54e0e2124353 |
files | busybox/receipt busybox/stuff/busybox-1.10.1-script.u |
line diff
1.1 --- a/busybox/receipt Tue May 06 15:00:52 2008 +0200 1.2 +++ b/busybox/receipt Tue May 06 15:21:54 2008 +0000 1.3 @@ -15,15 +15,20 @@ 1.4 compile_rules() 1.5 { 1.6 cd $PACKAGE-$VERSION 1.7 - patch -p1 < ../stuff/$PACKAGE-$VERSION-patch.u 1.8 - patch -p1 < ../stuff/$PACKAGE-$VERSION-vcsa2txt.u 1.9 - patch -p1 < ../stuff/$PACKAGE-$VERSION-cpio.u 1.10 - patch -p1 < ../stuff/$PACKAGE-$VERSION-dhcpc.u 1.11 - patch -p1 < ../stuff/$PACKAGE-$VERSION-cpio-mkdir.u 1.12 - patch -p1 < ../stuff/$PACKAGE-$VERSION-cpio-mtime.u 1.13 - patch -p1 < ../stuff/$PACKAGE-$VERSION-unlzma.u 1.14 - patch -p1 < ../stuff/$PACKAGE-$VERSION-tftp.u 1.15 - patch -p1 < ../stuff/$PACKAGE-$VERSION-tar.u || exit 1 1.16 + while read file; do 1.17 + patch -p1 < ../stuff/$file || return 1 1.18 + done <<EOT 1.19 +$PACKAGE-$VERSION-patch.u 1.20 +$PACKAGE-$VERSION-vcsa2txt.u 1.21 +$PACKAGE-$VERSION-cpio.u 1.22 +$PACKAGE-$VERSION-dhcpc.u 1.23 +$PACKAGE-$VERSION-cpio-mkdir.u 1.24 +$PACKAGE-$VERSION-cpio-mtime.u 1.25 +$PACKAGE-$VERSION-unlzma.u 1.26 +$PACKAGE-$VERSION-tftp.u 1.27 +$PACKAGE-$VERSION-tar.u 1.28 +$PACKAGE-$VERSION-script.u 1.29 +EOT 1.30 cp ../stuff/$PACKAGE-$VERSION.config .config 1.31 make oldconfig 1.32 make && make install
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/busybox/stuff/busybox-1.10.1-script.u Tue May 06 15:21:54 2008 +0000 2.3 @@ -0,0 +1,12 @@ 2.4 +--- busybox-1.10.1/util-linux/script.c 2.5 ++++ busybox-1.10.1/util-linux/script.c 2.6 +@@ -132,8 +132,7 @@ 2.7 + count = safe_read(pty, buf, sizeof(buf)); 2.8 + if (count <= 0 && errno != EAGAIN) { 2.9 + /* err/eof: don't read anymore */ 2.10 +- pfd[1].revents = 0; 2.11 +- fd_count--; 2.12 ++ break; 2.13 + } 2.14 + if (count > 0) { 2.15 + full_write(1, buf, count);