summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@enea.com>2014-04-26 16:51:25 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-29 17:20:12 +0100
commitc0df4f67a84c03b538fd3e8f46922a9af642d404 (patch)
tree03be25f6b472ded507bb139c0405789fd1217777 /meta/recipes-extended
parent2b822a8458fe904626045c7e9e0291de806e31c1 (diff)
downloadpoky-c0df4f67a84c03b538fd3e8f46922a9af642d404.tar.gz
ltp: update version to 20140422
Update ltp version to 20140422 Removed two patches that already exist in the current version: 1. regen-makefile.patch 2. ffsb-remove-hardcoded-configure.patch (From OE-Core rev: d72430772400c7733da2339f238ab4ea69e48a8e) Signed-off-by: Maxin B. John <maxin.john@enea.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/ltp/ltp/ffsb-remove-hardcoded-configure.patch15
-rw-r--r--meta/recipes-extended/ltp/ltp/regen-makefile.patch22
-rw-r--r--meta/recipes-extended/ltp/ltp_20140422.bb (renamed from meta/recipes-extended/ltp/ltp_20140115.bb)6
3 files changed, 2 insertions, 41 deletions
diff --git a/meta/recipes-extended/ltp/ltp/ffsb-remove-hardcoded-configure.patch b/meta/recipes-extended/ltp/ltp/ffsb-remove-hardcoded-configure.patch
deleted file mode 100644
index 9f02711070..0000000000
--- a/meta/recipes-extended/ltp/ltp/ffsb-remove-hardcoded-configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Get rid of the hardcoded configure call preventing cross-compilation
2
3Upstream-Status: Pending
4Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
5
6--- a/utils/Makefile
7+++ b/utils/Makefile
8@@ -29,7 +29,6 @@ FILTER_OUT_DIRS := $(FFSBDIR)
9 FFSB := $(FFSBDIR)/ffsb
10
11 $(FFSB): $(FFSBDIR)
12- cd $^; ./configure
13 $(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" all
14 cp $(FFSBDIR)/ffsb ffsb
15
diff --git a/meta/recipes-extended/ltp/ltp/regen-makefile.patch b/meta/recipes-extended/ltp/ltp/regen-makefile.patch
deleted file mode 100644
index 3e114a1d85..0000000000
--- a/meta/recipes-extended/ltp/ltp/regen-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Fix the dependencies for linux_syscall_numbers.h where in a parallel build it was
2finding the temporary file linux_syscall_numbers.h.[pid].sh (where sh is an
3architecture name). Instead don't wildcard *.sh as the only .sh we care about
4here is regen.sh, so hard-code that.
5
6Upstream-Status: Pending
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8
9diff --git a/testcases/kernel/include/Makefile b/testcases/kernel/include/Makefile
10index db21a2a..585eb5e 100644
11--- a/testcases/kernel/include/Makefile
12+++ b/testcases/kernel/include/Makefile
13@@ -28,7 +28,7 @@ INSTALL_DIR := $(includedir)
14
15 MAKE_TARGETS := linux_syscall_numbers.h
16
17-linux_syscall_numbers.h: $(wildcard $(abs_srcdir)/*.sh $(abs_srcdir)/*.in)
18- $(SHELL) "$(abs_srcdir)/regen.sh"
19+linux_syscall_numbers.h: $(abs_srcdir)/regen.sh $(wildcard $(abs_srcdir)/*.in)
20+ $(SHELL) "$<"
21
22 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/meta/recipes-extended/ltp/ltp_20140115.bb b/meta/recipes-extended/ltp/ltp_20140422.bb
index c2ee9fbad2..bad9e6f147 100644
--- a/meta/recipes-extended/ltp/ltp_20140115.bb
+++ b/meta/recipes-extended/ltp/ltp_20140422.bb
@@ -20,12 +20,10 @@ LIC_FILES_CHKSUM = "\
20" 20"
21 21
22DEPENDS = "attr libaio libcap acl openssl" 22DEPENDS = "attr libaio libcap acl openssl"
23SRCREV = "c8b3e28097e7d3208df9daceaf92c25eae87ebf0" 23SRCREV = "f4c3bfe1eab51eb72caeb0f3336d2790c9a8bd1b"
24 24
25SRC_URI = "git://github.com/linux-test-project/ltp.git \ 25SRC_URI = "git://github.com/linux-test-project/ltp.git \
26 file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \ 26 file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \
27 file://regen-makefile.patch \
28 file://ffsb-remove-hardcoded-configure.patch \
29 file://ltp-Do-not-link-against-libfl.patch \ 27 file://ltp-Do-not-link-against-libfl.patch \
30" 28"
31 29
@@ -46,7 +44,7 @@ do_configure_append() {
46 44
47# The makefiles make excessive use of make -C and several include testcases.mk 45# The makefiles make excessive use of make -C and several include testcases.mk
48# which triggers a build of the syscall header. To reproduce, build ltp, 46# which triggers a build of the syscall header. To reproduce, build ltp,
49# then delete the header, then "make -j XX" and watch regen.sh run multiple 47# then delete the header, then "make -j XX" and watch regen.sh run multiple
50# times. Its easier to generate this once here instead. 48# times. Its easier to generate this once here instead.
51do_compile_prepend () { 49do_compile_prepend () {
52 ( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h ) 50 ( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h )