diff --git a/flashrom-ensure-flashrom-symbols-are-not-loaded-if-U.patch b/flashrom-ensure-flashrom-symbols-are-not-loaded-if-U.patch deleted file mode 100644 index 46f9cae..0000000 --- a/flashrom-ensure-flashrom-symbols-are-not-loaded-if-U.patch +++ /dev/null @@ -1,49 +0,0 @@ -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 3e17897..f45e942 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vboot-utils-9b08a3c4.tar.xz) = 0cf34f8a2b9a17781a7faf55974bdc9e88b1c09cb8efccd05ddba745f38a5ea803b12b2ffa31b847026d56b0672a9d97ab2f5d8e9ae7ca31a54d0d19d0895204 +SHA512 (vboot-utils-61971455.tar.xz) = ee888bd4e156e3be17c9ec17472208322e5eadeb41f3dc81b466ef838899f02e9ff90190eec97927cfddcbb2be9e301f026a2e8b1c5254b5b52b44402d37fb71 diff --git a/vboot-utils-9b08a3c4.patch b/vboot-utils-61971455.patch similarity index 100% rename from vboot-utils-9b08a3c4.patch rename to vboot-utils-61971455.patch diff --git a/vboot-utils.spec b/vboot-utils.spec index d0792af..7bc1732 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -1,11 +1,10 @@ -%define gitshort 9b08a3c4 +%define gitshort 61971455 Name: vboot-utils -Version: 20230127 -Release: 10.git%{gitshort}%{?dist} +Version: 20220621 +Release: 2.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 @@ -14,13 +13,11 @@ 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-9b08a3c4/ 9b08a3c4 | xz > vboot-utils-9b08a3c4.tar.xz +# git archive --format=tar --prefix=vboot-utils-61971455/ 61971455 | xz > vboot-utils-61971455.tar.xz Source0: %{name}-%{gitshort}.tar.xz # 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 +Patch0: vboot-utils-61971455.patch BuildRequires: make BuildRequires: gcc @@ -31,6 +28,7 @@ BuildRequires: trousers-devel BuildRequires: libyaml-devel BuildRequires: xz-devel BuildRequires: libuuid-devel +BuildRequires: flashrom-devel %description Verified boot is a collection of utilities helpful for chromebook computer. @@ -55,11 +53,11 @@ Pack and sign the kernel, manage gpt partitions. %endif -make V=1 ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS" USE_FLASHROM=0 +make V=1 ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS" %install -make install V=1 DESTDIR=%{buildroot} ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS" USE_FLASHROM=0 +make install V=1 DESTDIR=%{buildroot} ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS" mkdir -p %{buildroot}%{_datadir}/vboot/ cp -rf tests/devkeys %{buildroot}%{_datadir}/vboot/ @@ -92,40 +90,6 @@ rm -f %{buildroot}/usr/lib/libvboot_host.a %{_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