diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/ltp/patches/patch-runltp | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/ltp/patches/patch-runltp')
| -rw-r--r-- | package/ltp/patches/patch-runltp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/package/ltp/patches/patch-runltp b/package/ltp/patches/patch-runltp deleted file mode 100644 index 342a454d4..000000000 --- a/package/ltp/patches/patch-runltp +++ /dev/null @@ -1,22 +0,0 @@ -$Id$ -ash does not understand the test '-a' (test for bare existence) ---- ltp-full-20061121.orig/runltp 2006-11-21 21:31:20.000000000 +0100 -+++ ltp-full-20061121/runltp 2006-12-06 13:22:14.000000000 +0100 -@@ -285,7 +285,7 @@ main() - ${LTPROOT}/runtest/sched ${LTPROOT}/runtest/math \ - ${LTPROOT}/runtest/nptl ${LTPROOT}/runtest/pty - do -- [ -a "$SCENFILES" ] || \ -+ [ -e "$SCENFILES" ] || \ - { - echo "FATAL: missing scenario file $SCENFILES" - exit 1 -@@ -319,7 +319,7 @@ main() - ${LTPROOT}/runtest/rpc \ - ${LTPROOT}/runtest/nfs - do -- [ -a "$SCENFILES" ] || \ -+ [ -e "$SCENFILES" ] || \ - { - echo "FATAL: missing scenario file $SCENFILES" - exit 1 |