From 700c7b6e65a9b32fab9cc74b7eb0632c97a564bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:07:55 +0000 Subject: [PATCH 01/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 7bc1732..ae31071 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20220621 -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 @@ -90,6 +90,9 @@ rm -f %{buildroot}/usr/lib/libvboot_host.a %{_datadir}/vboot/devkeys/ %changelog +* 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 From 5cf0fc542965cb563f123bb74e4569e2ca514fbe Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Fri, 27 Jan 2023 15:41:29 +0100 Subject: [PATCH 02/11] Update to upstream snapshot 9b08a3c4 While being there also `BuildRequires: flashrom-devel` since all the tools depending on this are removed from the artifcats and not installed. Signed-off-by: Javier Martinez Canillas --- ...flashrom-symbols-are-not-loaded-if-U.patch | 49 +++++++++++++++++++ sources | 2 +- ...971455.patch => vboot-utils-9b08a3c4.patch | 0 vboot-utils.spec | 21 +++++--- 4 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 flashrom-ensure-flashrom-symbols-are-not-loaded-if-U.patch rename vboot-utils-61971455.patch => vboot-utils-9b08a3c4.patch (100%) 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 f45e942..3e17897 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vboot-utils-61971455.tar.xz) = ee888bd4e156e3be17c9ec17472208322e5eadeb41f3dc81b466ef838899f02e9ff90190eec97927cfddcbb2be9e301f026a2e8b1c5254b5b52b44402d37fb71 +SHA512 (vboot-utils-9b08a3c4.tar.xz) = 0cf34f8a2b9a17781a7faf55974bdc9e88b1c09cb8efccd05ddba745f38a5ea803b12b2ffa31b847026d56b0672a9d97ab2f5d8e9ae7ca31a54d0d19d0895204 diff --git a/vboot-utils-61971455.patch b/vboot-utils-9b08a3c4.patch similarity index 100% rename from vboot-utils-61971455.patch rename to vboot-utils-9b08a3c4.patch diff --git a/vboot-utils.spec b/vboot-utils.spec index ae31071..7420ee2 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -1,8 +1,8 @@ -%define gitshort 61971455 +%define gitshort 9b08a3c4 Name: vboot-utils -Version: 20220621 -Release: 3.git%{gitshort}%{?dist} +Version: 20230127 +Release: 1.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference @@ -13,11 +13,13 @@ 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-61971455/ 61971455 | xz > vboot-utils-61971455.tar.xz +# git archive --format=tar --prefix=vboot-utils-9b08a3c4/ 9b08a3c4 | xz > vboot-utils-9b08a3c4.tar.xz Source0: %{name}-%{gitshort}.tar.xz # Fix VB2_DEBUG function usage -Patch0: vboot-utils-61971455.patch +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: gcc @@ -28,7 +30,6 @@ 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. @@ -53,11 +54,11 @@ 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} 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/ @@ -90,6 +91,10 @@ rm -f %{buildroot}/usr/lib/libvboot_host.a %{_datadir}/vboot/devkeys/ %changelog +* 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 From b175995c9dea127af1d1edb6dc2af57e57483a3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:26:41 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 7420ee2..208fb66 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20230127 -Release: 1.git%{gitshort}%{?dist} +Release: 2.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference @@ -91,6 +91,9 @@ rm -f %{buildroot}/usr/lib/libvboot_host.a %{_datadir}/vboot/devkeys/ %changelog +* 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. From e472cfac9d6c70a99341a63c9e3046c6d44aa21b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:32:14 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 208fb66..c101c50 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20230127 -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 @@ -91,6 +91,9 @@ rm -f %{buildroot}/usr/lib/libvboot_host.a %{_datadir}/vboot/devkeys/ %changelog +* 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 From 6005bf3b4a70075ba1cdbd832626fc22ba9ce6f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:35:53 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index c101c50..c372bf5 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20230127 -Release: 3.git%{gitshort}%{?dist} +Release: 4.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference @@ -91,6 +91,9 @@ rm -f %{buildroot}/usr/lib/libvboot_host.a %{_datadir}/vboot/devkeys/ %changelog +* 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 From d00db211200a90d6a8d8cb12b127a0240e55b2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:37:32 +0200 Subject: [PATCH 06/11] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vboot-utils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index c372bf5..ca4a0ac 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,9 +2,10 @@ Name: vboot-utils Version: 20230127 -Release: 4.git%{gitshort}%{?dist} +Release: 5.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 @@ -91,6 +92,9 @@ rm -f %{buildroot}/usr/lib/libvboot_host.a %{_datadir}/vboot/devkeys/ %changelog +* 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 From f5f7e6f64c291caaacf5b5185357d1bba14bfba8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:08:26 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index ca4a0ac..8017b12 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20230127 -Release: 5.git%{gitshort}%{?dist} +Release: 6.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -92,6 +92,9 @@ rm -f %{buildroot}/usr/lib/libvboot_host.a %{_datadir}/vboot/devkeys/ %changelog +* 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 From 03ace783f6b499c9bdf4fb20a4250e38f879575b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:58:59 +0000 Subject: [PATCH 08/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 8017b12..03a12cc 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20230127 -Release: 6.git%{gitshort}%{?dist} +Release: 7.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -92,6 +92,9 @@ rm -f %{buildroot}/usr/lib/libvboot_host.a %{_datadir}/vboot/devkeys/ %changelog +* 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 From c1711cb343c9f7ca10aa429d1ea0e9ca26808eb3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:48:17 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 03a12cc..4297b83 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20230127 -Release: 7.git%{gitshort}%{?dist} +Release: 8.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -92,6 +92,9 @@ rm -f %{buildroot}/usr/lib/libvboot_host.a %{_datadir}/vboot/devkeys/ %changelog +* 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 From b2db89032de2d4c2c90240f97885917f6984bee1 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:01:57 -0400 Subject: [PATCH 10/11] Rebuilt for openssl 4.0 --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 4297b83..8a226bf 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20230127 -Release: 8.git%{gitshort}%{?dist} +Release: 9.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -92,6 +92,9 @@ rm -f %{buildroot}/usr/lib/libvboot_host.a %{_datadir}/vboot/devkeys/ %changelog +* 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 From c17e4161f1d6d74993e56a24d784dc92555f6b66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:23:02 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 8a226bf..d0792af 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20230127 -Release: 9.git%{gitshort}%{?dist} +Release: 10.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -92,6 +92,9 @@ 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