diff --git a/vboot-utils-595108c0-gcc10.patch b/vboot-utils-595108c0-gcc10.patch new file mode 100644 index 0000000..d1e545a --- /dev/null +++ b/vboot-utils-595108c0-gcc10.patch @@ -0,0 +1,13 @@ +diff -up vboot-utils-595108c0/futility/futility.h.me vboot-utils-595108c0/futility/futility.h +--- vboot-utils-595108c0/futility/futility.h.me 2020-02-27 15:17:14.991440799 +0100 ++++ vboot-utils-595108c0/futility/futility.h 2020-02-27 15:17:48.392751737 +0100 +@@ -40,7 +40,7 @@ enum vboot_version { + }; + + /* What's our preferred API & data format? */ +-enum vboot_version vboot_version; ++extern enum vboot_version vboot_version; + + /* Here's a structure to define the commands that futility implements. */ + struct futil_cmd_t { +diff -up vboot-utils-595108c0/tests/vboot_common_tests.c.me vboot-utils-595108c0/tests/vboot_common_tests.c diff --git a/vboot-utils.spec b/vboot-utils.spec index 8731996..9f1181a 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20190823 -Release: 2.git%{gitshort}%{?dist} +Release: 3.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference @@ -16,6 +16,9 @@ ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 # git archive --format=tar --prefix=vboot-utils-a1c5f7c/ a1c5f7c | xz > vboot-utils-a1c5f7c.tar.xz Source0: %{name}-%{gitshort}.tar.xz +# Fix FTBFS agsinst gcc10 +Patch0: vboot-utils-595108c0-gcc10.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: glibc-static @@ -35,6 +38,7 @@ Pack and sign the kernel, manage gpt partitions. %prep %setup -q -n %{name}-%{gitshort} +%patch0 -p1 -b .gcc10 %build @@ -73,6 +77,9 @@ make runtests || true %{_bindir}/* %changelog +* Thu Feb 27 2020 Than Ngo - 20190823-3.git +- Fix FTBFS + * Fri Jan 31 2020 Fedora Release Engineering - 20190823-2.git595108c0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild