fwts: Upgrade to 22.01.00
PATCH 1/1 fwts: Upgrade to 22.01.00
Drop upstreamed poll.h patch
Refresh rest of patches
Signed-off-by Khem Raj <[email protected]>
---
...l.h-instead-of-deprecated-sys-poll.h.patch | 48 -------------------
.../fwts/0003-Remove-Werror-from-build.patch | 13 +----
...-__SWORD_TYPE-if-not-defined-by-libc.patch | 5 --
.../fwts/fwts/0005-Undefine-PAGE_SIZE.patch | 7 +--
..._t-to-fix-pointer-to-int-cast-issues.patch | 17 ++-----
.../{fwts_21.06.00.bb => fwts_22.01.00.bb} | 3 +-
6 files changed, 8 insertions(+), 85 deletions(-)
delete mode 100644 meta-oe/recipes-test/fwts/fwts/0002-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
rename meta-oe/recipes-test/fwts/{fwts_21.06.00.bb => fwts_22.01.00.bb} (89%)meta-oe/recipes-test/fwts/fwts/0002-Include-poll.h-instead-of-deprecated-sys-poll.h.patch deleted +0 -48
@@ -1,48 +0,0 @@ -From 1575b5ce3ecb8709806908061f689315553b40c7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 6 Jun 2017 07:25:09 -0700 -Subject: [PATCH 2/6] Include poll.h instead of deprecated sys/poll.h - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <[email protected]> ---- - 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 ca7c55bb..0b16bec3 100644 ---- a/src/lib/src/fwts_ipmi.c -+++ b/src/lib/src/fwts_ipmi.c -@@ -18,10 +18,11 @@ - * - */ - -+#include <poll.h> -+ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> --#include <sys/poll.h> - #include <sys/ioctl.h> - #include <linux/ipmi.h> - -diff --git a/src/lib/src/fwts_pipeio.c b/src/lib/src/fwts_pipeio.c -index 716297c4..37752297 100644 ---- a/src/lib/src/fwts_pipeio.c -+++ b/src/lib/src/fwts_pipeio.c -@@ -30,9 +30,9 @@ - #include <stdlib.h> - #include <string.h> - #include <paths.h> -+#include <poll.h> - - #include <sys/param.h> --#include <sys/poll.h> - #include <sys/types.h> - #include <sys/wait.h> - #include <errno.h> --- -2.25.1 -
meta-oe/recipes-test/fwts/fwts/0003-Remove-Werror-from-build.patch +2 -11
@@ -10,21 +10,17 @@ Upstream-Status: Pending src/utilities/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/src/Makefile.am b/src/Makefile.am -index f8066af..6b979f8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -12,7 +12,7 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src/acpica/source/compiler \ +@@ -13,7 +13,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/efi_runtime \ + -I$(top_srcdir)/smccc_test \ -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ - -Wall -Werror -Wextra \ + -Wall -Wextra \ -Wno-address-of-packed-member \ -Wfloat-equal -Wmissing-declarations \ -Wno-long-long -Wredundant-decls -Wshadow \ -diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am -index 55c52b4..50efa97 100644 --- a/src/lib/src/Makefile.am +++ b/src/lib/src/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS = \
@@ -36,8 +32,6 @@ index 55c52b4..50efa97 100644 -Wno-address-of-packed-member pkglib_LTLIBRARIES = libfwts.la -diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am -index a7d9b9c..e1bf141 100644 --- a/src/utilities/Makefile.am +++ b/src/utilities/Makefile.am @@ -16,7 +16,7 @@
@@ -49,6 +43,3 @@ index a7d9b9c..e1bf141 100644 -I$(srcdir)/../lib/include bin_PROGRAMS = kernelscan --- -2.25.1 -
meta-oe/recipes-test/fwts/fwts/0004-Define-__SWORD_TYPE-if-not-defined-by-libc.patch +0 -5
@@ -13,8 +13,6 @@ Signed-off-by: Khem Raj <[email protected]> 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 138f1164..13d9e36c 100644 --- a/src/lib/src/fwts_uefi.c +++ b/src/lib/src/fwts_uefi.c @@ -63,6 +63,10 @@ typedef struct {
@@ -28,6 +26,3 @@ index 138f1164..13d9e36c 100644 /* File system magic numbers */ #define PSTOREFS_MAGIC ((__SWORD_TYPE)0x6165676C) #define EFIVARFS_MAGIC ((__SWORD_TYPE)0xde5e81e4) --- -2.25.1 -
meta-oe/recipes-test/fwts/fwts/0005-Undefine-PAGE_SIZE.patch +1 -6
@@ -13,11 +13,9 @@ Signed-off-by: Khem Raj <[email protected]> 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 dc42a8bd..4fa1246a 100644 --- a/src/lib/src/fwts_acpi_tables.c +++ b/src/lib/src/fwts_acpi_tables.c -@@ -42,6 +42,7 @@ +@@ -40,6 +40,7 @@ #define BIOS_START (0x000e0000) /* Start of BIOS memory */ #define BIOS_END (0x000fffff) /* End of BIOS memory */ #define BIOS_LENGTH (BIOS_END - BIOS_START) /* Length of BIOS memory */
@@ -25,6 +23,3 @@ index dc42a8bd..4fa1246a 100644 #define PAGE_SIZE (4096) static fwts_acpi_table_info tables[ACPI_MAX_TABLES]; --- -2.25.1 -
meta-oe/recipes-test/fwts/fwts/0006-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch +4 -13
@@ -14,11 +14,9 @@ Signed-off-by: Khem Raj <[email protected]> src/lib/src/fwts_smbios.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c -index 4fa1246a..7ef197cd 100644 --- a/src/lib/src/fwts_acpi_tables.c +++ b/src/lib/src/fwts_acpi_tables.c -@@ -173,7 +173,7 @@ static fwts_acpi_table_rsdp *fwts_acpi_get_rsdp(fwts_framework *fw, void *addr, +@@ -171,7 +171,7 @@ static fwts_acpi_table_rsdp *fwts_acpi_g return NULL; }
@@ -27,7 +25,7 @@ index 4fa1246a..7ef197cd 100644 return NULL; if (fwts_safe_memcpy(rsdp, mem, sizeof(fwts_acpi_table_rsdp)) != FWTS_OK) { -@@ -486,7 +486,7 @@ static int fwts_acpi_load_tables_from_firmware(fwts_framework *fw) +@@ -484,7 +484,7 @@ static int fwts_acpi_load_tables_from_fi if ((rsdp = fwts_acpi_get_rsdp(fw, rsdp_addr, &rsdp_len)) == NULL) return FWTS_ERROR;
@@ -36,11 +34,9 @@ index 4fa1246a..7ef197cd 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 2f2514f1..fbd946f4 100644 --- a/src/lib/src/fwts_mmap.c +++ b/src/lib/src/fwts_mmap.c -@@ -82,7 +82,7 @@ int fwts_munmap(void *mem, const size_t size) +@@ -82,7 +82,7 @@ int fwts_munmap(void *mem, const size_t off_t offset; page_size = fwts_page_size();
@@ -49,11 +45,9 @@ index 2f2514f1..fbd946f4 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 8da572e9..04315bd3 100644 --- a/src/lib/src/fwts_smbios.c +++ b/src/lib/src/fwts_smbios.c -@@ -78,7 +78,7 @@ static void *fwts_smbios_find_entry_uefi( +@@ -78,7 +78,7 @@ static void *fwts_smbios_find_entry_uefi if ((addr = fwts_scan_efi_systab(smbios)) != NULL) { fwts_smbios_entry *mapped_entry;
@@ -62,6 +56,3 @@ index 8da572e9..04315bd3 100644 if (fwts_safe_memcpy(entry, mapped_entry, size) == FWTS_OK) { (void)fwts_munmap(mapped_entry, size); *type = FWTS_SMBIOS; --- -2.25.1 -
meta-oe/recipes-test/fwts/fwts_22.01.00.bb renamed from meta-oe/recipes-test/fwts/fwts_21.06.00.bb +1 -2
@@ -7,13 +7,12 @@ LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd SRC_URI = "http://fwts.ubuntu.com/release/fwts-V${PV}.tar.gz;subdir=${BP} \ file://0001-Add-correct-printf-qualifier-for-off_t.patch \ - file://0002-Include-poll.h-instead-of-deprecated-sys-poll.h.patch \ file://0003-Remove-Werror-from-build.patch \ file://0004-Define-__SWORD_TYPE-if-not-defined-by-libc.patch \ file://0005-Undefine-PAGE_SIZE.patch \ file://0006-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \ " -SRC_URI[sha256sum] = "ca43439707976f6664fe3f6eb7f356a51ac7d7f8a4e246ef4d1b16305e066909" +SRC_URI[sha256sum] = "45045a095d9933d9ff39712372ab1f3078ca8e29c007b3f97b810cdb8c27b5c3" COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux"
Signature · 1 line
2.35.1