diff --git a/flashrom-ensure-flashrom-symbols-are-not-loaded-if-U.patch b/flashrom-ensure-flashrom-symbols-are-not-loaded-if-U.patch new file mode 100644 index 0000000..46f9cae --- /dev/null +++ b/flashrom-ensure-flashrom-symbols-are-not-loaded-if-U.patch @@ -0,0 +1,49 @@ +From f9ae6c12bd0b67ee336089ce15d5255d7d6d11b7 Mon Sep 17 00:00:00 2001 +From: Nobel Barakat +Date: Tue, 22 Nov 2022 00:40:20 +0000 +Subject: [PATCH] flashrom: ensure flashrom symbols are not loaded if + !USE_FLASHROM + +The linking process during the installation phase of this package +breaks if you compile with make USE_FLASHROM=0. A new conditional has +been added to the make file that prevents utility/crossystem from +compiling if USE_FLASHROM is either not set or set to the number 0. + +BUG=b:256682063 +TEST=cros_run_unit_tests --board amd64-generic --packages vboot_reference +TEST=env USE="test -flashrom" emerge-amd64-generic vboot_reference +TEST=env USE="-flashrom" emerge-amd64-generic vboot_reference +BRANCH=none + +Signed-off-by: Nobel Barakat nobelbarakat@google.com +Change-Id: Ia8cdd24653fdb74c9bb5f4de86b7711b138299cf +Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4045302 +Commit-Queue: Nobel Barakat +Reviewed-by: Yu-Ping Wu +Tested-by: Nobel Barakat +--- + Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 129ace99a424..cb504ff33a62 100644 +--- a/Makefile ++++ b/Makefile +@@ -593,10 +593,13 @@ UTIL_BIN_NAMES_SDK = \ + utility/signature_digest_utility \ + utility/verify_data + UTIL_BIN_NAMES_BOARD = \ +- utility/crossystem \ + utility/dumpRSAPublicKey \ + utility/tpmc + ++ifneq ($(filter-out 0,${USE_FLASHROM}),) ++UTIL_BIN_NAMES_BOARD += utility/crossystem ++endif ++ + UTIL_SCRIPTS_SDK = $(addprefix ${BUILD}/,${UTIL_SCRIPT_NAMES_SDK}) + UTIL_SCRIPTS_BOARD = $(addprefix ${BUILD}/,${UTIL_SCRIPT_NAMES_BOARD}) + UTIL_BINS_SDK = $(addprefix ${BUILD}/,${UTIL_BIN_NAMES_SDK}) +-- +2.39.1 + diff --git a/sources b/sources index a8140d8..3e17897 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vboot-utils-595108c0.tar.xz) = ee31b77920a8df706ec85edfbfbafc649d91645d8bf0e75f50ca0858006285b1f02b19b353161c5f779ecb499d263ffacfdf178742aad295d6f74fc87909cd56 +SHA512 (vboot-utils-9b08a3c4.tar.xz) = 0cf34f8a2b9a17781a7faf55974bdc9e88b1c09cb8efccd05ddba745f38a5ea803b12b2ffa31b847026d56b0672a9d97ab2f5d8e9ae7ca31a54d0d19d0895204 diff --git a/vboot-utils-595108c0-gcc10.patch b/vboot-utils-595108c0-gcc10.patch deleted file mode 100644 index d1e545a..0000000 --- a/vboot-utils-595108c0-gcc10.patch +++ /dev/null @@ -1,13 +0,0 @@ -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-9b08a3c4.patch b/vboot-utils-9b08a3c4.patch new file mode 100644 index 0000000..233f389 --- /dev/null +++ b/vboot-utils-9b08a3c4.patch @@ -0,0 +1,12 @@ +diff -ru vboot-utils-61971455-orig/futility/updater_utils.c vboot-utils-61971455/futility/updater_utils.c +--- vboot-utils-61971455-orig/futility/updater_utils.c 2022-06-16 02:45:02.000000000 +0200 ++++ vboot-utils-61971455/futility/updater_utils.c 2022-06-20 15:06:24.192678422 +0200 +@@ -700,7 +700,7 @@ + if (!cmd) + return -1; + +- VB2_DEBUG(cmd); ++ VB2_DEBUG("flashrom cmd: %s\n", cmd); + r = system(cmd); + free(cmd); + if (r) diff --git a/vboot-utils.spec b/vboot-utils.spec index a27507f..d0792af 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -1,10 +1,11 @@ -%define gitshort 595108c0 +%define gitshort 9b08a3c4 Name: vboot-utils -Version: 20190823 -Release: 6.git%{gitshort}%{?dist} +Version: 20230127 +Release: 10.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 @@ -13,13 +14,15 @@ ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 # following commands to generate the tarball: # git clone https://git.chromium.org/git/chromiumos/platform/vboot_reference.git # cd vboot_reference/ -# git archive --format=tar --prefix=vboot-utils-a1c5f7c/ a1c5f7c | xz > vboot-utils-a1c5f7c.tar.xz +# git archive --format=tar --prefix=vboot-utils-9b08a3c4/ 9b08a3c4 | xz > vboot-utils-9b08a3c4.tar.xz Source0: %{name}-%{gitshort}.tar.xz -# Fix FTBFS agsinst gcc10 -Patch0: vboot-utils-595108c0-gcc10.patch +# Fix VB2_DEBUG function usage +Patch0: vboot-utils-9b08a3c4.patch +# Fix linking error with USE_FLASHROM=0 +Patch1: flashrom-ensure-flashrom-symbols-are-not-loaded-if-U.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: glibc-static @@ -52,23 +55,94 @@ Pack and sign the kernel, manage gpt partitions. %endif -make V=1 ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS" +make V=1 ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS" USE_FLASHROM=0 %install -make install V=1 DESTDIR=%{buildroot}/usr ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS" +make install V=1 DESTDIR=%{buildroot} ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS" USE_FLASHROM=0 +mkdir -p %{buildroot}%{_datadir}/vboot/ +cp -rf tests/devkeys %{buildroot}%{_datadir}/vboot/ # Remove unneeded build artifacts rm -rf %{buildroot}/usr/lib/pkgconfig/ rm -rf %{buildroot}/usr/default/ - +rm -rf %{buildroot}/etc/default/ +rm -rf %{buildroot}/usr/share/vboot/bin/ +rm -f %{buildroot}/usr/bin/chromeos-tpm-recovery +rm -f %{buildroot}/usr/bin/crossystem +rm -f %{buildroot}/usr/bin/dev_debug_vboot +rm -f %{buildroot}/usr/bin/dumpRSAPublicKey +rm -f %{buildroot}/usr/bin/dump_fmap +rm -f %{buildroot}/usr/bin/dump_kernel_config +rm -f %{buildroot}/usr/bin/enable_dev_usb_boot +rm -f %{buildroot}/usr/bin/gbb_utility +rm -f %{buildroot}/usr/bin/tpm-nvsize +rm -f %{buildroot}/usr/bin/tpmc +rm -f %{buildroot}/usr/bin/vbutil_firmware +rm -f %{buildroot}/usr/bin/vbutil_key +rm -f %{buildroot}/usr/bin/vbutil_keyblock +rm -f %{buildroot}/usr/lib/libvboot_host.a %files %license LICENSE %doc README -%{_bindir}/* +%{_bindir}/futility +%{_bindir}/vbutil_kernel +%{_bindir}/cgpt +%{_datadir}/vboot/devkeys/ %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 20230127-10.git9b08a3c4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jun 13 2026 Yaakov Selkowitz - 20230127-9.git9b08a3c4 +- Rebuilt for openssl 4.0 + +* Sat Jan 17 2026 Fedora Release Engineering - 20230127-8.git9b08a3c4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 20230127-7.git9b08a3c4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 20230127-6.git9b08a3c4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Sep 04 2024 Miroslav Suchý - 20230127-5.git9b08a3c4 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 20230127-4.git9b08a3c4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 20230127-3.git9b08a3c4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 20230127-2.git9b08a3c4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 27 2023 Javier Martinez Canillas - 20230127-1.git9b08a3c4 +- Update to upstream snapshot 9b08a3c4 +- Drop `BuildRequires: flashrom-devel` since all tools depending on it are removed. + +* Sat Jan 21 2023 Fedora Release Engineering - 20220621-3.git61971455 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 20220621-2.git61971455 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jun 21 2022 Dorinda Bassey - 20220621-1.git61971455 +- Fix VB2_DEBUG function usage +- New Upstream snapshot 61971455 +- Clean up spec file + +* Sat Jan 22 2022 Fedora Release Engineering - 20190823-9.git595108c0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Sep 14 2021 Sahana Prasad - 20190823-8.git595108c0 +- Rebuilt with OpenSSL 3.0.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 20190823-7.git595108c0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 20190823-6.git595108c0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild