From eff2027152a5fc4b3d07119036b3db61c571bf09 Mon Sep 17 00:00:00 2001 From: Bernhard Fischer Date: Fri, 10 Oct 2008 17:48:08 +0200 Subject: [PATCH] bump version --- package/ltp-testsuite/ltp-testsuite.asm-page-include.patch | 10 ---------- package/ltp-testsuite/ltp-testsuite.mk | 6 +++--- package/ltp-testsuite/ltp-testsuite.obsolete-bsd-signal.patch | 4 ++-- package/ltp-testsuite/ltp-testsuite.susv3-legacy.patch | 9 +++------ 4 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 package/ltp-testsuite/ltp-testsuite.asm-page-include.patch diff --git a/package/ltp-testsuite/ltp-testsuite.asm-page-include.patch b/package/ltp-testsuite/ltp-testsuite.asm-page-include.patch deleted file mode 100644 index c4f7271..0000000 --- a/package/ltp-testsuite/ltp-testsuite.asm-page-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ltp-full-20080831/testcases/kernel/controllers/io-throttle/iobw.c.orig 2008-08-31 16:33:18.000000000 +0200 -+++ ltp-full-20080831/testcases/kernel/controllers/io-throttle/iobw.c 2008-09-12 18:54:44.000000000 +0200 -@@ -34,7 +34,6 @@ - #include - #include - #include --#include - - #ifndef PAGE_SIZE - #define PAGE_SIZE getpagesize() diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 6b134bb..ea7309b 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -3,7 +3,7 @@ # ltp-testsuite # ############################################################# -LTP_TESTSUITE_VERSION:=20080831 +LTP_TESTSUITE_VERSION:=20080930 LTP_TESTSUITE_SOURCE:=ltp-full-$(LTP_TESTSUITE_VERSION).tgz LTP_TESTSUITE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ltp LTP_TESTSUITE_CAT:=$(ZCAT) @@ -16,11 +16,11 @@ LTP_TESTSUITE_DIR:=$(LTP_TESTSUITE_ROOT)/ltp-full-$(LTP_TESTSUITE_VERSION) LTP_PATCHES:=\ ltp-testsuite-generate-needs-bash.patch \ ltp-testsuite.patch \ - ltp-testsuite.asm-page-include.patch \ ltp-testsuite.obsolete-bsd-signal.patch \ ltp-testsuite.susv3-legacy.patch \ ltp-testsuite.conflicting-lseek-decl.patch \ - ltp-testsuite.ignore-missing-proc.patch + ltp-testsuite.ignore-missing-proc.patch \ + ifeq ($(BR2_PTHREADS_NATIVE),y) LTP_PATCHES+=ltp-testsuite-enable-openposix-for-nptl.patch diff --git a/package/ltp-testsuite/ltp-testsuite.obsolete-bsd-signal.patch b/package/ltp-testsuite/ltp-testsuite.obsolete-bsd-signal.patch index 4b81923..fa46d92 100644 --- a/package/ltp-testsuite/ltp-testsuite.obsolete-bsd-signal.patch +++ b/package/ltp-testsuite/ltp-testsuite.obsolete-bsd-signal.patch @@ -4,7 +4,7 @@ LOADLIBES+= -L../../../../lib -lltp SRCS=$(wildcard *.c) -+ifneq ($(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL),y) ++ifeq ($(IS_UCLIBC)x$(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL),yx) +SRCS:=$(filter-out ftest01.c ftest03.c ftest04.c ftest05.c ftest07.c ftest08.c,$(SRCS)) +endif TARGETS=$(patsubst %.c,%,$(SRCS)) @@ -16,7 +16,7 @@ LOADLIBES+= -L../../../../lib -lltp SRCS=$(wildcard *.c) -+ifneq ($(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL),y) ++ifeq ($(IS_UCLIBC)x$(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL),yx) +SRCS:=$(filter-out inode02.c,$(SRCS)) +endif TARGETS=$(patsubst %.c,%,$(SRCS)) diff --git a/package/ltp-testsuite/ltp-testsuite.susv3-legacy.patch b/package/ltp-testsuite/ltp-testsuite.susv3-legacy.patch index 327ecc1..810b213 100644 --- a/package/ltp-testsuite/ltp-testsuite.susv3-legacy.patch +++ b/package/ltp-testsuite/ltp-testsuite.susv3-legacy.patch @@ -6,7 +6,7 @@ diff -rdup ltp-full-20080831.oorig/testcases/kernel/mem/hugetlb/lib/Makefile ltp # common routines in the ipc(2) tests. # ######################################################################### + -+ifeq ($(UCLIBC_SUSV3_LEGACY),y) ++ifneq ($(IS_UCLIBC)x$(UCLIBC_SUSV3_LEGACY),yx) SRCS=libipc.c +else +SRCS= @@ -14,7 +14,6 @@ diff -rdup ltp-full-20080831.oorig/testcases/kernel/mem/hugetlb/lib/Makefile ltp OBJS=$(SRCS:.c=.o) MAINS=libipc.a CFLAGS+=-I../../../../../include -g -Wall -Only in ltp-full-20080831/testcases/kernel/mem/hugetlb/lib: Makefile~ diff -rdup ltp-full-20080831.oorig/testcases/kernel/sched/tool/Makefile ltp-full-20080831/testcases/kernel/sched/tool/Makefile --- ltp-full-20080831.oorig/testcases/kernel/sched/tool/Makefile 2008-08-31 16:33:19.000000000 +0200 +++ ltp-full-20080831/testcases/kernel/sched/tool/Makefile 2008-09-26 17:16:57.000000000 +0200 @@ -22,14 +21,13 @@ diff -rdup ltp-full-20080831.oorig/testcases/kernel/sched/tool/Makefile ltp-full LDLIBS := -lpthread SRCS=$(wildcard *.c) -+ifneq ($(UCLIBC_SUSV3_LEGACY),y) ++ifeq ($(IS_UCLIBC)x$(UCLIBC_SUSV3_LEGACY),yx) +SRCS:=$(filter-out trace_sched.c,$(SRCS)) +endif + TARGETS=$(patsubst %.c,%,$(SRCS)) all: $(TARGETS) -Only in ltp-full-20080831/testcases/kernel/sched/tool: Makefile~ diff -rdup ltp-full-20080831.oorig/testcases/kernel/syscalls/ipc/lib/Makefile ltp-full-20080831/testcases/kernel/syscalls/ipc/lib/Makefile --- ltp-full-20080831.oorig/testcases/kernel/syscalls/ipc/lib/Makefile 2008-08-31 16:33:16.000000000 +0200 +++ ltp-full-20080831/testcases/kernel/syscalls/ipc/lib/Makefile 2008-09-26 17:16:31.000000000 +0200 @@ -37,7 +35,7 @@ diff -rdup ltp-full-20080831.oorig/testcases/kernel/syscalls/ipc/lib/Makefile lt # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -+ifeq ($(UCLIBC_SUSV3_LEGACY),y) ++ifneq ($(IS_UCLIBC)x$(UCLIBC_SUSV3_LEGACY),yx) SRCS = libipc.c +else +SRCS = @@ -45,4 +43,3 @@ diff -rdup ltp-full-20080831.oorig/testcases/kernel/syscalls/ipc/lib/Makefile lt OBJS = $(SRCS:.c=.o) LIBIPC = ../libipc.a LIBIPC_HEADERS = ipcmsg.h ipcsem.h -Only in ltp-full-20080831/testcases/kernel/syscalls/ipc/lib: Makefile~ -- 2.11.4.GIT