From adf560d283f0513aa75bbfa89d31b2ec24d88a0fa3479f2d47a5f703ba3df801 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 30 Nov 2020 16:06:05 +0000 Subject: [PATCH 1/2] Accepting request 851866 from home:oertel:branches:hardware - add patch fwts-fix-non-acpi.patch fix build on non-acpi platforms like ppc64le and s390x - Update to version 20.11.00: * See provided changelog for detailed list of changes OBS-URL: https://build.opensuse.org/request/show/851866 OBS-URL: https://build.opensuse.org/package/show/hardware/fwts?expand=0&rev=113 --- fwts-20.11.00.tar.gz | 3 +++ fwts-V20.09.00.tar.gz | 3 --- fwts-fix-non-acpi.patch | 23 +++++++++++++++++++++++ fwts-no-compiletime.patch | 8 +++----- fwts.changes | 12 ++++++++++++ fwts.spec | 8 +++++--- 6 files changed, 46 insertions(+), 11 deletions(-) create mode 100644 fwts-20.11.00.tar.gz delete mode 100644 fwts-V20.09.00.tar.gz create mode 100644 fwts-fix-non-acpi.patch diff --git a/fwts-20.11.00.tar.gz b/fwts-20.11.00.tar.gz new file mode 100644 index 0000000..de462bb --- /dev/null +++ b/fwts-20.11.00.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e90ec57a30f4be90ad2a5a196e6a85bb0524d4ae4a6e49d7401f94d8429cb2d7 +size 3847709 diff --git a/fwts-V20.09.00.tar.gz b/fwts-V20.09.00.tar.gz deleted file mode 100644 index f084954..0000000 --- a/fwts-V20.09.00.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41dfe922c64abf16a4831a6f726c61e7016b4098a975f6d0579ffef146127d2e -size 3835316 diff --git a/fwts-fix-non-acpi.patch b/fwts-fix-non-acpi.patch new file mode 100644 index 0000000..2a5f033 --- /dev/null +++ b/fwts-fix-non-acpi.patch @@ -0,0 +1,23 @@ +--- fwts-20.11.00/src/acpica/source/tools/acpiexec/aecommon.h 2020/11/27 15:57:25 1.1 ++++ fwts-20.11.00/src/acpica/source/tools/acpiexec/aecommon.h 2020/11/27 15:57:41 +@@ -201,11 +201,18 @@ + + } INIT_FILE_ENTRY; + ++#if defined(__x86_64__) || defined(__x86_64) || defined(__i386__) || defined(__i386) || defined(__aarch64__) || defined(__riscv) ++extern BOOLEAN AcpiGbl_IgnoreErrors; ++extern UINT8 AcpiGbl_RegionFillValue; ++#else ++#define VOID_FUNC(name) void name(void); ++extern VOID_FUNC(AcpiGbl_IgnoreErrors) ++extern VOID_FUNC(AcpiGbl_RegionFillValue) ++#endif ++ + extern BOOLEAN AcpiGbl_UseLocalFaultHandler; + extern BOOLEAN AcpiGbl_VerboseHandlers; +-extern BOOLEAN AcpiGbl_IgnoreErrors; + extern BOOLEAN AcpiGbl_AbortLoopOnTimeout; +-extern UINT8 AcpiGbl_RegionFillValue; + extern INIT_FILE_ENTRY *AcpiGbl_InitEntries; + extern UINT32 AcpiGbl_InitFileLineCount; + extern UINT8 AcpiGbl_UseHwReducedFadt; diff --git a/fwts-no-compiletime.patch b/fwts-no-compiletime.patch index 5ec0831..e4702cb 100644 --- a/fwts-no-compiletime.patch +++ b/fwts-no-compiletime.patch @@ -1,8 +1,6 @@ -Index: fwts-20.03.00/src/acpica/source/compiler/aslutils.c -=================================================================== ---- fwts-20.03.00.orig/src/acpica/source/compiler/aslutils.c -+++ fwts-20.03.00/src/acpica/source/compiler/aslutils.c -@@ -596,7 +596,7 @@ UtDisplayOneSummary ( +--- fwts-20.11.00/src/acpica/source/compiler/aslutils.c 2020/11/27 16:29:34 1.1 ++++ fwts-20.11.00/src/acpica/source/compiler/aslutils.c 2020/11/27 16:29:50 +@@ -596,7 +596,7 @@ /* Compiler name and version number */ FlPrintFile (FileId, "%s version %X [%s]\n\n", diff --git a/fwts.changes b/fwts.changes index afeabfc..5f8d440 100644 --- a/fwts.changes +++ b/fwts.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Nov 30 14:47:38 CET 2020 - ro@suse.de + +- add patch fwts-fix-non-acpi.patch + fix build on non-acpi platforms like ppc64le and s390x + +------------------------------------------------------------------- +Fri Nov 27 17:33:03 CET 2020 - ro@suse.de + +- Update to version 20.11.00: + * See provided changelog for detailed list of changes + ------------------------------------------------------------------- Tue Sep 22 11:51:22 UTC 2020 - Martin Pluskal diff --git a/fwts.spec b/fwts.spec index 376f7e2..8ec35e1 100644 --- a/fwts.spec +++ b/fwts.spec @@ -17,15 +17,17 @@ Name: fwts -Version: 20.09.00 +Version: 20.11.00 Release: 0 Summary: Firmware Test Suite License: GPL-2.0-or-later Group: Development/Tools/Other URL: https://wiki.ubuntu.com/Kernel/Reference/fwts -Source0: http://fwts.ubuntu.com/release/%{name}-V%{version}.tar.gz +Source0: http://fwts.ubuntu.com/release/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE fwts-no-compiletime.patch Patch1: fwts-no-compiletime.patch +# PATCH-FIX-OPENSUSE fwts-fix-non-acpi.patch +Patch2: fwts-fix-non-acpi.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -54,7 +56,7 @@ will give some form of advice on how to fix issues or workaround firmware issues. %prep -%autosetup -c %{name}-%{version} -p1 +%autosetup -p1 %build find . -name Makefile.am -exec sed -i "s|-Werror||g" {} + From ed23302fd3266affee3366137361c941eede4b1b4e97309cb15f15d31a81e81e Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 1 Dec 2020 09:43:45 +0000 Subject: [PATCH 2/2] - Fix broken source url and prepare done in previous changes OBS-URL: https://build.opensuse.org/package/show/hardware/fwts?expand=0&rev=114 --- fwts-20.11.00.tar.gz | 3 --- fwts-V20.11.00.tar.gz | 3 +++ fwts.changes | 5 +++++ fwts.spec | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 fwts-20.11.00.tar.gz create mode 100644 fwts-V20.11.00.tar.gz diff --git a/fwts-20.11.00.tar.gz b/fwts-20.11.00.tar.gz deleted file mode 100644 index de462bb..0000000 --- a/fwts-20.11.00.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e90ec57a30f4be90ad2a5a196e6a85bb0524d4ae4a6e49d7401f94d8429cb2d7 -size 3847709 diff --git a/fwts-V20.11.00.tar.gz b/fwts-V20.11.00.tar.gz new file mode 100644 index 0000000..0411716 --- /dev/null +++ b/fwts-V20.11.00.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59119fba0280a44d64914e3b5caea307f001c665412e0e106903e404aa014fcf +size 3845548 diff --git a/fwts.changes b/fwts.changes index 5f8d440..1ee9ebb 100644 --- a/fwts.changes +++ b/fwts.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 1 09:42:44 UTC 2020 - Martin Pluskal + +- Fix broken source url and prepare done in previous changes + ------------------------------------------------------------------- Mon Nov 30 14:47:38 CET 2020 - ro@suse.de diff --git a/fwts.spec b/fwts.spec index 8ec35e1..fb7128d 100644 --- a/fwts.spec +++ b/fwts.spec @@ -23,7 +23,7 @@ Summary: Firmware Test Suite License: GPL-2.0-or-later Group: Development/Tools/Other URL: https://wiki.ubuntu.com/Kernel/Reference/fwts -Source0: http://fwts.ubuntu.com/release/%{name}-%{version}.tar.gz +Source0: https://fwts.ubuntu.com/release/%{name}-V%{version}.tar.gz # PATCH-FIX-OPENSUSE fwts-no-compiletime.patch Patch1: fwts-no-compiletime.patch # PATCH-FIX-OPENSUSE fwts-fix-non-acpi.patch @@ -56,7 +56,7 @@ will give some form of advice on how to fix issues or workaround firmware issues. %prep -%autosetup -p1 +%autosetup -c %{name}-V%{version} -p1 %build find . -name Makefile.am -exec sed -i "s|-Werror||g" {} +