diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-test')
21 files changed, 175 insertions, 496 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-test/bats/bats_1.1.0.bb b/external/meta-openembedded/meta-oe/recipes-test/bats/bats_1.1.0.bb new file mode 100644 index 00000000..a8179744 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-test/bats/bats_1.1.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "Bash Automated Testing System" +DESCRIPTION = "Bats is a TAP-compliant testing framework for Bash. It \ +provides a simple way to verify that the UNIX programs you write behave as expected." +AUTHOR = "Sam Stephenson & bats-core organization" +HOMEPAGE = "https://github.com/bats-core/bats-core" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2970203aedf9e829edb96a137a4fe81b" + +SRC_URI = "git://github.com/bats-core/bats-core.git \ + " +# v1.1.0 +SRCREV = "c706d1470dd1376687776bbe985ac22d09780327" + +S = "${WORKDIR}/git" + +do_install() { + # Just a bunch of bash scripts to install + ${S}/install.sh ${D}${prefix} +} + +RDEPENDS_bats = "bash" diff --git a/external/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch b/external/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch deleted file mode 100644 index 30737756..00000000 --- a/external/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5729874fa5059c39aa97cfa08fddf107b7a65c9e Mon Sep 17 00:00:00 2001 -From: Miguel Gaio <mgaio35@gmail.com> -Date: Wed, 3 Oct 2018 10:22:16 +0200 -Subject: [PATCH] Fix convert from char on ARM build - -Some platforms set the signedness of char to unsigned (eg. ARM). -Convert from char should not assume the signedness of char. - -Fix build issue with -Werror,-Wtautological-unsigned-zero-compare flags. - -Signed-off-by: Miguel Gaio <mgaio35@gmail.com> - -Upstream-Status: Accepted [Commit f1faaa9c107113692301ad8bb56084460ef1a2ff] - -Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> ---- - include/internal/catch_tostring.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/internal/catch_tostring.cpp b/include/internal/catch_tostring.cpp -index 4e0c027d..8cbabbf2 100644 ---- a/include/internal/catch_tostring.cpp -+++ b/include/internal/catch_tostring.cpp -@@ -205,7 +205,7 @@ std::string StringMaker<bool>::convert(bool b) { - return b ? "true" : "false"; - } - --std::string StringMaker<char>::convert(char value) { -+std::string StringMaker<signed char>::convert(signed char value) { - if (value == '\r') { - return "'\\r'"; - } else if (value == '\f') { -@@ -222,8 +222,8 @@ std::string StringMaker<char>::convert(char value) { - return chstr; - } - } --std::string StringMaker<signed char>::convert(signed char c) { -- return ::Catch::Detail::stringify(static_cast<char>(c)); -+std::string StringMaker<char>::convert(char c) { -+ return ::Catch::Detail::stringify(static_cast<signed char>(c)); - } - std::string StringMaker<unsigned char>::convert(unsigned char c) { - return ::Catch::Detail::stringify(static_cast<char>(c)); --- -2.19.1 - diff --git a/external/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb b/external/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.9.2.bb index 0183c2e4..57fc935f 100644 --- a/external/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb +++ b/external/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.9.2.bb @@ -5,20 +5,18 @@ HOMEPAGE = "https://github.com/catchorg/Catch2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI = "git://github.com/catchorg/Catch2.git \ - file://0001-Fix-convert-from-char-on-ARM-build.patch" -SRCREV = "9e1bdca4667295fcb16265eae00efa8423f07007" +SRC_URI = "git://github.com/catchorg/Catch2.git" +SRCREV = "2c869e17e4803d30b3d5ca5b0d76387b9db97fa5" S = "${WORKDIR}/git" inherit cmake python3native +do_install_append() { + rm ${D}${datadir}/Catch2/lldbinit + rm ${D}${datadir}/Catch2/gdbinit + rmdir ${D}${datadir}/Catch2/ +} # Header-only library RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" - -do_install_append() { - rm ${D}/${datadir}/Catch2/lldbinit - rm ${D}/${datadir}/Catch2/gdbinit - rmdir ${D}/${datadir}/Catch2/ -} diff --git a/external/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb b/external/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb index 65b08b06..92db31e1 100644 --- a/external/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb +++ b/external/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb @@ -2,13 +2,13 @@ DESCRIPTION = "CppUnit is the C++ port of the famous JUnit framework for unit te HOMEPAGE = "http://www.freedesktop.org/wiki/Software/cppunit" LICENSE = "LGPL-2.1" SECTION = "libs" +LIC_FILES_CHKSUM = "file://COPYING;md5=b0e9ef921ff780eb328bdcaeebec3269" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" SRC_URI = " \ http://dev-www.libreoffice.org/src/cppunit-${PV}.tar.gz \ file://0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch \ " -SRC_URI[md5sum] = "d1c6bdd5a76c66d2c38331e2d287bc01" -SRC_URI[sha256sum] = "3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f" +SRC_URI[md5sum] = "9dc669e6145cadd9674873e24943e6dd" +SRC_URI[sha256sum] = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7" inherit autotools diff --git a/external/meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch b/external/meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch index 6a20c128..441876e4 100644 --- a/external/meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch +++ b/external/meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch @@ -17,15 +17,12 @@ diff --git a/doc/Makefile.am b/doc/Makefile.am index 8815476..3237499 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -22,7 +22,7 @@ htmldir += $(pkgdatadir)/html +@@ -8,7 +8,7 @@ htmldir += $(pkgdatadir)/html html_DATA += $(static_pages) html/index.html install-data-hook: - cp -pR html/* $(DESTDIR)$(htmldir) + cp -R html/* $(DESTDIR)$(htmldir) - # Automake's "distcheck" is sensitive to having files left over - # after "make uninstall", so we have to clean up the install hook. --- -2.5.0 - + uninstall-local: + rm -rf $(DESTDIR)$(htmldir) diff --git a/external/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb b/external/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb index c9d87e36..babf8048 100644 --- a/external/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb +++ b/external/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb @@ -11,9 +11,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/cunit/CUnit/${PV}/CUnit-${PV}.tar.bz2 \ SRC_URI[md5sum] = "b5f1a9f6093869c070c6e4a9450cc10c" SRC_URI[sha256sum] = "f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214" +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/cunit/files/releases" + inherit autotools-brokensep remove-libtool EXTRA_OECONF = "--enable-memtrace --enable-automated --enable-basic --enable-console" FILES_${PN}-dev += "${datadir}/CUnit" FILES_${PN}-doc += "${docdir}" + +BBCLASSEXTEND = "native" diff --git a/external/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb b/external/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb index 29150117..252eea36 100644 --- a/external/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb +++ b/external/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb @@ -1,15 +1,16 @@ DESCRIPTION = "CxxTest is a unit testing framework for C++ that is similar in spirit to JUnit, CppUnit, and xUnit." HOMEPAGE = "http://cxxtest.com/" -LICENSE = "LGPL-2.0" SECTION = "devel" +LICENSE = "LGPL-2.0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/cxxtest-${PV}/COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/cxxtest-${PV}.tar.gz" -SRC_URI[md5sum] = "b3a24b3e1aad9acf6adac37f4c3f83ec" -SRC_URI[sha256sum] = "356d0f4810e8eb5c344147a0cca50fc0d84122c286e7644b61cb365c2ee22083" -LIC_FILES_CHKSUM = "file://${WORKDIR}/cxxtest-${PV}/COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" +SRC_URI[md5sum] = "c3cc3355e2ac64e34c215f28e44cfcec" +SRC_URI[sha256sum] = "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8" + S = "${WORKDIR}/cxxtest-${PV}/python" -inherit distutils +inherit distutils3 do_install_append() { install -d ${D}${includedir} diff --git a/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 00000000..706322d5 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,41 @@ +From fa57c78c33d26084f85f1a6b4c29378631dc9395 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Nov 2019 11:58:58 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/libevdev/evtest/merge_requests/6] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + evtest.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/evtest.c b/evtest.c +index 548c203..93063cd 100644 +--- a/evtest.c ++++ b/evtest.c +@@ -61,6 +61,11 @@ + #include <sys/types.h> + #include <unistd.h> + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #define BITS_PER_LONG (sizeof(long) * 8) + #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) + #define OFF(x) ((x)%BITS_PER_LONG) +@@ -1140,7 +1145,7 @@ static int print_events(int fd) + type = ev[i].type; + code = ev[i].code; + +- printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec); ++ printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_sec); + + if (type == EV_SYN) { + if (code == SYN_MT_REPORT) diff --git a/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch b/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch new file mode 100644 index 00000000..b2bf94fd --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest/add_missing_limits_h_include.patch @@ -0,0 +1,37 @@ +From 5eb4ab1c139ea38ebe6bb4acba08b09ee7d77d3c Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Sun, 18 Aug 2019 10:01:06 +0300 +Subject: Add missing limits.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build with musl libc that does not include limits.h indirectly via +other headers. + +evtest.c: In function ‘scan_devices’: +evtest.c:886:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean INT8_MAX’? + char fname[PATH_MAX]; + ^~~~~~~~ + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- + evtest.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/evtest.c b/evtest.c +index 37d4f85..548c203 100644 +--- a/evtest.c ++++ b/evtest.c +@@ -56,6 +56,7 @@ + #include <getopt.h> + #include <ctype.h> + #include <signal.h> ++#include <limits.h> + #include <sys/time.h> + #include <sys/types.h> + #include <unistd.h> +-- +cgit v1.1 + diff --git a/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb b/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb index fa0d6e2f..a3a23c89 100644 --- a/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb +++ b/external/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb @@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libxml2" -SRCREV = "ab140a2dab1547f7deb5233be6d94a388cf08b26" -SRC_URI = "git://anongit.freedesktop.org/evtest;protocol=git" - -PV = "1.33+${SRCPV}" +SRCREV = "16e5104127a620686bdddc4a9ad62881134d6c69" +SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https \ + file://add_missing_limits_h_include.patch \ + file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ + " S = "${WORKDIR}/git" diff --git a/external/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch b/external/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch index 611ccc8f..6795ba84 100644 --- a/external/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch +++ b/external/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch @@ -12,33 +12,33 @@ Upstream-Status: Pending 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 4daa9e8f..873f23eb 100644 +index 62c9ba8..435ec23 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,7 @@ AM_CPPFLAGS = \ - `pkg-config --silence-errors --cflags json` \ - `pkg-config --silence-errors --cflags json-c` \ + `pkg-config --silence-errors --cflags json` \ + `pkg-config --silence-errors --cflags json-c` \ -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ -- -Wall -Werror -Wextra -+ -Wall -Wextra +- -Wall -Werror -Wextra \ ++ -Wall -Wextra \ + -Wno-address-of-packed-member bin_PROGRAMS = fwts - diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am -index fa232451..082403a2 100644 +index 6bcf9f8..de89bf1 100644 --- a/src/lib/src/Makefile.am +++ b/src/lib/src/Makefile.am @@ -24,7 +24,7 @@ AM_CPPFLAGS = \ `pkg-config --silence-errors --cflags json-c` \ `pkg-config --cflags glib-2.0 gio-2.0` \ -DDATAROOTDIR=\"$(datarootdir)\" \ -- -Wall -Werror -Wextra -+ -Wall -Wextra +- -Wall -Werror -Wextra \ ++ -Wall -Wextra \ + -Wno-address-of-packed-member pkglib_LTLIBRARIES = libfwts.la - diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am -index aa37de55..4d5297cc 100644 +index 21f969e..82009a0 100644 --- a/src/utilities/Makefile.am +++ b/src/utilities/Makefile.am @@ -16,7 +16,7 @@ diff --git a/external/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch b/external/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch deleted file mode 100644 index ae3665b4..00000000 --- a/external/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 5bd05ad8569880985ddf6d4c06ed927d388c297f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 19 Oct 2016 01:57:16 +0000 -Subject: [PATCH] ignore constant-logical-operand warning with clang - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - src/dmi/dmicheck/dmicheck.c | 3 +++ - src/lib/src/fwts_acpi_tables.c | 5 +++++ - src/uefi/uefirtauthvar/uefirtauthvar.c | 5 +++++ - 3 files changed, 13 insertions(+) - -diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c -index 3cca9db9..60fb758f 100644 ---- a/src/dmi/dmicheck/dmicheck.c -+++ b/src/dmi/dmicheck/dmicheck.c -@@ -211,6 +211,8 @@ static const char *uuid_patterns[] = { - "0A0A0A0A-0A0A-0A0A-0A0A-0A0A0A0A0A0A", - NULL, - }; -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wunneeded-internal-declaration" - - static const fwts_chassis_type_map fwts_dmi_chassis_type[] = { - { "Invalid", FWTS_SMBIOS_CHASSIS_INVALID }, -@@ -251,6 +253,7 @@ static const fwts_chassis_type_map fwts_dmi_chassis_type[] = { - { "Mini PC", FWTS_SMBIOS_CHASSIS_MINI_PC }, - { "Stick PC", FWTS_SMBIOS_CHASSIS_STICK_PC }, - }; -+#pragma clang diagnostic pop - - /* Remapping table from buggy version numbers to correct values */ - static const fwts_dmi_version dmi_versions[] = { -diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c -index c7ba59be..bdd224aa 100644 ---- a/src/lib/src/fwts_acpi_tables.c -+++ b/src/lib/src/fwts_acpi_tables.c -@@ -393,10 +393,14 @@ static int fwts_acpi_handle_fadt( - /* Determine FACS addr and load it. - * Will ignore the missing FACS in the hardware-reduced mode. - */ -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Waddress-of-packed-member" -+ - result = fwts_acpi_handle_fadt_tables(fw, fadt, - "FACS", "FIRMWARE_CTRL", "X_FIRMWARE_CTRL", - &fadt->firmware_control, &fadt->x_firmware_ctrl, - provenance); -+ - if (result != FWTS_OK) { - if ((result == FWTS_NULL_POINTER) && - fwts_acpi_is_reduced_hardware(fadt)) { -@@ -415,6 +419,7 @@ static int fwts_acpi_handle_fadt( - return FWTS_ERROR; - } - return FWTS_OK; -+#pragma clang diagnostic pop - } - - /* -diff --git a/src/uefi/uefirtauthvar/uefirtauthvar.c b/src/uefi/uefirtauthvar/uefirtauthvar.c -index c2031741..7a33d19d 100644 ---- a/src/uefi/uefirtauthvar/uefirtauthvar.c -+++ b/src/uefi/uefirtauthvar/uefirtauthvar.c -@@ -142,6 +142,9 @@ static int uefirtauthvar_deinit(fwts_framework *fw) - return FWTS_OK; - } - -+#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wconstant-logical-operand" -+ - static int check_fw_support(fwts_framework *fw, uint64_t status) - { - if ((status == EFI_INVALID_PARAMETER) && -@@ -172,6 +175,8 @@ static int check_fw_support(fwts_framework *fw, uint64_t status) - return FWTS_OK; - } - -+#pragma clang diagnostic pop -+ - /* - * Set the created authenticated variable, AuthVarCreate, - * and checking the data size and data. diff --git a/external/meta-openembedded/meta-oe/recipes-test/fwts/fwts_git.bb b/external/meta-openembedded/meta-oe/recipes-test/fwts/fwts_19.06.00.bb index d3fb644d..88a89fb0 100644 --- a/external/meta-openembedded/meta-oe/recipes-test/fwts/fwts_git.bb +++ b/external/meta-openembedded/meta-oe/recipes-test/fwts/fwts_19.06.00.bb @@ -5,11 +5,8 @@ HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519" -PV = "18.05.00+git${SRCPV}" - SRCREV = "b0ec7aa2ef743d113fd8c5e57c0ca3d5edd86f0e" -SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \ - file://0001-ignore-constant-logical-operand-warning-with-clang.patch \ +SRC_URI = "http://fwts.ubuntu.com/release/fwts-V19.06.00.tar.gz;subdir=${BPN}-${PV} \ file://0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch \ file://0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch \ file://0003-Undefine-PAGE_SIZE.patch \ @@ -17,12 +14,12 @@ SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \ file://0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \ file://0001-Remove-Werror-from-build.patch \ " - -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "012f933329510cc5a71817ede681eee2" +SRC_URI[sha256sum] = "13aa991f12c69f48df368aae5e5d0fbc9136413b4bfe115421bc3216d919f8a2" COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux" -DEPENDS = "libpcre json-c glib-2.0 dtc bison-native" +DEPENDS = "libpcre json-c glib-2.0 dtc bison-native libbsd" DEPENDS_append_libc-musl = " libexecinfo" inherit autotools bash-completion pkgconfig diff --git a/external/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb b/external/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb new file mode 100644 index 00000000..354e7de3 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Google's framework for writing C++ tests" +HOMEPAGE = "https://github.com/google/googletest" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ + file://googletest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" + +PV = "1.10.0" + +PROVIDES += "gmock gtest" + +S = "${WORKDIR}/git" +SRCREV = "703bd9caab50b139428cea1aaff9974ebee5742e" +SRC_URI = "git://github.com/google/googletest.git" + +inherit cmake + +ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY_${PN}-dbg = "1" + +RDEPENDS_${PN}-dev += "${PN}-staticdev" + +BBCLASSEXTEND = "native nativesdk" + +do_configure_prepend() { + # explicitly use python3 + # the scripts are already python3 compatible since https://github.com/google/googletest/commit/d404af0d987a9c38cafce82a7e26ec8468c88361 and other fixes like this + # but since this oe-core change http://git.openembedded.org/openembedded-core/commit/?id=5f8f16b17f66966ae91aeabc23e97de5ecd17447 + # there isn't python in HOSTTOOLS so "env python" fails + sed -i 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@g' ${S}/googlemock/scripts/*py ${S}/googlemock/scripts/generator/*py ${S}/googlemock/scripts/generator/cpp/*py ${S}/googlemock/test/*py ${S}/googletest/scripts/*py ${S}/googletest/test/*py +} diff --git a/external/meta-openembedded/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch b/external/meta-openembedded/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch deleted file mode 100644 index 4c8977b4..00000000 --- a/external/meta-openembedded/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch +++ /dev/null @@ -1,106 +0,0 @@ -From ec9256bb704e94f41407fc8ace6a580491430196 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Thu, 15 Dec 2016 04:35:41 -0800 -Subject: [PATCH] Add pkg-config support - -Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br> -Signed-off-by: Rodrigo Caimi <caimi@datacom.ind.br> -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> ---- - googlemock/CMakeLists.txt | 9 +++++++-- - googlemock/gmock.pc.in | 9 +++++++++ - googletest/CMakeLists.txt | 9 +++++++-- - googletest/gtest.pc.in | 9 +++++++++ - 4 files changed, 32 insertions(+), 4 deletions(-) - create mode 100644 googlemock/gmock.pc.in - create mode 100644 googletest/gtest.pc.in - -diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt -index beb259a..f17e2d7 100644 ---- a/googlemock/CMakeLists.txt -+++ b/googlemock/CMakeLists.txt -@@ -27,6 +27,9 @@ if (COMMAND pre_project_set_up_hermetic_build) - pre_project_set_up_hermetic_build() - endif() - -+# pkg-config support -+configure_file("gmock.pc.in" "gmock.pc" @ONLY) -+ - ######################################################################## - # - # Project-wide settings -@@ -104,9 +107,11 @@ endif() - # - # Install rules - install(TARGETS gmock gmock_main -- DESTINATION lib) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock -- DESTINATION include) -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gmock.pc" -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") - - ######################################################################## - # -diff --git a/googlemock/gmock.pc.in b/googlemock/gmock.pc.in -new file mode 100644 -index 0000000..04bc0b4 ---- /dev/null -+++ b/googlemock/gmock.pc.in -@@ -0,0 +1,9 @@ -+Name: libgmock -+Version: 1.8.0 -+Description: Google's framework for writing C++ tests on a variety of platforms -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+includedir=@CMAKE_INSTALL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_LIBDIR@ -+Cflags:-I${includedir}/gmock -+Libs: -L${libdir} -lgmock -lgmock_main -diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt -index 621d0f0..58aaf54 100644 ---- a/googletest/CMakeLists.txt -+++ b/googletest/CMakeLists.txt -@@ -34,6 +34,9 @@ if (COMMAND pre_project_set_up_hermetic_build) - pre_project_set_up_hermetic_build() - endif() - -+# pkg-config support -+configure_file("gtest.pc.in" "gtest.pc" @ONLY) -+ - ######################################################################## - # - # Project-wide settings -@@ -103,9 +106,11 @@ endif() - # - # Install rules - install(TARGETS gtest gtest_main -- DESTINATION lib) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest -- DESTINATION include) -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/gtest.pc" -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") - - ######################################################################## - # -diff --git a/googletest/gtest.pc.in b/googletest/gtest.pc.in -new file mode 100644 -index 0000000..fb95152 ---- /dev/null -+++ b/googletest/gtest.pc.in -@@ -0,0 +1,9 @@ -+Name: libgtest -+Version: 1.8.0 -+Description: Google's framework for writing C++ tests on a variety of platforms -+ -+prefix=@CMAKE_INSTALL_PREFIX@ -+includedir=@CMAKE_INSTALL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_LIBDIR@ -+Cflags:-I${includedir}/gtest -+Libs: -L${libdir} -lgtest -lgtest_main --- -1.9.1 - diff --git a/external/meta-openembedded/meta-oe/recipes-test/gtest/gtest_1.8.0.bb b/external/meta-openembedded/meta-oe/recipes-test/gtest/gtest_1.8.0.bb deleted file mode 100644 index 48cf4e04..00000000 --- a/external/meta-openembedded/meta-oe/recipes-test/gtest/gtest_1.8.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Google's framework for writing C++ tests" -HOMEPAGE = "https://github.com/google/googletest" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ - file://googletest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" - -PROVIDES += "gmock" - -S = "${WORKDIR}/git" -SRCREV = "ec44c6c1675c25b9827aacd08c02433cccde7780" -SRC_URI = "\ - git://github.com/google/googletest.git;protocol=https; \ - file://Add-pkg-config-support.patch \ -" - -inherit cmake - -ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-dbg = "1" - -RDEPENDS_${PN}-dev += "${PN}-staticdev" - -BBCLASSEXTEND = "native nativesdk" diff --git a/external/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb b/external/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb index 09290909..7e9971ea 100644 --- a/external/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb +++ b/external/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb @@ -65,4 +65,4 @@ do_install () { RDEPENDS_${PN} +="bash" # http://errors.yoctoproject.org/Errors/Details/186956/ -EXCLUDE_FROM_WORLD_libc-musl = "1" +COMPATIBLE_HOST_libc-musl = 'null' diff --git a/external/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch b/external/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch deleted file mode 100644 index 469791d8..00000000 --- a/external/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7c97710bfc44d895b7111bef9c55866f00a3589c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 13 Aug 2018 11:54:27 -0700 -Subject: [PATCH] Revert "Makefile: force sync after build in case reboot loses - executable" - -This reverts commit ae6322b1baea56a589207c96e358daae8edd0a8f. - -Not needed for cross-builds - -Upstream-Status: Inappropriate [Cross compile specific] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index c0db72c0..5781dda6 100644 ---- a/Makefile -+++ b/Makefile -@@ -348,7 +348,6 @@ endif - stress-ng: $(OBJS) - @echo "LD $@" - @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@ -- @sync - - makeconfig: - @if [ ! -s config ]; then \ --- -2.17.0 - diff --git a/external/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch b/external/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch deleted file mode 100644 index c0b34490..00000000 --- a/external/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 9bcb4e170f01dbe0a9e7bf6b899c5d9b5283d4c6 Mon Sep 17 00:00:00 2001 -From: Randy MacLeod <Randy.MacLeod@windriver.com> -Date: Sun, 11 Nov 2018 23:00:53 -0500 -Subject: [PATCH] Several changes to fix musl build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Rebased patch for: - -stress-{context, stackmmap}.c: Set tests to non-implemented because uses -swapcontext, musl provide the definition but not the implementation due - to that functions are pre-POSIX and set to be deprecated. - stress-{resources, pty}.c: Doesn't include termio.h and remove stress - operations that uses struct termio, musl doesn't provide that struct. -stress-malloc.c: Check for definition of M_MMAP_THRESHOLD musl doesn't - ptovide that constant. -stress-madvise.c: Add static poision_count integer, definition of - MADV_SOFT_OFFLINE doesn't grauntee MADV_HWPOISON to be defined. -cache.c: Define GLOB_ONLYDIR not available on MUSL. - -Signed-off-by: Aníbal Limón <anibal.limon@linaro.org> -Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> -Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> - -Upstream-status: Pending ---- - cache.c | 4 ++++ - stress-madvise.c | 1 + - stress-pty.c | 18 ------------------ - stress-resources.c | 1 - - stress-stackmmap.c | 2 +- - 5 files changed, 6 insertions(+), 20 deletions(-) - -diff --git a/cache.c b/cache.c -index e8a0f791..4c7bb486 100644 ---- a/cache.c -+++ b/cache.c -@@ -28,6 +28,10 @@ typedef struct { - - #include <glob.h> - -+#ifndef GLOB_ONLYDIR -+#define GLOB_ONLYDIR 0x100 -+#endif -+ - #if defined(__linux__) - #define SYS_CPU_PREFIX "/sys/devices/system/cpu" - #define GLOB_PATTERN SYS_CPU_PREFIX "/cpu[0-9]*" -diff --git a/stress-madvise.c b/stress-madvise.c -index b2e3497f..77e43a91 100644 ---- a/stress-madvise.c -+++ b/stress-madvise.c -@@ -146,6 +146,7 @@ static int stress_random_advise(const args_t *args) - #if defined(MADV_SOFT_OFFLINE) - if (advise == MADV_SOFT_OFFLINE) { - static int soft_offline_count; -+ static int poison_count; - - /* ..and minimize number of soft offline pages */ - if ((soft_offline_count >= NUM_SOFT_OFFLINE_MAX) || -diff --git a/stress-pty.c b/stress-pty.c -index 4dd88ab9..c79a7021 100644 ---- a/stress-pty.c -+++ b/stress-pty.c -@@ -26,7 +26,6 @@ - - #if defined(__linux__) - --#include <termio.h> - #include <termios.h> - - typedef struct { -@@ -111,7 +110,6 @@ static int stress_pty(const args_t *args) - */ - for (i = 0; i < n; i++) { - struct termios ios; -- struct termio io; - struct winsize ws; - int arg; - -@@ -133,22 +131,6 @@ static int stress_pty(const args_t *args) - if (ioctl(ptys[i].slave, TCSETSF, &ios) < 0) - pr_fail_err("ioctl TCSETSF on slave pty"); - #endif --#if defined(TCGETA) -- if (ioctl(ptys[i].slave, TCGETA, &io) < 0) -- pr_fail_err("ioctl TCGETA on slave pty"); --#endif --#if defined(TCSETA) -- if (ioctl(ptys[i].slave, TCSETA, &io) < 0) -- pr_fail_err("ioctl TCSETA on slave pty"); --#endif --#if defined(TCSETAW) -- if (ioctl(ptys[i].slave, TCSETAW, &io) < 0) -- pr_fail_err("ioctl TCSETAW on slave pty"); --#endif --#if defined(TCSETAF) -- if (ioctl(ptys[i].slave, TCSETAF, &io) < 0) -- pr_fail_err("ioctl TCSETAF on slave pty"); --#endif - #if defined(TIOCGLCKTRMIOS) - if (ioctl(ptys[i].slave, TIOCGLCKTRMIOS, &ios) < 0) - pr_fail_err("ioctl TIOCGLCKTRMIOS on slave pty"); -diff --git a/stress-resources.c b/stress-resources.c -index f3dcfb38..86f9a5ba 100644 ---- a/stress-resources.c -+++ b/stress-resources.c -@@ -28,7 +28,6 @@ - #include <sys/inotify.h> - #endif - #if defined(__linux__) --#include <termio.h> - #include <termios.h> - #endif - #if defined(HAVE_LIB_PTHREAD) && defined(__linux__) -diff --git a/stress-stackmmap.c b/stress-stackmmap.c -index c2f4c31d..54308777 100644 ---- a/stress-stackmmap.c -+++ b/stress-stackmmap.c -@@ -24,7 +24,7 @@ - */ - #include "stress-ng.h" - --#if defined(__linux__) -+#if defined(__linux__) && False - - #include <ucontext.h> - --- -2.17.0 - diff --git a/external/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng_0.09.45.bb b/external/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng_0.09.45.bb deleted file mode 100644 index 3e8f2d4f..00000000 --- a/external/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng_0.09.45.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "A tool to load and stress a computer system" -HOMEPAGE = "http://kernel.ubuntu.com/~cking/stress-ng/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "zlib libaio" - -SRC_URI = "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ - file://0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch \ - " -SRC_URI_append_libc-musl = " \ - file://0001-Several-changes-to-fix-musl-build.patch \ - " - -SRC_URI[md5sum] = "b03744c2eb68bf7e9a300e78e397f348" -SRC_URI[sha256sum] = "0741e3004bf590bb7af3db979a46fe89bee7aaad6065cd1d87d0b7fa49046cb2" - -UPSTREAM_CHECK_URI ?= "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/" -UPSTREAM_CHECK_REGEX ?= "(?P<pver>\d+(\.\d+)+)\.tar" - -CFLAGS += "-Wall -Wextra -DVERSION='"$(VERSION)"'" - -do_install_append() { - install -d ${D}${bindir} - install -m 755 ${S}/stress-ng ${D}${bindir}/stress-ng -} diff --git a/external/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3a.bb b/external/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3a.bb index 28e96776..ace376ef 100644 --- a/external/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3a.bb +++ b/external/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3a.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Berkeley TestFloat is a small collection of programs for \ HOMEPAGE = "http://www.jhauser.us/arithmetic/TestFloat.html" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://TestFloat-${PV}/COPYING.txt;md5=e45c175a323b5727777fb6bd4b26eafc" SRC_URI = "\ |