diff options
| -rw-r--r-- | meta/recipes-extended/ltp/ltp/ffsb-remove-hardcoded-configure.patch | 15 | ||||
| -rw-r--r-- | meta/recipes-extended/ltp/ltp/regen-makefile.patch | 22 | ||||
| -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 @@ -Get rid of the hardcoded configure call preventing cross-compilation - -Upstream-Status: Pending -Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> - ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -29,7 +29,6 @@ FILTER_OUT_DIRS := $(FFSBDIR) - FFSB := $(FFSBDIR)/ffsb - - $(FFSB): $(FFSBDIR) -- cd $^; ./configure - $(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" all - cp $(FFSBDIR)/ffsb ffsb - 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 @@ -Fix the dependencies for linux_syscall_numbers.h where in a parallel build it was -finding the temporary file linux_syscall_numbers.h.[pid].sh (where sh is an -architecture name). Instead don't wildcard *.sh as the only .sh we care about -here is regen.sh, so hard-code that. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/testcases/kernel/include/Makefile b/testcases/kernel/include/Makefile -index db21a2a..585eb5e 100644 ---- a/testcases/kernel/include/Makefile -+++ b/testcases/kernel/include/Makefile -@@ -28,7 +28,7 @@ INSTALL_DIR := $(includedir) - - MAKE_TARGETS := linux_syscall_numbers.h - --linux_syscall_numbers.h: $(wildcard $(abs_srcdir)/*.sh $(abs_srcdir)/*.in) -- $(SHELL) "$(abs_srcdir)/regen.sh" -+linux_syscall_numbers.h: $(abs_srcdir)/regen.sh $(wildcard $(abs_srcdir)/*.in) -+ $(SHELL) "$<" - - 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 = "\ " DEPENDS = "attr libaio libcap acl openssl" -SRCREV = "c8b3e28097e7d3208df9daceaf92c25eae87ebf0" +SRCREV = "f4c3bfe1eab51eb72caeb0f3336d2790c9a8bd1b" SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \ - file://regen-makefile.patch \ - file://ffsb-remove-hardcoded-configure.patch \ file://ltp-Do-not-link-against-libfl.patch \ " @@ -46,7 +44,7 @@ do_configure_append() { # The makefiles make excessive use of make -C and several include testcases.mk # which triggers a build of the syscall header. To reproduce, build ltp, -# then delete the header, then "make -j XX" and watch regen.sh run multiple +# then delete the header, then "make -j XX" and watch regen.sh run multiple # times. Its easier to generate this once here instead. do_compile_prepend () { ( make -C ${B}/testcases/kernel include/linux_syscall_numbers.h ) |