diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-05-31 13:29:08 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-05-31 21:53:52 -0700 |
commit | e0f7b2621a21bcec47de1fbbed3b1f1fc155a295 (patch) | |
tree | 27b03b7ac8ec80afc3c5f0cf80d8cee1cf9b05cc /meta-oe/recipes-test | |
parent | 2560ea45446d049c86fcdb938c35cd59171129f6 (diff) | |
download | meta-openembedded-e0f7b2621a21bcec47de1fbbed3b1f1fc155a295.tar.gz |
fwts: Upgrade to V18.05.00
drop backported patches and fix build with gcc8
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-test')
9 files changed, 116 insertions, 123 deletions
diff --git a/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch b/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch index 192e05f1c..c2d679aab 100644 --- a/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch +++ b/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch | |||
@@ -1,18 +1,19 @@ | |||
1 | From 232daf5fca6fb52cced5e810f2601fe1a71b96d8 Mon Sep 17 00:00:00 2001 | 1 | From 613e5cfe7751068062cc92f83870e436669fc0a8 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 8 Jun 2017 16:49:50 -0700 | 3 | Date: Thu, 8 Jun 2017 16:49:50 -0700 |
4 | Subject: [PATCH 1/3] Add correct printf qualifier for off_t | 4 | Subject: [PATCH] Add correct printf qualifier for off_t |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | |||
7 | --- | 8 | --- |
8 | src/bios/ebda_region/ebda_region.c | 4 ++-- | 9 | src/bios/ebda_region/ebda_region.c | 8 ++++---- |
9 | 1 file changed, 2 insertions(+), 2 deletions(-) | 10 | 1 file changed, 4 insertions(+), 4 deletions(-) |
10 | 11 | ||
11 | Index: git/src/bios/ebda_region/ebda_region.c | 12 | diff --git a/src/bios/ebda_region/ebda_region.c b/src/bios/ebda_region/ebda_region.c |
12 | =================================================================== | 13 | index 16c39357..ad6d635c 100644 |
13 | --- git.orig/src/bios/ebda_region/ebda_region.c | 14 | --- a/src/bios/ebda_region/ebda_region.c |
14 | +++ git/src/bios/ebda_region/ebda_region.c | 15 | +++ b/src/bios/ebda_region/ebda_region.c |
15 | @@ -83,9 +83,9 @@ static int ebda_test1(fwts_framework *fw | 16 | @@ -83,9 +83,9 @@ static int ebda_test1(fwts_framework *fw) |
16 | if ((entry != NULL) && | 17 | if ((entry != NULL) && |
17 | (entry->type == FWTS_MEMORY_MAP_RESERVED || | 18 | (entry->type == FWTS_MEMORY_MAP_RESERVED || |
18 | entry->type == FWTS_MEMORY_MAP_ACPI)) { | 19 | entry->type == FWTS_MEMORY_MAP_ACPI)) { |
@@ -24,7 +25,7 @@ Index: git/src/bios/ebda_region/ebda_region.c | |||
24 | (entry->end_address - entry->start_address) / 1024, | 25 | (entry->end_address - entry->start_address) / 1024, |
25 | memory_map_name, | 26 | memory_map_name, |
26 | entry->start_address, | 27 | entry->start_address, |
27 | @@ -93,8 +93,8 @@ static int ebda_test1(fwts_framework *fw | 28 | @@ -93,8 +93,8 @@ static int ebda_test1(fwts_framework *fw) |
28 | } else | 29 | } else |
29 | fwts_failed(fw, LOG_LEVEL_MEDIUM, | 30 | fwts_failed(fw, LOG_LEVEL_MEDIUM, |
30 | "EBDAMappedNotReserved", | 31 | "EBDAMappedNotReserved", |
diff --git a/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch b/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch index 8ad078936..4baefe4a4 100644 --- a/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch +++ b/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch | |||
@@ -1,18 +1,19 @@ | |||
1 | From 100a107a53d5dc9b0554252ac5dbf2c9330615e9 Mon Sep 17 00:00:00 2001 | 1 | From ed988c27efde5355c3ba9d0de8a14a4a40f798cc Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 6 Jun 2017 07:25:09 -0700 | 3 | Date: Tue, 6 Jun 2017 07:25:09 -0700 |
4 | Subject: [PATCH 1/3] Include poll.h instead of deprecated sys/poll.h | 4 | Subject: [PATCH] Include poll.h instead of deprecated sys/poll.h |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | |||
9 | --- | 10 | --- |
10 | src/lib/src/fwts_ipmi.c | 3 ++- | 11 | src/lib/src/fwts_ipmi.c | 3 ++- |
11 | src/lib/src/fwts_pipeio.c | 2 +- | 12 | src/lib/src/fwts_pipeio.c | 2 +- |
12 | 2 files changed, 3 insertions(+), 2 deletions(-) | 13 | 2 files changed, 3 insertions(+), 2 deletions(-) |
13 | 14 | ||
14 | diff --git a/src/lib/src/fwts_ipmi.c b/src/lib/src/fwts_ipmi.c | 15 | diff --git a/src/lib/src/fwts_ipmi.c b/src/lib/src/fwts_ipmi.c |
15 | index cbb27611..70d11cfa 100644 | 16 | index a4c8a511..e298969e 100644 |
16 | --- a/src/lib/src/fwts_ipmi.c | 17 | --- a/src/lib/src/fwts_ipmi.c |
17 | +++ b/src/lib/src/fwts_ipmi.c | 18 | +++ b/src/lib/src/fwts_ipmi.c |
18 | @@ -18,10 +18,11 @@ | 19 | @@ -18,10 +18,11 @@ |
@@ -29,7 +30,7 @@ index cbb27611..70d11cfa 100644 | |||
29 | #include <linux/ipmi.h> | 30 | #include <linux/ipmi.h> |
30 | 31 | ||
31 | diff --git a/src/lib/src/fwts_pipeio.c b/src/lib/src/fwts_pipeio.c | 32 | diff --git a/src/lib/src/fwts_pipeio.c b/src/lib/src/fwts_pipeio.c |
32 | index fd719640..bdc5b2ea 100644 | 33 | index 3b3cfaff..289564d1 100644 |
33 | --- a/src/lib/src/fwts_pipeio.c | 34 | --- a/src/lib/src/fwts_pipeio.c |
34 | +++ b/src/lib/src/fwts_pipeio.c | 35 | +++ b/src/lib/src/fwts_pipeio.c |
35 | @@ -30,9 +30,9 @@ | 36 | @@ -30,9 +30,9 @@ |
@@ -43,6 +44,3 @@ index fd719640..bdc5b2ea 100644 | |||
43 | #include <sys/types.h> | 44 | #include <sys/types.h> |
44 | #include <sys/wait.h> | 45 | #include <sys/wait.h> |
45 | #include <errno.h> | 46 | #include <errno.h> |
46 | -- | ||
47 | 2.13.0 | ||
48 | |||
diff --git a/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch b/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch new file mode 100644 index 000000000..611ccc8fc --- /dev/null +++ b/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 475979cf5c1af978f4e8409666365ec75b3320ea Mon Sep 17 00:00:00 2001 | ||
2 | From: Benjamin Berg <bberg@redhat.com> | ||
3 | Date: Mon, 21 Aug 2017 10:34:40 +0200 | ||
4 | Subject: [PATCH] Remove -Werror from build | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | --- | ||
9 | src/Makefile.am | 2 +- | ||
10 | src/lib/src/Makefile.am | 2 +- | ||
11 | src/utilities/Makefile.am | 2 +- | ||
12 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
15 | index 4daa9e8f..873f23eb 100644 | ||
16 | --- a/src/Makefile.am | ||
17 | +++ b/src/Makefile.am | ||
18 | @@ -14,7 +14,7 @@ AM_CPPFLAGS = \ | ||
19 | `pkg-config --silence-errors --cflags json` \ | ||
20 | `pkg-config --silence-errors --cflags json-c` \ | ||
21 | -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ | ||
22 | - -Wall -Werror -Wextra | ||
23 | + -Wall -Wextra | ||
24 | |||
25 | bin_PROGRAMS = fwts | ||
26 | |||
27 | diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am | ||
28 | index fa232451..082403a2 100644 | ||
29 | --- a/src/lib/src/Makefile.am | ||
30 | +++ b/src/lib/src/Makefile.am | ||
31 | @@ -24,7 +24,7 @@ AM_CPPFLAGS = \ | ||
32 | `pkg-config --silence-errors --cflags json-c` \ | ||
33 | `pkg-config --cflags glib-2.0 gio-2.0` \ | ||
34 | -DDATAROOTDIR=\"$(datarootdir)\" \ | ||
35 | - -Wall -Werror -Wextra | ||
36 | + -Wall -Wextra | ||
37 | |||
38 | pkglib_LTLIBRARIES = libfwts.la | ||
39 | |||
40 | diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am | ||
41 | index aa37de55..4d5297cc 100644 | ||
42 | --- a/src/utilities/Makefile.am | ||
43 | +++ b/src/utilities/Makefile.am | ||
44 | @@ -16,7 +16,7 @@ | ||
45 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
46 | # | ||
47 | |||
48 | -AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ | ||
49 | +AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ | ||
50 | `pkg-config --silence-errors --cflags json` \ | ||
51 | `pkg-config --silence-errors --cflags json-c` | ||
52 | |||
diff --git a/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch b/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch index a3cc1ff8e..ae3665b4d 100644 --- a/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch +++ b/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch | |||
@@ -1,9 +1,10 @@ | |||
1 | From 953cff93c85d3cfd5cbcac56e14443dc5f6e5fbd Mon Sep 17 00:00:00 2001 | 1 | From 5bd05ad8569880985ddf6d4c06ed927d388c297f Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 19 Oct 2016 01:57:16 +0000 | 3 | Date: Wed, 19 Oct 2016 01:57:16 +0000 |
4 | Subject: [PATCH] ignore constant-logical-operand warning with clang | 4 | Subject: [PATCH] ignore constant-logical-operand warning with clang |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | |||
7 | --- | 8 | --- |
8 | src/dmi/dmicheck/dmicheck.c | 3 +++ | 9 | src/dmi/dmicheck/dmicheck.c | 3 +++ |
9 | src/lib/src/fwts_acpi_tables.c | 5 +++++ | 10 | src/lib/src/fwts_acpi_tables.c | 5 +++++ |
@@ -11,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
11 | 3 files changed, 13 insertions(+) | 12 | 3 files changed, 13 insertions(+) |
12 | 13 | ||
13 | diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c | 14 | diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c |
14 | index ecd98223..7fca4a64 100644 | 15 | index 3cca9db9..60fb758f 100644 |
15 | --- a/src/dmi/dmicheck/dmicheck.c | 16 | --- a/src/dmi/dmicheck/dmicheck.c |
16 | +++ b/src/dmi/dmicheck/dmicheck.c | 17 | +++ b/src/dmi/dmicheck/dmicheck.c |
17 | @@ -209,6 +209,8 @@ static const char *uuid_patterns[] = { | 18 | @@ -211,6 +211,8 @@ static const char *uuid_patterns[] = { |
18 | "0A0A0A0A-0A0A-0A0A-0A0A-0A0A0A0A0A0A", | 19 | "0A0A0A0A-0A0A-0A0A-0A0A-0A0A0A0A0A0A", |
19 | NULL, | 20 | NULL, |
20 | }; | 21 | }; |
@@ -23,19 +24,19 @@ index ecd98223..7fca4a64 100644 | |||
23 | 24 | ||
24 | static const fwts_chassis_type_map fwts_dmi_chassis_type[] = { | 25 | static const fwts_chassis_type_map fwts_dmi_chassis_type[] = { |
25 | { "Invalid", FWTS_SMBIOS_CHASSIS_INVALID }, | 26 | { "Invalid", FWTS_SMBIOS_CHASSIS_INVALID }, |
26 | @@ -245,6 +247,7 @@ static const fwts_chassis_type_map fwts_dmi_chassis_type[] = { | 27 | @@ -251,6 +253,7 @@ static const fwts_chassis_type_map fwts_dmi_chassis_type[] = { |
27 | { "Convertible", FWTS_SMBIOS_CHASSIS_CONVERTIBLE }, | 28 | { "Mini PC", FWTS_SMBIOS_CHASSIS_MINI_PC }, |
28 | { "Detachable", FWTS_SMBIOS_CHASSIS_DETACHABLE }, | 29 | { "Stick PC", FWTS_SMBIOS_CHASSIS_STICK_PC }, |
29 | }; | 30 | }; |
30 | +#pragma clang diagnostic pop | 31 | +#pragma clang diagnostic pop |
31 | 32 | ||
32 | /* Remapping table from buggy version numbers to correct values */ | 33 | /* Remapping table from buggy version numbers to correct values */ |
33 | static const fwts_dmi_version dmi_versions[] = { | 34 | static const fwts_dmi_version dmi_versions[] = { |
34 | diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c | 35 | diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c |
35 | index 30b4060e..d5339bf7 100644 | 36 | index c7ba59be..bdd224aa 100644 |
36 | --- a/src/lib/src/fwts_acpi_tables.c | 37 | --- a/src/lib/src/fwts_acpi_tables.c |
37 | +++ b/src/lib/src/fwts_acpi_tables.c | 38 | +++ b/src/lib/src/fwts_acpi_tables.c |
38 | @@ -394,10 +394,14 @@ static int fwts_acpi_handle_fadt( | 39 | @@ -393,10 +393,14 @@ static int fwts_acpi_handle_fadt( |
39 | /* Determine FACS addr and load it. | 40 | /* Determine FACS addr and load it. |
40 | * Will ignore the missing FACS in the hardware-reduced mode. | 41 | * Will ignore the missing FACS in the hardware-reduced mode. |
41 | */ | 42 | */ |
@@ -50,7 +51,7 @@ index 30b4060e..d5339bf7 100644 | |||
50 | if (result != FWTS_OK) { | 51 | if (result != FWTS_OK) { |
51 | if ((result == FWTS_NULL_POINTER) && | 52 | if ((result == FWTS_NULL_POINTER) && |
52 | fwts_acpi_is_reduced_hardware(fadt)) { | 53 | fwts_acpi_is_reduced_hardware(fadt)) { |
53 | @@ -416,6 +420,7 @@ static int fwts_acpi_handle_fadt( | 54 | @@ -415,6 +419,7 @@ static int fwts_acpi_handle_fadt( |
54 | return FWTS_ERROR; | 55 | return FWTS_ERROR; |
55 | } | 56 | } |
56 | return FWTS_OK; | 57 | return FWTS_OK; |
@@ -59,7 +60,7 @@ index 30b4060e..d5339bf7 100644 | |||
59 | 60 | ||
60 | /* | 61 | /* |
61 | diff --git a/src/uefi/uefirtauthvar/uefirtauthvar.c b/src/uefi/uefirtauthvar/uefirtauthvar.c | 62 | diff --git a/src/uefi/uefirtauthvar/uefirtauthvar.c b/src/uefi/uefirtauthvar/uefirtauthvar.c |
62 | index cdfd7aa3..001e8cc8 100644 | 63 | index c2031741..7a33d19d 100644 |
63 | --- a/src/uefi/uefirtauthvar/uefirtauthvar.c | 64 | --- a/src/uefi/uefirtauthvar/uefirtauthvar.c |
64 | +++ b/src/uefi/uefirtauthvar/uefirtauthvar.c | 65 | +++ b/src/uefi/uefirtauthvar/uefirtauthvar.c |
65 | @@ -142,6 +142,9 @@ static int uefirtauthvar_deinit(fwts_framework *fw) | 66 | @@ -142,6 +142,9 @@ static int uefirtauthvar_deinit(fwts_framework *fw) |
diff --git a/meta-oe/recipes-test/fwts/fwts/0002-Add-C99-defined-format-for-printing-uint64_t.patch b/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-oe/recipes-test/fwts/fwts/0002-Add-C99-defined-format-for-printing-uint64_t.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | From 25f18b9ac37960dc12a3b648a5c866bd56ef2cbe Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 8 Jun 2017 16:50:23 -0700 | ||
4 | Subject: [PATCH 2/3] Add C99 defined format for printing uint64_t | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | src/opal/reserv_mem.c | 8 ++++---- | ||
9 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
10 | |||
11 | diff --git a/src/opal/reserv_mem.c b/src/opal/reserv_mem.c | ||
12 | index eeec2947..f0672e05 100644 | ||
13 | --- a/src/opal/reserv_mem.c | ||
14 | +++ b/src/opal/reserv_mem.c | ||
15 | @@ -185,7 +185,7 @@ static int reserv_mem_limits_test(fwts_framework *fw) | ||
16 | regions[j].start = (uint64_t)be64toh(ranges[2 * j]); | ||
17 | regions[j].len = (uint64_t)be64toh(ranges[2 * j + 1]); | ||
18 | fwts_log_info(fw, "Region name %80s" | ||
19 | - " start: 0x%08lx, len: 0x%08lx\n", | ||
20 | + " start: 0x%08" PRIx64 ", len: 0x%08" PRIx64 "\n", | ||
21 | regions[j].name, regions[j].start, regions[j].len); | ||
22 | } | ||
23 | |||
24 | @@ -248,7 +248,7 @@ static int reserv_mem_limits_test(fwts_framework *fw) | ||
25 | fwts_failed(fw, LOG_LEVEL_MEDIUM, | ||
26 | "ImageSizeMismatch", | ||
27 | "Mismatch in homer-image size, " | ||
28 | - "expected: 0x%lx, actual: 0x%lx", | ||
29 | + "expected: 0x%" PRIx64 ", actual: 0x%" PRIx64 "", | ||
30 | configstruct.homer, regions[j].len); | ||
31 | ok = false; | ||
32 | } else | ||
33 | @@ -261,7 +261,7 @@ static int reserv_mem_limits_test(fwts_framework *fw) | ||
34 | fwts_failed(fw, LOG_LEVEL_MEDIUM, | ||
35 | "ImageSizeMismatch", | ||
36 | "Mismatch in slw-image size, " | ||
37 | - "expected: 0x%lx, actual: 0x%lx", | ||
38 | + "expected: 0x%" PRIx64 ", actual: 0x%" PRIx64 "", | ||
39 | configstruct.slw, regions[j].len); | ||
40 | ok = false; | ||
41 | } else | ||
42 | @@ -274,7 +274,7 @@ static int reserv_mem_limits_test(fwts_framework *fw) | ||
43 | fwts_failed(fw, LOG_LEVEL_MEDIUM, | ||
44 | "ImageSizeMismatch", | ||
45 | "Mismatch in occ-common-area size, " | ||
46 | - "expected: 0x%lx, actual: 0x%lx", | ||
47 | + "expected: 0x%" PRIx64", actual: 0x%" PRIx64"", | ||
48 | configstruct.occ_common, | ||
49 | regions[j].len); | ||
50 | ok = false; | ||
51 | -- | ||
52 | 2.13.1 | ||
53 | |||
diff --git a/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch b/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch index 3b83ca57c..b45e46a3d 100644 --- a/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch +++ b/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0e89127cd02ecd5ea4506b935cb2b59eb94107d2 Mon Sep 17 00:00:00 2001 | 1 | From 1112e51d240a206bdcf253878ef1f4963b92da8a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 6 Jun 2017 07:37:20 -0700 | 3 | Date: Tue, 6 Jun 2017 07:37:20 -0700 |
4 | Subject: [PATCH 2/3] Define __SWORD_TYPE if not defined by libc | 4 | Subject: [PATCH] Define __SWORD_TYPE if not defined by libc |
5 | 5 | ||
6 | __SWORD_TYPE is internal to glibc, therefore | 6 | __SWORD_TYPE is internal to glibc, therefore |
7 | check and define it if needed e.g. on musl | 7 | check and define it if needed e.g. on musl |
@@ -9,12 +9,13 @@ check and define it if needed e.g. on musl | |||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
10 | 10 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | |||
12 | --- | 13 | --- |
13 | src/lib/src/fwts_uefi.c | 4 ++++ | 14 | src/lib/src/fwts_uefi.c | 4 ++++ |
14 | 1 file changed, 4 insertions(+) | 15 | 1 file changed, 4 insertions(+) |
15 | 16 | ||
16 | diff --git a/src/lib/src/fwts_uefi.c b/src/lib/src/fwts_uefi.c | 17 | diff --git a/src/lib/src/fwts_uefi.c b/src/lib/src/fwts_uefi.c |
17 | index 1f9d31fa..2d925f8d 100644 | 18 | index 544145fa..460b0b77 100644 |
18 | --- a/src/lib/src/fwts_uefi.c | 19 | --- a/src/lib/src/fwts_uefi.c |
19 | +++ b/src/lib/src/fwts_uefi.c | 20 | +++ b/src/lib/src/fwts_uefi.c |
20 | @@ -59,6 +59,10 @@ typedef struct { | 21 | @@ -59,6 +59,10 @@ typedef struct { |
@@ -28,6 +29,3 @@ index 1f9d31fa..2d925f8d 100644 | |||
28 | /* File system magic numbers */ | 29 | /* File system magic numbers */ |
29 | #define PSTOREFS_MAGIC ((__SWORD_TYPE)0x6165676C) | 30 | #define PSTOREFS_MAGIC ((__SWORD_TYPE)0x6165676C) |
30 | #define EFIVARFS_MAGIC ((__SWORD_TYPE)0xde5e81e4) | 31 | #define EFIVARFS_MAGIC ((__SWORD_TYPE)0xde5e81e4) |
31 | -- | ||
32 | 2.13.0 | ||
33 | |||
diff --git a/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch b/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch index f84fbffd8..1d8c620ef 100644 --- a/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch +++ b/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0857269d5a053b5b4c31cfa01b6501526b24035f Mon Sep 17 00:00:00 2001 | 1 | From 244e9551ab9bbc1dfa91d19cd472ef254a94ae41 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 6 Jun 2017 07:39:28 -0700 | 3 | Date: Tue, 6 Jun 2017 07:39:28 -0700 |
4 | Subject: [PATCH 3/3] Undefine PAGE_SIZE | 4 | Subject: [PATCH] Undefine PAGE_SIZE |
5 | 5 | ||
6 | musl defines PAGE_SIZE and build complains | 6 | musl defines PAGE_SIZE and build complains |
7 | of multiple definitions | 7 | of multiple definitions |
@@ -9,12 +9,13 @@ of multiple definitions | |||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
10 | 10 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | |||
12 | --- | 13 | --- |
13 | src/lib/src/fwts_acpi_tables.c | 1 + | 14 | src/lib/src/fwts_acpi_tables.c | 1 + |
14 | 1 file changed, 1 insertion(+) | 15 | 1 file changed, 1 insertion(+) |
15 | 16 | ||
16 | diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c | 17 | diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c |
17 | index 1d4fc705..71023ad2 100644 | 18 | index bdd224aa..58e982a6 100644 |
18 | --- a/src/lib/src/fwts_acpi_tables.c | 19 | --- a/src/lib/src/fwts_acpi_tables.c |
19 | +++ b/src/lib/src/fwts_acpi_tables.c | 20 | +++ b/src/lib/src/fwts_acpi_tables.c |
20 | @@ -42,6 +42,7 @@ | 21 | @@ -42,6 +42,7 @@ |
@@ -25,6 +26,3 @@ index 1d4fc705..71023ad2 100644 | |||
25 | #define PAGE_SIZE (4096) | 26 | #define PAGE_SIZE (4096) |
26 | 27 | ||
27 | static fwts_acpi_table_info tables[ACPI_MAX_TABLES]; | 28 | static fwts_acpi_table_info tables[ACPI_MAX_TABLES]; |
28 | -- | ||
29 | 2.13.0 | ||
30 | |||
diff --git a/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch b/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch index 3cd3fbbc1..bebbfa4ad 100644 --- a/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch +++ b/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch | |||
@@ -1,13 +1,14 @@ | |||
1 | From d0d76820efe51dd404d381fc4c46544008e757dd Mon Sep 17 00:00:00 2001 | 1 | From 1848b8f8b9be500046ca5d632789a068d6151815 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 8 Jun 2017 16:50:59 -0700 | 3 | Date: Thu, 8 Jun 2017 16:50:59 -0700 |
4 | Subject: [PATCH 3/3] use intptr_t to fix pointer-to-int-cast issues | 4 | Subject: [PATCH] use intptr_t to fix pointer-to-int-cast issues |
5 | 5 | ||
6 | uintptr_t is guaranteed to be wide enough that | 6 | uintptr_t is guaranteed to be wide enough that |
7 | converting a void* to uintptr_t and back again | 7 | converting a void* to uintptr_t and back again |
8 | will yield the original pointer value | 8 | will yield the original pointer value |
9 | 9 | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
11 | |||
11 | --- | 12 | --- |
12 | src/lib/src/fwts_acpi_tables.c | 4 ++-- | 13 | src/lib/src/fwts_acpi_tables.c | 4 ++-- |
13 | src/lib/src/fwts_mmap.c | 2 +- | 14 | src/lib/src/fwts_mmap.c | 2 +- |
@@ -15,19 +16,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 3 files changed, 5 insertions(+), 5 deletions(-) | 16 | 3 files changed, 5 insertions(+), 5 deletions(-) |
16 | 17 | ||
17 | diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c | 18 | diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c |
18 | index 832f8d66..d0006529 100644 | 19 | index 58e982a6..6522032f 100644 |
19 | --- a/src/lib/src/fwts_acpi_tables.c | 20 | --- a/src/lib/src/fwts_acpi_tables.c |
20 | +++ b/src/lib/src/fwts_acpi_tables.c | 21 | +++ b/src/lib/src/fwts_acpi_tables.c |
21 | @@ -150,7 +150,7 @@ static fwts_acpi_table_rsdp *fwts_acpi_get_rsdp(fwts_framework *fw, void *addr, | 22 | @@ -156,7 +156,7 @@ static fwts_acpi_table_rsdp *fwts_acpi_get_rsdp(fwts_framework *fw, void *addr, |
22 | fwts_acpi_table_rsdp *rsdp = NULL; | 23 | return NULL; |
23 | *rsdp_len = 0; | 24 | } |
24 | 25 | ||
25 | - if ((mem = fwts_mmap((off_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED) | 26 | - if ((mem = fwts_mmap((off_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED) |
26 | + if ((mem = fwts_mmap((uintptr_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED) | 27 | + if ((mem = fwts_mmap((uintptr_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED) |
27 | return NULL; | 28 | return NULL; |
28 | 29 | ||
29 | if (fwts_safe_memread(mem, sizeof(fwts_acpi_table_rsdp)) != FWTS_OK) { | 30 | if (fwts_safe_memcpy(rsdp, mem, sizeof(fwts_acpi_table_rsdp)) != FWTS_OK) { |
30 | @@ -456,7 +456,7 @@ static int fwts_acpi_load_tables_from_firmware(fwts_framework *fw) | 31 | @@ -455,7 +455,7 @@ static int fwts_acpi_load_tables_from_firmware(fwts_framework *fw) |
31 | if ((rsdp = fwts_acpi_get_rsdp(fw, rsdp_addr, &rsdp_len)) == NULL) | 32 | if ((rsdp = fwts_acpi_get_rsdp(fw, rsdp_addr, &rsdp_len)) == NULL) |
32 | return FWTS_ERROR; | 33 | return FWTS_ERROR; |
33 | 34 | ||
@@ -37,7 +38,7 @@ index 832f8d66..d0006529 100644 | |||
37 | /* Load any tables from XSDT if it's valid */ | 38 | /* Load any tables from XSDT if it's valid */ |
38 | if (rsdp->xsdt_address) { | 39 | if (rsdp->xsdt_address) { |
39 | diff --git a/src/lib/src/fwts_mmap.c b/src/lib/src/fwts_mmap.c | 40 | diff --git a/src/lib/src/fwts_mmap.c b/src/lib/src/fwts_mmap.c |
40 | index a09f688e..9fe6329a 100644 | 41 | index e28abf87..2180b2cc 100644 |
41 | --- a/src/lib/src/fwts_mmap.c | 42 | --- a/src/lib/src/fwts_mmap.c |
42 | +++ b/src/lib/src/fwts_mmap.c | 43 | +++ b/src/lib/src/fwts_mmap.c |
43 | @@ -81,7 +81,7 @@ int fwts_munmap(void *mem, const size_t size) | 44 | @@ -81,7 +81,7 @@ int fwts_munmap(void *mem, const size_t size) |
@@ -50,27 +51,24 @@ index a09f688e..9fe6329a 100644 | |||
50 | if (munmap((void *)((uint8_t *)mem - offset), size + offset) < 0) | 51 | if (munmap((void *)((uint8_t *)mem - offset), size + offset) < 0) |
51 | return FWTS_ERROR; | 52 | return FWTS_ERROR; |
52 | diff --git a/src/lib/src/fwts_smbios.c b/src/lib/src/fwts_smbios.c | 53 | diff --git a/src/lib/src/fwts_smbios.c b/src/lib/src/fwts_smbios.c |
53 | index 8d0ea39b..63b4bf25 100644 | 54 | index e5b3c774..c8134926 100644 |
54 | --- a/src/lib/src/fwts_smbios.c | 55 | --- a/src/lib/src/fwts_smbios.c |
55 | +++ b/src/lib/src/fwts_smbios.c | 56 | +++ b/src/lib/src/fwts_smbios.c |
56 | @@ -54,7 +54,7 @@ static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry * | 57 | @@ -55,7 +55,7 @@ static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry * |
57 | if ((addr = fwts_scan_efi_systab("SMBIOS")) != NULL) { | ||
58 | fwts_smbios_entry *mapped_entry; | 58 | fwts_smbios_entry *mapped_entry; |
59 | const size_t size = sizeof(fwts_smbios_entry); | ||
59 | 60 | ||
60 | - if ((mapped_entry = fwts_mmap((off_t)addr, sizeof(fwts_smbios_entry))) != FWTS_MAP_FAILED) { | 61 | - if ((mapped_entry = fwts_mmap((off_t)addr, size)) != FWTS_MAP_FAILED) { |
61 | + if ((mapped_entry = fwts_mmap((uintptr_t)addr, sizeof(fwts_smbios_entry))) != FWTS_MAP_FAILED) { | 62 | + if ((mapped_entry = fwts_mmap((uintptr_t)addr, size)) != FWTS_MAP_FAILED) { |
62 | *entry = *mapped_entry; | 63 | if (fwts_safe_memcpy(entry, mapped_entry, size) == FWTS_OK) { |
63 | (void)fwts_munmap(mapped_entry, sizeof(fwts_smbios_entry)); | 64 | (void)fwts_munmap(mapped_entry, size); |
64 | *type = FWTS_SMBIOS; | 65 | *type = FWTS_SMBIOS; |
65 | @@ -84,7 +84,7 @@ static void *fwts_smbios30_find_entry_uefi(fwts_framework *fw, fwts_smbios30_ent | 66 | @@ -91,7 +91,7 @@ static void *fwts_smbios30_find_entry_uefi(fwts_framework *fw, fwts_smbios30_ent |
66 | if ((addr = fwts_scan_efi_systab("SMBIOS3")) != NULL) { | ||
67 | fwts_smbios30_entry *mapped_entry; | 67 | fwts_smbios30_entry *mapped_entry; |
68 | const size_t size = sizeof(fwts_smbios30_entry); | ||
68 | 69 | ||
69 | - if ((mapped_entry = fwts_mmap((off_t)addr, sizeof(fwts_smbios30_entry))) != FWTS_MAP_FAILED) { | 70 | - if ((mapped_entry = fwts_mmap((off_t)addr, size)) != FWTS_MAP_FAILED) { |
70 | + if ((mapped_entry = fwts_mmap((uintptr_t)addr, sizeof(fwts_smbios30_entry))) != FWTS_MAP_FAILED) { | 71 | + if ((mapped_entry = fwts_mmap((uintptr_t)addr, size)) != FWTS_MAP_FAILED) { |
71 | *entry = *mapped_entry; | 72 | if (fwts_safe_memread(mapped_entry, size) == FWTS_OK) { |
72 | (void)fwts_munmap(mapped_entry, sizeof(fwts_smbios30_entry)); | 73 | *entry = *mapped_entry; |
73 | return addr; | 74 | (void)fwts_munmap(mapped_entry, size); |
74 | -- | ||
75 | 2.13.1 | ||
76 | |||
diff --git a/meta-oe/recipes-test/fwts/fwts_git.bb b/meta-oe/recipes-test/fwts/fwts_git.bb index 87a23af19..defe31ddf 100644 --- a/meta-oe/recipes-test/fwts/fwts_git.bb +++ b/meta-oe/recipes-test/fwts/fwts_git.bb | |||
@@ -5,17 +5,17 @@ HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" | |||
5 | LICENSE = "GPLv2+" | 5 | LICENSE = "GPLv2+" |
6 | LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519" | 6 | LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519" |
7 | 7 | ||
8 | PV = "17.03.00+git${SRCPV}" | 8 | PV = "18.05.00+git${SRCPV}" |
9 | 9 | ||
10 | SRCREV = "0153ea51cb648b3067a1b327eee6a075b6cfa330" | 10 | SRCREV = "b0ec7aa2ef743d113fd8c5e57c0ca3d5edd86f0e" |
11 | SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \ | 11 | SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \ |
12 | file://0001-ignore-constant-logical-operand-warning-with-clang.patch \ | 12 | file://0001-ignore-constant-logical-operand-warning-with-clang.patch \ |
13 | file://0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch \ | 13 | file://0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch \ |
14 | file://0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch \ | 14 | file://0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch \ |
15 | file://0003-Undefine-PAGE_SIZE.patch \ | 15 | file://0003-Undefine-PAGE_SIZE.patch \ |
16 | file://0001-Add-correct-printf-qualifier-for-off_t.patch \ | 16 | file://0001-Add-correct-printf-qualifier-for-off_t.patch \ |
17 | file://0002-Add-C99-defined-format-for-printing-uint64_t.patch \ | ||
18 | file://0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \ | 17 | file://0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \ |
18 | file://0001-Remove-Werror-from-build.patch \ | ||
19 | " | 19 | " |
20 | 20 | ||
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
@@ -25,7 +25,7 @@ COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux" | |||
25 | DEPENDS = "libpcre json-c glib-2.0 dtc" | 25 | DEPENDS = "libpcre json-c glib-2.0 dtc" |
26 | DEPENDS_append_libc-musl = " libexecinfo" | 26 | DEPENDS_append_libc-musl = " libexecinfo" |
27 | 27 | ||
28 | inherit autotools pkgconfig | 28 | inherit autotools bash-completion pkgconfig |
29 | 29 | ||
30 | CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=unknown-pragmas" | 30 | CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=unknown-pragmas" |
31 | LDFLAGS_append_libc-musl = " -lexecinfo" | 31 | LDFLAGS_append_libc-musl = " -lexecinfo" |