diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-test')
16 files changed, 245 insertions, 181 deletions
diff --git a/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch b/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch new file mode 100644 index 000000000..307377563 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/catch2/catch2/0001-Fix-convert-from-char-on-ARM-build.patch @@ -0,0 +1,46 @@ +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/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb new file mode 100644 index 000000000..0183c2e41 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_2.4.1.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "A modern, C++-native, header-only, test framework for unit-tests, \ +TDD and BDD - using C++11, C++14, C++17 and later." +AUTHOR = "Phil Nash, Martin Horenovsky and others" +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" + +S = "${WORKDIR}/git" + +inherit cmake python3native + +# 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/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch index 192e05f1c..c2d679aab 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch @@ -1,18 +1,19 @@ -From 232daf5fca6fb52cced5e810f2601fe1a71b96d8 Mon Sep 17 00:00:00 2001 +From 613e5cfe7751068062cc92f83870e436669fc0a8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 8 Jun 2017 16:49:50 -0700 -Subject: [PATCH 1/3] Add correct printf qualifier for off_t +Subject: [PATCH] Add correct printf qualifier for off_t Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- - src/bios/ebda_region/ebda_region.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + src/bios/ebda_region/ebda_region.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) -Index: git/src/bios/ebda_region/ebda_region.c -=================================================================== ---- git.orig/src/bios/ebda_region/ebda_region.c -+++ git/src/bios/ebda_region/ebda_region.c -@@ -83,9 +83,9 @@ static int ebda_test1(fwts_framework *fw +diff --git a/src/bios/ebda_region/ebda_region.c b/src/bios/ebda_region/ebda_region.c +index 16c39357..ad6d635c 100644 +--- a/src/bios/ebda_region/ebda_region.c ++++ b/src/bios/ebda_region/ebda_region.c +@@ -83,9 +83,9 @@ static int ebda_test1(fwts_framework *fw) if ((entry != NULL) && (entry->type == FWTS_MEMORY_MAP_RESERVED || entry->type == FWTS_MEMORY_MAP_ACPI)) { @@ -24,7 +25,7 @@ Index: git/src/bios/ebda_region/ebda_region.c (entry->end_address - entry->start_address) / 1024, memory_map_name, entry->start_address, -@@ -93,8 +93,8 @@ static int ebda_test1(fwts_framework *fw +@@ -93,8 +93,8 @@ static int ebda_test1(fwts_framework *fw) } else fwts_failed(fw, LOG_LEVEL_MEDIUM, "EBDAMappedNotReserved", diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch index 8ad078936..4baefe4a4 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch @@ -1,18 +1,19 @@ -From 100a107a53d5dc9b0554252ac5dbf2c9330615e9 Mon Sep 17 00:00:00 2001 +From ed988c27efde5355c3ba9d0de8a14a4a40f798cc Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 6 Jun 2017 07:25:09 -0700 -Subject: [PATCH 1/3] Include poll.h instead of deprecated sys/poll.h +Subject: [PATCH] Include poll.h instead of deprecated sys/poll.h Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/lib/src/fwts_ipmi.c | 3 ++- src/lib/src/fwts_pipeio.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/src/fwts_ipmi.c b/src/lib/src/fwts_ipmi.c -index cbb27611..70d11cfa 100644 +index a4c8a511..e298969e 100644 --- a/src/lib/src/fwts_ipmi.c +++ b/src/lib/src/fwts_ipmi.c @@ -18,10 +18,11 @@ @@ -29,7 +30,7 @@ index cbb27611..70d11cfa 100644 #include <linux/ipmi.h> diff --git a/src/lib/src/fwts_pipeio.c b/src/lib/src/fwts_pipeio.c -index fd719640..bdc5b2ea 100644 +index 3b3cfaff..289564d1 100644 --- a/src/lib/src/fwts_pipeio.c +++ b/src/lib/src/fwts_pipeio.c @@ -30,9 +30,9 @@ @@ -43,6 +44,3 @@ index fd719640..bdc5b2ea 100644 #include <sys/types.h> #include <sys/wait.h> #include <errno.h> --- -2.13.0 - diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch new file mode 100644 index 000000000..611ccc8fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch @@ -0,0 +1,52 @@ +From 475979cf5c1af978f4e8409666365ec75b3320ea Mon Sep 17 00:00:00 2001 +From: Benjamin Berg <bberg@redhat.com> +Date: Mon, 21 Aug 2017 10:34:40 +0200 +Subject: [PATCH] Remove -Werror from build + +Upstream-Status: Pending + +--- + src/Makefile.am | 2 +- + src/lib/src/Makefile.am | 2 +- + src/utilities/Makefile.am | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 4daa9e8f..873f23eb 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` \ + -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ +- -Wall -Werror -Wextra ++ -Wall -Wextra + + bin_PROGRAMS = fwts + +diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am +index fa232451..082403a2 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 + + pkglib_LTLIBRARIES = libfwts.la + +diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am +index aa37de55..4d5297cc 100644 +--- a/src/utilities/Makefile.am ++++ b/src/utilities/Makefile.am +@@ -16,7 +16,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + # + +-AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ ++AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ + `pkg-config --silence-errors --cflags json` \ + `pkg-config --silence-errors --cflags json-c` + diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch index a3cc1ff8e..ae3665b4d 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch @@ -1,9 +1,10 @@ -From 953cff93c85d3cfd5cbcac56e14443dc5f6e5fbd Mon Sep 17 00:00:00 2001 +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 +++++ @@ -11,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 3 files changed, 13 insertions(+) diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c -index ecd98223..7fca4a64 100644 +index 3cca9db9..60fb758f 100644 --- a/src/dmi/dmicheck/dmicheck.c +++ b/src/dmi/dmicheck/dmicheck.c -@@ -209,6 +209,8 @@ static const char *uuid_patterns[] = { +@@ -211,6 +211,8 @@ static const char *uuid_patterns[] = { "0A0A0A0A-0A0A-0A0A-0A0A-0A0A0A0A0A0A", NULL, }; @@ -23,19 +24,19 @@ index ecd98223..7fca4a64 100644 static const fwts_chassis_type_map fwts_dmi_chassis_type[] = { { "Invalid", FWTS_SMBIOS_CHASSIS_INVALID }, -@@ -245,6 +247,7 @@ static const fwts_chassis_type_map fwts_dmi_chassis_type[] = { - { "Convertible", FWTS_SMBIOS_CHASSIS_CONVERTIBLE }, - { "Detachable", FWTS_SMBIOS_CHASSIS_DETACHABLE }, +@@ -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 30b4060e..d5339bf7 100644 +index c7ba59be..bdd224aa 100644 --- a/src/lib/src/fwts_acpi_tables.c +++ b/src/lib/src/fwts_acpi_tables.c -@@ -394,10 +394,14 @@ static int fwts_acpi_handle_fadt( +@@ -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. */ @@ -50,7 +51,7 @@ index 30b4060e..d5339bf7 100644 if (result != FWTS_OK) { if ((result == FWTS_NULL_POINTER) && fwts_acpi_is_reduced_hardware(fadt)) { -@@ -416,6 +420,7 @@ static int fwts_acpi_handle_fadt( +@@ -415,6 +419,7 @@ static int fwts_acpi_handle_fadt( return FWTS_ERROR; } return FWTS_OK; @@ -59,7 +60,7 @@ index 30b4060e..d5339bf7 100644 /* diff --git a/src/uefi/uefirtauthvar/uefirtauthvar.c b/src/uefi/uefirtauthvar/uefirtauthvar.c -index cdfd7aa3..001e8cc8 100644 +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) diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Add-C99-defined-format-for-printing-uint64_t.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Add-C99-defined-format-for-printing-uint64_t.patch deleted file mode 100644 index 35ce883a2..000000000 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Add-C99-defined-format-for-printing-uint64_t.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 25f18b9ac37960dc12a3b648a5c866bd56ef2cbe Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 8 Jun 2017 16:50:23 -0700 -Subject: [PATCH 2/3] Add C99 defined format for printing uint64_t - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/opal/reserv_mem.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/opal/reserv_mem.c b/src/opal/reserv_mem.c -index eeec2947..f0672e05 100644 ---- a/src/opal/reserv_mem.c -+++ b/src/opal/reserv_mem.c -@@ -185,7 +185,7 @@ static int reserv_mem_limits_test(fwts_framework *fw) - regions[j].start = (uint64_t)be64toh(ranges[2 * j]); - regions[j].len = (uint64_t)be64toh(ranges[2 * j + 1]); - fwts_log_info(fw, "Region name %80s" -- " start: 0x%08lx, len: 0x%08lx\n", -+ " start: 0x%08" PRIx64 ", len: 0x%08" PRIx64 "\n", - regions[j].name, regions[j].start, regions[j].len); - } - -@@ -248,7 +248,7 @@ static int reserv_mem_limits_test(fwts_framework *fw) - fwts_failed(fw, LOG_LEVEL_MEDIUM, - "ImageSizeMismatch", - "Mismatch in homer-image size, " -- "expected: 0x%lx, actual: 0x%lx", -+ "expected: 0x%" PRIx64 ", actual: 0x%" PRIx64 "", - configstruct.homer, regions[j].len); - ok = false; - } else -@@ -261,7 +261,7 @@ static int reserv_mem_limits_test(fwts_framework *fw) - fwts_failed(fw, LOG_LEVEL_MEDIUM, - "ImageSizeMismatch", - "Mismatch in slw-image size, " -- "expected: 0x%lx, actual: 0x%lx", -+ "expected: 0x%" PRIx64 ", actual: 0x%" PRIx64 "", - configstruct.slw, regions[j].len); - ok = false; - } else -@@ -274,7 +274,7 @@ static int reserv_mem_limits_test(fwts_framework *fw) - fwts_failed(fw, LOG_LEVEL_MEDIUM, - "ImageSizeMismatch", - "Mismatch in occ-common-area size, " -- "expected: 0x%lx, actual: 0x%lx", -+ "expected: 0x%" PRIx64", actual: 0x%" PRIx64"", - configstruct.occ_common, - regions[j].len); - ok = false; --- -2.13.1 - diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch index 3b83ca57c..b45e46a3d 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch @@ -1,7 +1,7 @@ -From 0e89127cd02ecd5ea4506b935cb2b59eb94107d2 Mon Sep 17 00:00:00 2001 +From 1112e51d240a206bdcf253878ef1f4963b92da8a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 6 Jun 2017 07:37:20 -0700 -Subject: [PATCH 2/3] Define __SWORD_TYPE if not defined by libc +Subject: [PATCH] Define __SWORD_TYPE if not defined by libc __SWORD_TYPE is internal to glibc, therefore check and define it if needed e.g. on musl @@ -9,12 +9,13 @@ check and define it if needed e.g. on musl Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/lib/src/fwts_uefi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/src/fwts_uefi.c b/src/lib/src/fwts_uefi.c -index 1f9d31fa..2d925f8d 100644 +index 544145fa..460b0b77 100644 --- a/src/lib/src/fwts_uefi.c +++ b/src/lib/src/fwts_uefi.c @@ -59,6 +59,10 @@ typedef struct { @@ -28,6 +29,3 @@ index 1f9d31fa..2d925f8d 100644 /* File system magic numbers */ #define PSTOREFS_MAGIC ((__SWORD_TYPE)0x6165676C) #define EFIVARFS_MAGIC ((__SWORD_TYPE)0xde5e81e4) --- -2.13.0 - diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch index f84fbffd8..1d8c620ef 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch @@ -1,7 +1,7 @@ -From 0857269d5a053b5b4c31cfa01b6501526b24035f Mon Sep 17 00:00:00 2001 +From 244e9551ab9bbc1dfa91d19cd472ef254a94ae41 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 6 Jun 2017 07:39:28 -0700 -Subject: [PATCH 3/3] Undefine PAGE_SIZE +Subject: [PATCH] Undefine PAGE_SIZE musl defines PAGE_SIZE and build complains of multiple definitions @@ -9,12 +9,13 @@ of multiple definitions Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/lib/src/fwts_acpi_tables.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c -index 1d4fc705..71023ad2 100644 +index bdd224aa..58e982a6 100644 --- a/src/lib/src/fwts_acpi_tables.c +++ b/src/lib/src/fwts_acpi_tables.c @@ -42,6 +42,7 @@ @@ -25,6 +26,3 @@ index 1d4fc705..71023ad2 100644 #define PAGE_SIZE (4096) static fwts_acpi_table_info tables[ACPI_MAX_TABLES]; --- -2.13.0 - diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch index 3cd3fbbc1..bebbfa4ad 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch @@ -1,13 +1,14 @@ -From d0d76820efe51dd404d381fc4c46544008e757dd Mon Sep 17 00:00:00 2001 +From 1848b8f8b9be500046ca5d632789a068d6151815 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 8 Jun 2017 16:50:59 -0700 -Subject: [PATCH 3/3] use intptr_t to fix pointer-to-int-cast issues +Subject: [PATCH] use intptr_t to fix pointer-to-int-cast issues uintptr_t is guaranteed to be wide enough that converting a void* to uintptr_t and back again will yield the original pointer value Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/lib/src/fwts_acpi_tables.c | 4 ++-- src/lib/src/fwts_mmap.c | 2 +- @@ -15,19 +16,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c -index 832f8d66..d0006529 100644 +index 58e982a6..6522032f 100644 --- a/src/lib/src/fwts_acpi_tables.c +++ b/src/lib/src/fwts_acpi_tables.c -@@ -150,7 +150,7 @@ static fwts_acpi_table_rsdp *fwts_acpi_get_rsdp(fwts_framework *fw, void *addr, - fwts_acpi_table_rsdp *rsdp = NULL; - *rsdp_len = 0; +@@ -156,7 +156,7 @@ static fwts_acpi_table_rsdp *fwts_acpi_get_rsdp(fwts_framework *fw, void *addr, + return NULL; + } - if ((mem = fwts_mmap((off_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED) + if ((mem = fwts_mmap((uintptr_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED) return NULL; - if (fwts_safe_memread(mem, sizeof(fwts_acpi_table_rsdp)) != FWTS_OK) { -@@ -456,7 +456,7 @@ static int fwts_acpi_load_tables_from_firmware(fwts_framework *fw) + if (fwts_safe_memcpy(rsdp, mem, sizeof(fwts_acpi_table_rsdp)) != FWTS_OK) { +@@ -455,7 +455,7 @@ static int fwts_acpi_load_tables_from_firmware(fwts_framework *fw) if ((rsdp = fwts_acpi_get_rsdp(fw, rsdp_addr, &rsdp_len)) == NULL) return FWTS_ERROR; @@ -37,7 +38,7 @@ index 832f8d66..d0006529 100644 /* Load any tables from XSDT if it's valid */ if (rsdp->xsdt_address) { diff --git a/src/lib/src/fwts_mmap.c b/src/lib/src/fwts_mmap.c -index a09f688e..9fe6329a 100644 +index e28abf87..2180b2cc 100644 --- a/src/lib/src/fwts_mmap.c +++ b/src/lib/src/fwts_mmap.c @@ -81,7 +81,7 @@ int fwts_munmap(void *mem, const size_t size) @@ -50,27 +51,24 @@ index a09f688e..9fe6329a 100644 if (munmap((void *)((uint8_t *)mem - offset), size + offset) < 0) return FWTS_ERROR; diff --git a/src/lib/src/fwts_smbios.c b/src/lib/src/fwts_smbios.c -index 8d0ea39b..63b4bf25 100644 +index e5b3c774..c8134926 100644 --- a/src/lib/src/fwts_smbios.c +++ b/src/lib/src/fwts_smbios.c -@@ -54,7 +54,7 @@ static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry * - if ((addr = fwts_scan_efi_systab("SMBIOS")) != NULL) { +@@ -55,7 +55,7 @@ static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry * fwts_smbios_entry *mapped_entry; + const size_t size = sizeof(fwts_smbios_entry); -- if ((mapped_entry = fwts_mmap((off_t)addr, sizeof(fwts_smbios_entry))) != FWTS_MAP_FAILED) { -+ if ((mapped_entry = fwts_mmap((uintptr_t)addr, sizeof(fwts_smbios_entry))) != FWTS_MAP_FAILED) { - *entry = *mapped_entry; - (void)fwts_munmap(mapped_entry, sizeof(fwts_smbios_entry)); - *type = FWTS_SMBIOS; -@@ -84,7 +84,7 @@ static void *fwts_smbios30_find_entry_uefi(fwts_framework *fw, fwts_smbios30_ent - if ((addr = fwts_scan_efi_systab("SMBIOS3")) != NULL) { +- if ((mapped_entry = fwts_mmap((off_t)addr, size)) != FWTS_MAP_FAILED) { ++ if ((mapped_entry = fwts_mmap((uintptr_t)addr, size)) != FWTS_MAP_FAILED) { + if (fwts_safe_memcpy(entry, mapped_entry, size) == FWTS_OK) { + (void)fwts_munmap(mapped_entry, size); + *type = FWTS_SMBIOS; +@@ -91,7 +91,7 @@ static void *fwts_smbios30_find_entry_uefi(fwts_framework *fw, fwts_smbios30_ent fwts_smbios30_entry *mapped_entry; + const size_t size = sizeof(fwts_smbios30_entry); -- if ((mapped_entry = fwts_mmap((off_t)addr, sizeof(fwts_smbios30_entry))) != FWTS_MAP_FAILED) { -+ if ((mapped_entry = fwts_mmap((uintptr_t)addr, sizeof(fwts_smbios30_entry))) != FWTS_MAP_FAILED) { - *entry = *mapped_entry; - (void)fwts_munmap(mapped_entry, sizeof(fwts_smbios30_entry)); - return addr; --- -2.13.1 - +- if ((mapped_entry = fwts_mmap((off_t)addr, size)) != FWTS_MAP_FAILED) { ++ if ((mapped_entry = fwts_mmap((uintptr_t)addr, size)) != FWTS_MAP_FAILED) { + if (fwts_safe_memread(mapped_entry, size) == FWTS_OK) { + *entry = *mapped_entry; + (void)fwts_munmap(mapped_entry, size); diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts_git.bb b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_git.bb index 87a23af19..d3fb644df 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_git.bb @@ -5,27 +5,27 @@ HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519" -PV = "17.03.00+git${SRCPV}" +PV = "18.05.00+git${SRCPV}" -SRCREV = "0153ea51cb648b3067a1b327eee6a075b6cfa330" +SRCREV = "b0ec7aa2ef743d113fd8c5e57c0ca3d5edd86f0e" SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \ file://0001-ignore-constant-logical-operand-warning-with-clang.patch \ 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 \ file://0001-Add-correct-printf-qualifier-for-off_t.patch \ - file://0002-Add-C99-defined-format-for-printing-uint64_t.patch \ file://0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \ + file://0001-Remove-Werror-from-build.patch \ " S = "${WORKDIR}/git" COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux" -DEPENDS = "libpcre json-c glib-2.0 dtc" +DEPENDS = "libpcre json-c glib-2.0 dtc bison-native" DEPENDS_append_libc-musl = " libexecinfo" -inherit autotools pkgconfig +inherit autotools bash-completion pkgconfig CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=unknown-pragmas" LDFLAGS_append_libc-musl = " -lexecinfo" diff --git a/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb b/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb index 1ee6573bd..09290909d 100644 --- a/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb @@ -63,3 +63,6 @@ do_install () { done } RDEPENDS_${PN} +="bash" + +# http://errors.yoctoproject.org/Errors/Details/186956/ +EXCLUDE_FROM_WORLD_libc-musl = "1" diff --git a/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch b/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch new file mode 100644 index 000000000..469791d8e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch @@ -0,0 +1,31 @@ +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/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch b/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch index d604f860a..c0b344901 100644 --- a/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch +++ b/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch @@ -1,11 +1,13 @@ -From 784dcd09d3f266e271d007f4fd257e85036872ca Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org> -Date: Tue, 17 Oct 2017 10:13:20 -0500 +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. @@ -19,20 +21,19 @@ 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-malloc.c | 2 +- stress-pty.c | 18 ------------------ stress-resources.c | 1 - stress-stackmmap.c | 2 +- - 6 files changed, 7 insertions(+), 21 deletions(-) + 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/cache.c b/cache.c -index fbf7674..936c1ff 100644 +index e8a0f791..4c7bb486 100644 --- a/cache.c +++ b/cache.c @@ -28,6 +28,10 @@ typedef struct { @@ -47,10 +48,10 @@ index fbf7674..936c1ff 100644 #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 9e71e11..ddf8d2d 100644 +index b2e3497f..77e43a91 100644 --- a/stress-madvise.c +++ b/stress-madvise.c -@@ -147,6 +147,7 @@ static int stress_random_advise(const args_t *args) +@@ -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; @@ -58,21 +59,8 @@ index 9e71e11..ddf8d2d 100644 /* ..and minimize number of soft offline pages */ if ((soft_offline_count >= NUM_SOFT_OFFLINE_MAX) || -diff --git a/stress-malloc.c b/stress-malloc.c -index a46b8c6..427827a 100644 ---- a/stress-malloc.c -+++ b/stress-malloc.c -@@ -99,7 +99,7 @@ int stress_malloc(const args_t *args) - malloc_max = MIN_MALLOC_MAX; - } - --#if defined(__GNUC__) && defined(__linux__) -+#if defined(__GNUC__) && defined(__linux__) && defined(M_MMAP_THRESHOLD) - if (get_setting("malloc-threshold", &malloc_threshold)) - (void)mallopt(M_MMAP_THRESHOLD, (int)malloc_threshold); - #endif diff --git a/stress-pty.c b/stress-pty.c -index 1bd1fbd..b1fe573 100644 +index 4dd88ab9..c79a7021 100644 --- a/stress-pty.c +++ b/stress-pty.c @@ -26,7 +26,6 @@ @@ -83,7 +71,7 @@ index 1bd1fbd..b1fe573 100644 #include <termios.h> typedef struct { -@@ -108,7 +107,6 @@ int stress_pty(const args_t *args) +@@ -111,7 +110,6 @@ static int stress_pty(const args_t *args) */ for (i = 0; i < n; i++) { struct termios ios; @@ -91,7 +79,7 @@ index 1bd1fbd..b1fe573 100644 struct winsize ws; int arg; -@@ -130,22 +128,6 @@ int stress_pty(const args_t *args) +@@ -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 @@ -115,10 +103,10 @@ index 1bd1fbd..b1fe573 100644 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 958c99a..af79abd 100644 +index f3dcfb38..86f9a5ba 100644 --- a/stress-resources.c +++ b/stress-resources.c -@@ -31,7 +31,6 @@ +@@ -28,7 +28,6 @@ #include <sys/inotify.h> #endif #if defined(__linux__) @@ -127,7 +115,7 @@ index 958c99a..af79abd 100644 #endif #if defined(HAVE_LIB_PTHREAD) && defined(__linux__) diff --git a/stress-stackmmap.c b/stress-stackmmap.c -index 9c83a69..2984f09 100644 +index c2f4c31d..54308777 100644 --- a/stress-stackmmap.c +++ b/stress-stackmmap.c @@ -24,7 +24,7 @@ @@ -139,3 +127,6 @@ index 9c83a69..2984f09 100644 #include <ucontext.h> +-- +2.17.0 + diff --git a/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch b/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch deleted file mode 100644 index ed3287e32..000000000 --- a/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From faadbc147394cea9278bc2494f33e3521d88e742 Mon Sep 17 00:00:00 2001 -From: Tim Orling <timothy.t.orling@linux.intel.com> -Date: Tue, 9 Jan 2018 18:38:45 -0800 -Subject: [PATCH] stress-fcntl: fix build for musl - -Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> - -Upstream-status: Pending - ---- - stress-fcntl.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/stress-fcntl.c b/stress-fcntl.c -index 2ea867b..e91b345 100644 ---- a/stress-fcntl.c -+++ b/stress-fcntl.c -@@ -415,6 +415,7 @@ ofd_lock_abort: { /* Nowt */ } - #if (defined(F_GET_FILE_RW_HINT) && defined(F_SET_FILE_RW_HINT)) | \ - (defined(F_GET_RW_HINT) && defined(F_SET_RW_HINT)) - { -+ int ret; - size_t i; - unsigned long hint; - static const unsigned long hints[] = { diff --git a/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb b/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng_0.09.45.bb index 7fab43025..3e8f2d4f5 100644 --- a/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb +++ b/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng_0.09.45.bb @@ -6,13 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "zlib libaio" SRC_URI = "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ - file://0002-stress-fcntl-fix-build-for-musl.patch \ - " + 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] = "1f8b6c2c2830704d2a2814c16082d48e" -SRC_URI[sha256sum] = "02cac34a5cb041197af60c1867844c6cbb089a6d10a38cdcf7b8f27bfaa6ef8f" + +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" |
