From 7ac6841013a9b5b1678baf7f90e2cd22b45b2c98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:57:53 +0000 Subject: [PATCH 01/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 43d09a4..8731996 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20190823 -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 @@ -73,6 +73,9 @@ make runtests || true %{_bindir}/* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 20190823-2.git595108c0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Aug 26 2019 Peter Robinson 20190823.1.git595108c0 - Rebase to upstream 595108c0 snapshot From 2872cfa932f57deb66164dbfbe2039aa5cc37d99 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 27 Feb 2020 15:26:31 +0100 Subject: [PATCH 02/24] Fix FTBFS --- vboot-utils-595108c0-gcc10.patch | 13 +++++++++++++ vboot-utils.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 vboot-utils-595108c0-gcc10.patch 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 From 4bbb14e927403c9f77beee7c6662d024d17d16dd Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 1 Mar 2020 09:38:43 +0000 Subject: [PATCH 03/24] Drop tests to drop python2 dep --- vboot-utils.spec | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 9f1181a..26b40c7 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20190823 -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 @@ -28,17 +28,13 @@ BuildRequires: libyaml-devel BuildRequires: xz-devel BuildRequires: libuuid-devel -# for the test scripts -BuildRequires: python2 - %description Verified boot is a collection of utilities helpful for chromebook computer. Pack and sign the kernel, manage gpt partitions. %prep -%setup -q -n %{name}-%{gitshort} -%patch0 -p1 -b .gcc10 +%autosetup -p1 -n %{name}-%{gitshort} %build @@ -65,11 +61,6 @@ make install V=1 DESTDIR=%{buildroot}/usr ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FL rm -rf %{buildroot}/usr/lib/pkgconfig/ rm -rf %{buildroot}/usr/default/ -## Tests are enabled but ignored (will not break the build). -## This is because tests fail in a chroot (mock) but work otherwise. -%check -make runtests || true - %files %license LICENSE @@ -77,7 +68,10 @@ make runtests || true %{_bindir}/* %changelog -* Thu Feb 27 2020 Than Ngo - 20190823-3.git +* Sun Mar 01 2020 Peter Robinson - 20190823-4.git595108c0 +- Drop tests to drop python2 dep + +* Thu Feb 27 2020 Than Ngo - 20190823-3.git595108c - Fix FTBFS * Fri Jan 31 2020 Fedora Release Engineering - 20190823-2.git595108c0 From 361548fd8ef4ee9e8abefa91342e0f129bfab3e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:34:11 +0000 Subject: [PATCH 04/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 26b40c7..1f113ca 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20190823 -Release: 4.git%{gitshort}%{?dist} +Release: 5.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference @@ -68,6 +68,9 @@ rm -rf %{buildroot}/usr/default/ %{_bindir}/* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 20190823-5.git595108c0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Mar 01 2020 Peter Robinson - 20190823-4.git595108c0 - Drop tests to drop python2 dep From c0511408a490736178811357569c556af5d2f11a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:35:29 +0000 Subject: [PATCH 05/24] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vboot-utils.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vboot-utils.spec b/vboot-utils.spec index 1f113ca..14228d6 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -19,6 +19,7 @@ Source0: %{name}-%{gitshort}.tar.xz # Fix FTBFS agsinst gcc10 Patch0: vboot-utils-595108c0-gcc10.patch +BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: glibc-static From 47e74c684e3234d277d98e20baacbd7d3e05d91f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:55:46 +0000 Subject: [PATCH 06/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 14228d6..a27507f 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20190823 -Release: 5.git%{gitshort}%{?dist} +Release: 6.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference @@ -69,6 +69,9 @@ rm -rf %{buildroot}/usr/default/ %{_bindir}/* %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 20190823-6.git595108c0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 20190823-5.git595108c0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 812ebe822fdfbcc5e73ac70391e74f3e6532d7aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:19:42 +0000 Subject: [PATCH 07/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 a27507f..61e7f79 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20190823 -Release: 6.git%{gitshort}%{?dist} +Release: 7.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference @@ -69,6 +69,9 @@ rm -rf %{buildroot}/usr/default/ %{_bindir}/* %changelog +* 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 From 1b12a82c7b5604966c7aaff0233d56669d47391b Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:17:26 +0200 Subject: [PATCH 08/24] Rebuilt with OpenSSL 3.0.0 --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 61e7f79..c1e8fba 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20190823 -Release: 7.git%{gitshort}%{?dist} +Release: 8.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference @@ -69,6 +69,9 @@ rm -rf %{buildroot}/usr/default/ %{_bindir}/* %changelog +* 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 From f9492284c51993b47b75e3aab847c2c308a2c8d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:48:58 +0000 Subject: [PATCH 09/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 c1e8fba..cf02ae8 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20190823 -Release: 8.git%{gitshort}%{?dist} +Release: 9.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference @@ -69,6 +69,9 @@ rm -rf %{buildroot}/usr/default/ %{_bindir}/* %changelog +* 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 From ff739504b82bb7d9dcf89635fd273b99d5345403 Mon Sep 17 00:00:00 2001 From: Dorinda Bassey Date: Tue, 21 Jun 2022 18:08:58 +0200 Subject: [PATCH 10/24] - Fix VB2_DEBUG function usage - New Upstream snapshot 61971455 - Clean up spec file Signed-off-by: Dorinda Bassey --- vboot-utils-595108c0-gcc10.patch | 13 --------- vboot-utils-61971455.patch | 12 +++++++++ vboot-utils.spec | 46 +++++++++++++++++++++++++------- 3 files changed, 48 insertions(+), 23 deletions(-) delete mode 100644 vboot-utils-595108c0-gcc10.patch create mode 100644 vboot-utils-61971455.patch 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-61971455.patch b/vboot-utils-61971455.patch new file mode 100644 index 0000000..233f389 --- /dev/null +++ b/vboot-utils-61971455.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 cf02ae8..608d7d2 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -1,8 +1,8 @@ -%define gitshort 595108c0 +%define gitshort 61971455 Name: vboot-utils -Version: 20190823 -Release: 9.git%{gitshort}%{?dist} +Version: 20220620 +Release: 10.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference @@ -13,13 +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-a1c5f7c/ a1c5f7c | xz > vboot-utils-a1c5f7c.tar.xz +# git archive --format=tar --prefix=vboot-utils-61971455/ 61971455 | xz > vboot-utils-61971455.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-61971455.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: glibc-static @@ -28,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. @@ -56,19 +57,44 @@ make V=1 ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS" %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" +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 +* Tue Jun 21 2022 Dorinda Bassey - 20220620-10.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 From 491e5d65097357d35526cf2dd5b2d83d3b9c1ce5 Mon Sep 17 00:00:00 2001 From: Dorinda Bassey Date: Tue, 21 Jun 2022 18:24:42 +0200 Subject: [PATCH 11/24] - change version number and release Signed-off-by: Dorinda Bassey --- vboot-utils.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 608d7d2..4a92b41 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -1,8 +1,8 @@ %define gitshort 61971455 Name: vboot-utils -Version: 20220620 -Release: 10.git%{gitshort}%{?dist} +Version: 20220621 +Release: 1.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference @@ -90,7 +90,7 @@ rm -f %{buildroot}/usr/lib/libvboot_host.a %{_datadir}/vboot/devkeys/ %changelog -* Tue Jun 21 2022 Dorinda Bassey - 20220620-10.git61971455 +* Tue Jun 21 2022 Dorinda Bassey - 20220621-1.git61971455 - Fix VB2_DEBUG function usage - New Upstream snapshot 61971455 - Clean up spec file From 3b068dd1bdf5db3a2c0deee2ee10e2974383dfeb Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 22 Jun 2022 09:37:11 +0100 Subject: [PATCH 12/24] Upload source --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index a8140d8..f45e942 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vboot-utils-595108c0.tar.xz) = ee31b77920a8df706ec85edfbfbafc649d91645d8bf0e75f50ca0858006285b1f02b19b353161c5f779ecb499d263ffacfdf178742aad295d6f74fc87909cd56 +SHA512 (vboot-utils-61971455.tar.xz) = ee888bd4e156e3be17c9ec17472208322e5eadeb41f3dc81b466ef838899f02e9ff90190eec97927cfddcbb2be9e301f026a2e8b1c5254b5b52b44402d37fb71 From c2051ced47182ffbae239293104d166832e683bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:42:39 +0000 Subject: [PATCH 13/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 4a92b41..7bc1732 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20220621 -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 @@ -90,6 +90,9 @@ rm -f %{buildroot}/usr/lib/libvboot_host.a %{_datadir}/vboot/devkeys/ %changelog +* 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 From 700c7b6e65a9b32fab9cc74b7eb0632c97a564bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:07:55 +0000 Subject: [PATCH 14/24] 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 15/24] 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 16/24] 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 17/24] 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 18/24] 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 19/24] 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 20/24] 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 21/24] 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 22/24] 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 23/24] 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 24/24] 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