From 0d1e7f2c54cb5de49d9d1cd9454f162c04e4a135 Mon Sep 17 00:00:00 2001 From: zhengruoqin Date: Thu, 24 Jun 2021 10:00:41 +0800 Subject: fwts: upgrade 21.03.00 -> 21.06.00 Refresh the following patch: 0003-Remove-Werror-from-build.patch Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj --- .../fwts/fwts/0003-Remove-Werror-from-build.patch | 24 ++++++++-------- meta-oe/recipes-test/fwts/fwts_21.03.00.bb | 32 ---------------------- meta-oe/recipes-test/fwts/fwts_21.06.00.bb | 32 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 meta-oe/recipes-test/fwts/fwts_21.03.00.bb create mode 100644 meta-oe/recipes-test/fwts/fwts_21.06.00.bb (limited to 'meta-oe/recipes-test/fwts') diff --git a/meta-oe/recipes-test/fwts/fwts/0003-Remove-Werror-from-build.patch b/meta-oe/recipes-test/fwts/fwts/0003-Remove-Werror-from-build.patch index 906ec99a9d..5ccd461d9f 100644 --- a/meta-oe/recipes-test/fwts/fwts/0003-Remove-Werror-from-build.patch +++ b/meta-oe/recipes-test/fwts/fwts/0003-Remove-Werror-from-build.patch @@ -11,12 +11,12 @@ Upstream-Status: Pending 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index a26a197b..70a28174 100644 +index f8066af..6b979f8 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` \ +@@ -12,7 +12,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src/acpica/source/compiler \ + -I$(top_srcdir)/efi_runtime \ -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ - -Wall -Werror -Wextra \ + -Wall -Wextra \ @@ -24,7 +24,7 @@ index a26a197b..70a28174 100644 -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 55c52b41..b85d0101 100644 +index 55c52b4..50efa97 100644 --- a/src/lib/src/Makefile.am +++ b/src/lib/src/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS = \ @@ -32,23 +32,23 @@ index 55c52b41..b85d0101 100644 `pkg-config --cflags glib-2.0 gio-2.0` \ -DDATAROOTDIR=\"$(datarootdir)\" \ - -Wall -Werror -Wextra \ -+ -Wall -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 ecc25f0a..129c1036 100644 +index a7d9b9c..e1bf141 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` \ - -I../lib/include +-AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ ++AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ + -I$(srcdir)/../lib/include + + bin_PROGRAMS = kernelscan -- 2.25.1 diff --git a/meta-oe/recipes-test/fwts/fwts_21.03.00.bb b/meta-oe/recipes-test/fwts/fwts_21.03.00.bb deleted file mode 100644 index aa7d422f7b..0000000000 --- a/meta-oe/recipes-test/fwts/fwts_21.03.00.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Firmware testsuite" -DESCRIPTION = "The tool fwts comprises of over fifty tests that are designed to exercise and test different aspects of a machine's firmware. Many of these tests need super user access to read BIOS data and ACPI tables, so the tool requires running with super user privileges (e.g. with sudo)." -HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519" - -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] = "c22dcba2572e4237bf2fe9ab579e195cf051d3a99b2c07ab58f757cae02d24fb" - -COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux" - -DEPENDS = "libpcre glib-2.0 dtc bison-native libbsd" -DEPENDS_append_libc-musl = " libexecinfo" - -# Use brokensep for now (https://github.com/ColinIanKing/fwts/issues/2) -inherit autotools-brokensep bash-completion pkgconfig - -LDFLAGS_append_libc-musl = " -lexecinfo" - -FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}" -FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la" -FILES_${PN}-staticdev += "${libdir}/fwts/lib*a" - -RDEPENDS_${PN} += "dtc" diff --git a/meta-oe/recipes-test/fwts/fwts_21.06.00.bb b/meta-oe/recipes-test/fwts/fwts_21.06.00.bb new file mode 100644 index 0000000000..21d2563514 --- /dev/null +++ b/meta-oe/recipes-test/fwts/fwts_21.06.00.bb @@ -0,0 +1,32 @@ +SUMMARY = "Firmware testsuite" +DESCRIPTION = "The tool fwts comprises of over fifty tests that are designed to exercise and test different aspects of a machine's firmware. Many of these tests need super user access to read BIOS data and ACPI tables, so the tool requires running with super user privileges (e.g. with sudo)." +HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519" + +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" + +COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux" + +DEPENDS = "libpcre glib-2.0 dtc bison-native libbsd" +DEPENDS_append_libc-musl = " libexecinfo" + +# Use brokensep for now (https://github.com/ColinIanKing/fwts/issues/2) +inherit autotools-brokensep bash-completion pkgconfig + +LDFLAGS_append_libc-musl = " -lexecinfo" + +FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}" +FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la" +FILES_${PN}-staticdev += "${libdir}/fwts/lib*a" + +RDEPENDS_${PN} += "dtc" -- cgit 1.2.3-korg