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 <javierm@redhat.com>
This commit is contained in:
Javier Martinez Canillas
parent
700c7b6e65
commit
5cf0fc5429
4 changed files with 63 additions and 9 deletions
49
flashrom-ensure-flashrom-symbols-are-not-loaded-if-U.patch
Normal file
49
flashrom-ensure-flashrom-symbols-are-not-loaded-if-U.patch
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
From f9ae6c12bd0b67ee336089ce15d5255d7d6d11b7 Mon Sep 17 00:00:00 2001
|
||||
From: Nobel Barakat <nobelbarakat@google.com>
|
||||
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 <nobelbarakat@google.com>
|
||||
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
|
||||
Tested-by: Nobel Barakat <nobelbarakat@google.com>
|
||||
---
|
||||
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
|
||||
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (vboot-utils-61971455.tar.xz) = ee888bd4e156e3be17c9ec17472208322e5eadeb41f3dc81b466ef838899f02e9ff90190eec97927cfddcbb2be9e301f026a2e8b1c5254b5b52b44402d37fb71
|
||||
SHA512 (vboot-utils-9b08a3c4.tar.xz) = 0cf34f8a2b9a17781a7faf55974bdc9e88b1c09cb8efccd05ddba745f38a5ea803b12b2ffa31b847026d56b0672a9d97ab2f5d8e9ae7ca31a54d0d19d0895204
|
||||
|
|
|
|||
|
|
@ -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 <javierm@redhat.com> - 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 <releng@fedoraproject.org> - 20220621-3.git61971455
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue