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-testcases_kernel_syscalls_Makefile | |
| 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-testcases_kernel_syscalls_Makefile')
| -rw-r--r-- | package/ltp/patches/patch-testcases_kernel_syscalls_Makefile | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/package/ltp/patches/patch-testcases_kernel_syscalls_Makefile b/package/ltp/patches/patch-testcases_kernel_syscalls_Makefile deleted file mode 100644 index a90351258..000000000 --- a/package/ltp/patches/patch-testcases_kernel_syscalls_Makefile +++ /dev/null @@ -1,13 +0,0 @@ -$Id$ -excluded pselect for now, as there is no support for it in kernel-2.4 ---- ltp-full-20061121.orig/testcases/kernel/syscalls/Makefile 2006-11-21 21:31:28.000000000 +0100 -+++ ltp-full-20061121/testcases/kernel/syscalls/Makefile 2006-12-06 11:24:39.000000000 +0100 -@@ -25,7 +25,7 @@ EXCLUDE_DIR=epoll - # - # Commented this out since there are directories here we don't want built by default - # --SUBDIR = `ls */Makefile | sed "s/Makefile//g" | grep -v epoll` -+SUBDIR = `ls */Makefile | sed "s/Makefile//g" | grep -vE "^epoll|pselect"` - UCLINUX_SUBDIR = `ls */Makefile | sed "s/Makefile//g" | grep -vE "^fork|epoll|capget|capset|chmod|chown|llseek|nftw|clone|profil|getcontext"` - - all: |