From 9d83cb8acb7582aeb7fbfb39bfbfafb211dff544 Mon Sep 17 00:00:00 2001
From: Bernhard Fischer <rep.dot.nop@gmail.com>
Date: Fri, 12 Sep 2008 19:34:10 +0200
Subject: [PATCH] bump version

---
 .../ltp-testsuite-sh-is-not-C-code.patch           | 11 ----------
 .../ltp-testsuite.asm-page-include.patch           | 10 +++++++++
 package/ltp-testsuite/ltp-testsuite.mk             | 10 +++++++--
 .../ltp-testsuite.obsolete-bsd-signal.patch        | 24 ++++++++++++++++++++++
 4 files changed, 42 insertions(+), 13 deletions(-)
 delete mode 100644 package/ltp-testsuite/ltp-testsuite-sh-is-not-C-code.patch
 create mode 100644 package/ltp-testsuite/ltp-testsuite.asm-page-include.patch
 create mode 100644 package/ltp-testsuite/ltp-testsuite.obsolete-bsd-signal.patch

diff --git a/package/ltp-testsuite/ltp-testsuite-sh-is-not-C-code.patch b/package/ltp-testsuite/ltp-testsuite-sh-is-not-C-code.patch
deleted file mode 100644
index a6f98ac..0000000
--- a/package/ltp-testsuite/ltp-testsuite-sh-is-not-C-code.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ltp-full-20061121/IDcheck.sh.orig	2006-12-07 22:31:29.000000000 -0700
-+++ ltp-full-20061121/IDcheck.sh	2006-12-07 22:32:58.000000000 -0700
-@@ -85,7 +85,7 @@
- fi
- 
- whoami | grep root > /dev/null
--if [ $? == "0" ]; then
-+if [ $? = "0" ]; then
-  I_AM_ROOT=1
- fi
- 
diff --git a/package/ltp-testsuite/ltp-testsuite.asm-page-include.patch b/package/ltp-testsuite/ltp-testsuite.asm-page-include.patch
new file mode 100644
index 0000000..c4f7271
--- /dev/null
+++ b/package/ltp-testsuite/ltp-testsuite.asm-page-include.patch
@@ -0,0 +1,10 @@
+--- 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 <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/wait.h>
+-#include <asm/page.h>
+ 
+ #ifndef PAGE_SIZE
+ #define PAGE_SIZE getpagesize()
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index a51974a..c20165f 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -3,7 +3,7 @@
 # ltp-testsuite
 #
 #############################################################
-LTP_TESTSUITE_VERSION:=20080229
+LTP_TESTSUITE_VERSION:=20080831
 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)
@@ -15,7 +15,9 @@ LTP_TESTSUITE_DIR:=$(LTP_TESTSUITE_ROOT)/ltp-full-$(LTP_TESTSUITE_VERSION)
 #
 LTP_PATCHES:=ltp-testsuite-generate-needs-bash.patch \
 	     ltp-testsuite-sh-is-not-C-code.patch \
-	     ltp-testsuite.patch
+	     ltp-testsuite.patch \
+	     ltp-testsuite.asm-page-include.patch \
+	     ltp-testsuite.obsolete-bsd-signal.patch
 
 ifeq ($(BR2_PTHREADS_NATIVE),y)
 LTP_PATCHES+=ltp-testsuite-enable-openposix-for-nptl.patch
@@ -27,6 +29,9 @@ ifneq ($(BR2_INET_IPV6),y)
 LTP_PATCHES+=ltp-testsuite-disable-ipv6-tests.patch
 endif
 
+LTP_TESTSUITE_ENV:= \
+	UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=$(BR2__UCLIBC_HAS_OBSOLETE_BSD_SIGNAL)
+
 $(DL_DIR)/$(LTP_TESTSUITE_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(LTP_TESTSUITE_SITE)/$(LTP_TESTSUITE_SOURCE)
 
@@ -38,6 +43,7 @@ $(LTP_TESTSUITE_DIR)/Makefile: $(DL_DIR)/$(LTP_TESTSUITE_SOURCE)
 
 $(LTP_TESTSUITE_DIR)/.compiled: $(LTP_TESTSUITE_DIR)/Makefile
 	$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) \
+		$(LTP_TESTSUITE_ENV) \
 		-C $(LTP_TESTSUITE_DIR) all
 	touch $@
 
diff --git a/package/ltp-testsuite/ltp-testsuite.obsolete-bsd-signal.patch b/package/ltp-testsuite/ltp-testsuite.obsolete-bsd-signal.patch
new file mode 100644
index 0000000..4b81923
--- /dev/null
+++ b/package/ltp-testsuite/ltp-testsuite.obsolete-bsd-signal.patch
@@ -0,0 +1,24 @@
+--- ltp-full-20080831.orig/testcases/kernel/fs/ftest/Makefile	2008-08-31 16:33:05.000000000 +0200
++++ ltp-full-20080831/testcases/kernel/fs/ftest/Makefile	2008-09-12 19:14:51.000000000 +0200
+@@ -24,6 +24,9 @@
+ LOADLIBES+=	-L../../../../lib -lltp
+ 
+ SRCS=$(wildcard *.c)
++ifneq ($(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL),y)
++SRCS:=$(filter-out ftest01.c ftest03.c ftest04.c ftest05.c ftest07.c ftest08.c,$(SRCS))
++endif
+ TARGETS=$(patsubst %.c,%,$(SRCS))
+ 
+ all: $(TARGETS)
+--- ltp-full-20080831.orig/testcases/kernel/fs/inode/Makefile	2008-08-31 16:33:05.000000000 +0200
++++ ltp-full-20080831/testcases/kernel/fs/inode/Makefile	2008-09-12 19:30:16.000000000 +0200
+@@ -23,6 +23,9 @@
+ LOADLIBES+=	-L../../../../lib -lltp 
+ 
+ SRCS=$(wildcard *.c)
++ifneq ($(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL),y)
++SRCS:=$(filter-out inode02.c,$(SRCS))
++endif
+ TARGETS=$(patsubst %.c,%,$(SRCS))
+ 
+ all: $(TARGETS)
-- 
2.11.4.GIT