From 5063084b03d1c1b1bad20401dabfdc613f52d787 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:24:24 +0200 Subject: [PATCH 01/42] Rebuilt for GCC 5 C++11 ABI change --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index c4fe2cd..511fce9 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -1,6 +1,6 @@ Name: vboot-utils Version: 20130222gite6cf2c2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Verified Boot Utility from Chromium OS ExclusiveArch: %{arm} %{ix86} x86_64 @@ -90,6 +90,9 @@ make runtests || true %doc LICENSE README %changelog +* Sat May 02 2015 Kalev Lember - 20130222gite6cf2c2-7 +- Rebuilt for GCC 5 C++11 ABI change + * Mon Aug 18 2014 Fedora Release Engineering - 20130222gite6cf2c2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 3a995cedaa776e0cd27ee2ae977433aafcc320ef Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:50:54 +0000 Subject: [PATCH 02/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 511fce9..9fc6d6e 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -1,6 +1,6 @@ Name: vboot-utils Version: 20130222gite6cf2c2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Verified Boot Utility from Chromium OS ExclusiveArch: %{arm} %{ix86} x86_64 @@ -90,6 +90,9 @@ make runtests || true %doc LICENSE README %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 20130222gite6cf2c2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 20130222gite6cf2c2-7 - Rebuilt for GCC 5 C++11 ABI change From 3168024813f4d3948ca8161d18b86e10fc8d1094 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:34:22 +0000 Subject: [PATCH 03/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 9fc6d6e..eac9fbc 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -1,6 +1,6 @@ Name: vboot-utils Version: 20130222gite6cf2c2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Verified Boot Utility from Chromium OS ExclusiveArch: %{arm} %{ix86} x86_64 @@ -90,6 +90,9 @@ make runtests || true %doc LICENSE README %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 20130222gite6cf2c2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 20130222gite6cf2c2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 1a55cffc607d5fcce0f75de6f4631e74686ab3f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:57:26 +0000 Subject: [PATCH 04/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index eac9fbc..1f838dd 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -1,6 +1,6 @@ Name: vboot-utils Version: 20130222gite6cf2c2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Verified Boot Utility from Chromium OS ExclusiveArch: %{arm} %{ix86} x86_64 @@ -90,6 +90,9 @@ make runtests || true %doc LICENSE README %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 20130222gite6cf2c2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 20130222gite6cf2c2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From cd6201e4e692d0d2345dc3e5bfc9ce73db3a0fac Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 4 Jun 2017 14:56:24 +0100 Subject: [PATCH 05/42] Move to newer upstream snapshot needed for some devices, Spec cleanups --- .gitignore | 2 +- sources | 2 +- vboot-utils-00-disable-static-linking.patch | 50 ++++++++++---- ...t-utils-01-bmpblk_utility-fix-printf.patch | 43 ------------ vboot-utils-cflags.patch | 13 ++-- vboot-utils-pthread.patch | 12 ---- vboot-utils-strncat.patch | 68 ------------------- vboot-utils-unused.patch | 25 ------- vboot-utils.spec | 62 ++++++++--------- 9 files changed, 72 insertions(+), 205 deletions(-) delete mode 100644 vboot-utils-01-bmpblk_utility-fix-printf.patch delete mode 100644 vboot-utils-pthread.patch delete mode 100644 vboot-utils-strncat.patch delete mode 100644 vboot-utils-unused.patch diff --git a/.gitignore b/.gitignore index c6cfa70..0a22629 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/vboot-utils-20130222gite6cf2c2.tar.xz +/vboot-utils-*.tar.xz diff --git a/sources b/sources index bf8266b..734ab31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11df5e40246ad87ac4d6f8b1de2a8edd vboot-utils-20130222gite6cf2c2.tar.xz +SHA512 (vboot-utils-a1c5f7c.tar.xz) = 0324e9ab7578073893a35b461f4f9ebd5e1700eb39d342398981855597e01ad085acea4ca3e05c4a68801f646ce68fb86ab665c0f05ab3a169158020c09551b9 diff --git a/vboot-utils-00-disable-static-linking.patch b/vboot-utils-00-disable-static-linking.patch index ddc3ee3..4d02711 100644 --- a/vboot-utils-00-disable-static-linking.patch +++ b/vboot-utils-00-disable-static-linking.patch @@ -1,20 +1,42 @@ ---- Makefile.orig 2013-02-22 23:37:25.911542016 -0600 -+++ Makefile 2013-02-22 23:37:49.286029980 -0600 -@@ -642,7 +642,7 @@ - .PHONY: cgpt - cgpt: ${CGPT} +--- vboot-utils-a1c5f7c/Makefile.orig 2017-06-04 14:06:10.707762796 +0100 ++++ vboot-utils-a1c5f7c/Makefile 2017-06-04 14:07:04.347718848 +0100 +@@ -227,12 +227,6 @@ + CXX ?= g++ + PKG_CONFIG ?= pkg-config --${CGPT}: LDFLAGS += -static -+#${CGPT}: LDFLAGS += -static - ${CGPT}: LDLIBS += -luuid +-# Static? +-ifneq (${STATIC},) +-LDFLAGS += -static +-PKG_CONFIG += --static +-endif +- + # Determine QEMU architecture needed, if any + ifeq (${ARCH},${HOST_ARCH}) + # Same architecture; no need for QEMU +@@ -999,7 +993,6 @@ + # Link tests for external repos + ${BUILD}/host/linktest/extern: ${HOSTLIB} + ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB} +-${BUILD}/host/linktest/extern: LDLIBS += -static + TEST_OBJS += ${BUILD}/host/linktest/extern.o - ${CGPT}: ${CGPT_OBJS} ${LIBS} -@@ -662,7 +662,7 @@ - ${BUILD}/utility/%: INCLUDES += -Ihost/include -Iutility/include + .PHONY: hostlib +@@ -1090,9 +1083,6 @@ + ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTILLIB} + ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB} - # Utilities for auto-update toolkits must be statically linked. +-# Utilities for auto-update toolkits must be statically linked. -${UTIL_BINS_STATIC}: LDFLAGS += -static -+#${UTIL_BINS_STATIC}: LDFLAGS += -static +- .PHONY: utils - utils: ${UTIL_BINS} ${UTIL_SCRIPTS} ${UTIL_SBINS} + utils: ${UTIL_BINS} ${UTIL_SCRIPTS} +@@ -1124,7 +1114,7 @@ + + ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB} + @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" +- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS} ++ ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} + + ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS} ${FWLIB20} + ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB20} ${UTILBDB} diff --git a/vboot-utils-01-bmpblk_utility-fix-printf.patch b/vboot-utils-01-bmpblk_utility-fix-printf.patch deleted file mode 100644 index f0e6bbc..0000000 --- a/vboot-utils-01-bmpblk_utility-fix-printf.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- utility/orig.bmpblk_utility.cc 2013-01-29 14:12:00.560456478 -0600 -+++ utility/bmpblk_utility.cc 2013-01-29 14:12:00.570456506 -0600 -@@ -99,11 +99,11 @@ - // The number of localizations should match the number of locale_index - - if (debug_) { -- printf("%ld image_names\n", config_.image_names.size()); -+ printf("%zu image_names\n", config_.image_names.size()); - for (unsigned int i = 0; i < config_.image_names.size(); ++i) { - printf(" %d: \"%s\"\n", i, config_.image_names[i].c_str()); - } -- printf("%ld images_map\n", config_.images_map.size()); -+ printf("%zu images_map\n", config_.images_map.size()); - for (StrImageConfigMap::iterator it = config_.images_map.begin(); - it != config_.images_map.end(); - ++it) { -@@ -114,7 +114,7 @@ - it->second.data.tag, - it->second.data.format); - } -- printf("%ld screens_map\n", config_.screens_map.size()); -+ printf("%zu screens_map\n", config_.screens_map.size()); - for (StrScreenConfigMap::iterator it = config_.screens_map.begin(); - it != config_.screens_map.end(); - ++it) { -@@ -591,7 +591,7 @@ - current_filled += sizeof(it->second.data); - current_offset += sizeof(it->second.data); - if (debug_) -- printf("I1: current offset is 0x%08x (len %ld)\n", -+ printf("I1: current offset is 0x%08x (len %zu)\n", - current_offset, it->second.compressed_content.length()); - std::copy(it->second.compressed_content.begin(), - it->second.compressed_content.end(), -@@ -603,7 +603,7 @@ - current_offset = config_.header.locale_string_offset; - current_filled = bmpblock_.begin() + current_offset; - if (debug_) -- printf("locale_names: offset 0x%08x (len %ld)\n", -+ printf("locale_names: offset 0x%08x (len %zu)\n", - current_offset, config_.locale_names.size()); - std::copy(config_.locale_names.begin(), - config_.locale_names.end(), diff --git a/vboot-utils-cflags.patch b/vboot-utils-cflags.patch index 64ccf38..32794e2 100644 --- a/vboot-utils-cflags.patch +++ b/vboot-utils-cflags.patch @@ -1,12 +1,11 @@ -diff -up vboot-utils-20130222gite6cf2c2/Makefile.cflags vboot-utils-20130222gite6cf2c2/Makefile ---- vboot-utils-20130222gite6cf2c2/Makefile.cflags 2013-03-07 13:11:00.697225786 -0500 -+++ vboot-utils-20130222gite6cf2c2/Makefile 2013-03-07 13:11:49.488465926 -0500 -@@ -124,7 +124,7 @@ CFLAGS ?= ${COMMON_FLAGS} \ +--- vboot-utils-a1c5f7c/Makefile.orig 2017-06-04 13:24:39.666009720 +0100 ++++ vboot-utils-a1c5f7c/Makefile 2017-06-04 13:25:23.960977143 +0100 +@@ -158,7 +158,7 @@ else # FIRMWARE_ARCH not defined; assuming local compile. CC ?= gcc --CFLAGS += -DCHROMEOS_ENVIRONMENT -Wall -Werror # HEY: always want last two? -+CFLAGS += $(COMMON_FLAGS) -DCHROMEOS_ENVIRONMENT -Wall -Werror # HEY: always want last two? +-CFLAGS += -DCHROMEOS_ENVIRONMENT -Wall ${WERROR} ${DEBUG_FLAGS} ++CFLAGS += $(COMMON_FLAGS) -DCHROMEOS_ENVIRONMENT -Wall ${WERROR} ${DEBUG_FLAGS} endif - ifneq (${DEBUG},) + ifneq (${CUSTOM_MUSIC},) diff --git a/vboot-utils-pthread.patch b/vboot-utils-pthread.patch deleted file mode 100644 index a8e77fd..0000000 --- a/vboot-utils-pthread.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up vboot-utils-20130222gite6cf2c2/Makefile.pthread vboot-utils-20130222gite6cf2c2/Makefile ---- vboot-utils-20130222gite6cf2c2/Makefile.pthread 2013-03-07 17:55:02.920179806 -0500 -+++ vboot-utils-20130222gite6cf2c2/Makefile 2013-03-07 17:55:06.360237213 -0500 -@@ -861,7 +861,7 @@ ${BUILD}/tests/vboot_common2_tests: LDLI - ${BUILD}/tests/vboot_common3_tests: LDLIBS += ${CRYPTO_LIBS} - - ${BUILD}/utility/bmpblk_utility: LD = ${CXX} --${BUILD}/utility/bmpblk_utility: LDLIBS = -llzma -lyaml -+${BUILD}/utility/bmpblk_utility: LDLIBS = -llzma -lyaml -lpthread - - BMPBLK_UTILITY_DEPS = \ - ${BUILD}/utility/bmpblk_util.o \ diff --git a/vboot-utils-strncat.patch b/vboot-utils-strncat.patch deleted file mode 100644 index a0d467e..0000000 --- a/vboot-utils-strncat.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -up vboot-utils-20130222gite6cf2c2/cgpt/cgpt_add.c.werror vboot-utils-20130222gite6cf2c2/cgpt/cgpt_add.c ---- vboot-utils-20130222gite6cf2c2/cgpt/cgpt_add.c.werror 2013-03-07 15:57:45.797727161 -0500 -+++ vboot-utils-20130222gite6cf2c2/cgpt/cgpt_add.c 2013-03-07 16:07:02.987337266 -0500 -@@ -16,49 +16,49 @@ static const char* DumpCgptAddParams(con - - buf[0] = 0; - snprintf(tmp, sizeof(tmp), "-i %d ", params->partition); -- strncat(buf, tmp, sizeof(buf)); -+ strncat(buf, tmp, sizeof(tmp)); - if (params->label) { - snprintf(tmp, sizeof(tmp), "-l %s ", params->label); -- strncat(buf, tmp, sizeof(buf)); -+ strncat(buf, tmp, sizeof(tmp)); - } - if (params->set_begin) { - snprintf(tmp, sizeof(tmp), "-b %llu ", (unsigned long long)params->begin); -- strncat(buf, tmp, sizeof(buf)); -+ strncat(buf, tmp, sizeof(tmp)); - } - if (params->set_size) { - snprintf(tmp, sizeof(tmp), "-s %llu ", (unsigned long long)params->size); -- strncat(buf, tmp, sizeof(buf)); -+ strncat(buf, tmp, sizeof(tmp)); - } - if (params->set_type) { - GuidToStr(¶ms->type_guid, tmp, sizeof(tmp)); -- strncat(buf, "-t ", sizeof(buf)); -- strncat(buf, tmp, sizeof(buf)); -- strncat(buf, " ", sizeof(buf)); -+ strncat(buf, "-t ", sizeof(tmp)); -+ strncat(buf, tmp, sizeof(tmp)); -+ strncat(buf, " ", sizeof(tmp)); - } - if (params->set_unique) { - GuidToStr(¶ms->unique_guid, tmp, sizeof(tmp)); -- strncat(buf, "-u ", sizeof(buf)); -- strncat(buf, tmp, sizeof(buf)); -- strncat(buf, " ", sizeof(buf)); -+ strncat(buf, "-u ", sizeof(tmp)); -+ strncat(buf, tmp, sizeof(tmp)); -+ strncat(buf, " ", sizeof(tmp)); - } - if (params->set_successful) { - snprintf(tmp, sizeof(tmp), "-S %d ", params->successful); -- strncat(buf, tmp, sizeof(buf)); -+ strncat(buf, tmp, sizeof(tmp)); - } - if (params->set_tries) { - snprintf(tmp, sizeof(tmp), "-T %d ", params->tries); -- strncat(buf, tmp, sizeof(buf)); -+ strncat(buf, tmp, sizeof(tmp)); - } - if (params->set_priority) { - snprintf(tmp, sizeof(tmp), "-P %d ", params->priority); -- strncat(buf, tmp, sizeof(buf)); -+ strncat(buf, tmp, sizeof(tmp)); - } - if (params->set_raw) { - snprintf(tmp, sizeof(tmp), "-A 0x%x ", params->raw_value); -- strncat(buf, tmp, sizeof(buf)); -+ strncat(buf, tmp, sizeof(tmp)); - } - -- strncat(buf, "\n", sizeof(buf)); -+ strncat(buf, "\n", sizeof(tmp)); - return buf; - } - diff --git a/vboot-utils-unused.patch b/vboot-utils-unused.patch deleted file mode 100644 index fa36062..0000000 --- a/vboot-utils-unused.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up vboot-utils-20130222gite6cf2c2/host/arch/arm/lib/crossystem_arch.c.unused vboot-utils-20130222gite6cf2c2/host/arch/arm/lib/crossystem_arch.c ---- vboot-utils-20130222gite6cf2c2/host/arch/arm/lib/crossystem_arch.c.unused 2012-12-19 11:37:24.000000000 -0500 -+++ vboot-utils-20130222gite6cf2c2/host/arch/arm/lib/crossystem_arch.c 2013-03-07 16:55:13.899853426 -0500 -@@ -81,6 +81,7 @@ static int ReadFdtValue(const char *prop - char filename[FNAME_SIZE]; - FILE *file; - int data = 0; -+ size_t count; - - snprintf(filename, sizeof(filename), FDT_BASE_PATH "/%s", property); - file = fopen(filename, "rb"); -@@ -89,8 +90,12 @@ static int ReadFdtValue(const char *prop - return E_FILEOP; - } - -- fread(&data, 1, sizeof(data), file); -+ count = fread(&data, 1, sizeof(data), file); - fclose(file); -+ if (count < 0) { -+ fprintf(stderr, "Unable to read FDT property %s\n", property); -+ return E_FILEOP; -+ } - - if (value) - *value = ntohl(data); /* FDT is network byte order */ diff --git a/vboot-utils.spec b/vboot-utils.spec index 1f838dd..950caaa 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -1,37 +1,29 @@ -Name: vboot-utils -Version: 20130222gite6cf2c2 -Release: 10%{?dist} -Summary: Verified Boot Utility from Chromium OS -ExclusiveArch: %{arm} %{ix86} x86_64 +%define gitshort a1c5f7c -Group: Applications/System +Name: vboot-utils +Version: 20170302 +Release: 1.git%{gitshort}%{?dist} +Summary: Verified Boot Utility from Chromium OS License: BSD +URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference + +ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 + # The source for this package was pulled from upstream's vcs. Use the # 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-20130222gite6cf2c2/ e6cf2c2 | xz > vboot-utils-20130222gite6c.tar.xz -URL: http://gitrw.chromium.org/gitweb/?p=chromiumos/platform/vboot_reference.git -Source0: %{name}-%{version}.tar.xz - +# git archive --format=tar --prefix=vboot-utils-a1c5f7c/ a1c5f7c | xz > vboot-utils-a1c5f7c.tar.xz +Source0: %{name}-%{gitshort}.tar.xz ## Patch0 disabled static building. Patch0: vboot-utils-00-disable-static-linking.patch -## Patch1 fixes printf formating issues that break the build. -## http://code.google.com/p/chromium-os/issues/detail?id=37804 -Patch1: vboot-utils-01-bmpblk_utility-fix-printf.patch - #make sure get the rpmbuild flags passed in -Patch2: vboot-utils-cflags.patch - -# some fixes for picker compile -Patch3: vboot-utils-strncat.patch -Patch4: vboot-utils-unused.patch -Patch5: vboot-utils-pthread.patch +Patch1: vboot-utils-cflags.patch -BuildRequires: openssl-devel +BuildRequires: compat-openssl10-devel BuildRequires: trousers-devel BuildRequires: libyaml-devel BuildRequires: xz-devel @@ -47,18 +39,14 @@ Pack and sign the kernel, manage gpt partitions. %prep -%setup -q -%patch0 -p0 -b .nostatic -%patch1 -p0 -b .fixprintf -%patch2 -p1 -b .cflags -%patch3 -p1 -b .strncat -%patch4 -p1 -b .unused -%patch5 -p1 -b .pthread +%setup -q -n %{name}-%{gitshort} +%patch0 -p1 -b .nostatic +%patch1 -p1 -b .cflags %build -%ifarch %{arm} +%ifarch %{arm} aarch64 %global ARCH arm %endif @@ -74,10 +62,12 @@ Pack and sign the kernel, manage gpt partitions. make V=1 ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS" - %install -make install V=1 DESTDIR=%{buildroot}%{_bindir} ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS" +make install V=1 DESTDIR=%{buildroot}/usr ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS" +# Remove unneeded build artifacts +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. @@ -86,10 +76,15 @@ make runtests || true %files +%license LICENSE +%doc README %{_bindir}/* -%doc LICENSE README %changelog +* Sun Jun 4 2017 Peter Robinson 20170302-1.gita1c5f7c +- Move to newer upstream snapshot needed for some devices +- Spec cleanups + * Sat Feb 11 2017 Fedora Release Engineering - 20130222gite6cf2c2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild @@ -111,7 +106,7 @@ make runtests || true * Sun Aug 04 2013 Fedora Release Engineering - 20130222gite6cf2c2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Thu Apr 07 2013 Jon Disnard 20130222gite6cf2c2-3 +* Thu Apr 04 2013 Jon Disnard 20130222gite6cf2c2-3 - Clean up spec file - Honor rpmbuild CFLAGS - Fix strncat arguments in cgpt/cgpt_add.c @@ -144,4 +139,3 @@ make runtests || true - Patch0 prevents static building. - Patch1 fixes minor printf formating bug in c++ code. - tests disabled as they do not work in mock chroot. - From 95e089444959e87f4e1eab6ac13fccb4f7a158e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:11:53 +0000 Subject: [PATCH 06/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 950caaa..07ab0f4 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20170302 -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 @@ -81,6 +81,9 @@ make runtests || true %{_bindir}/* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 20170302-2.gita1c5f7c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sun Jun 4 2017 Peter Robinson 20170302-1.gita1c5f7c - Move to newer upstream snapshot needed for some devices - Spec cleanups From d729362386ef39c7aeda1377daba3fbc2a5a3f6a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:58:57 +0000 Subject: [PATCH 07/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- vboot-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 07ab0f4..ebf9f19 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20170302 -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 @@ -81,6 +81,9 @@ make runtests || true %{_bindir}/* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 20170302-3.gita1c5f7c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 20170302-2.gita1c5f7c - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 836ed467768e88372ff03177770328a7a63b1d37 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:06:28 +0100 Subject: [PATCH 08/42] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- vboot-utils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index ebf9f19..5883307 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20170302 -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 @@ -81,6 +81,9 @@ make runtests || true %{_bindir}/* %changelog +* Fri Feb 09 2018 Igor Gnatenko - 20170302-4.gita1c5f7c +- Escape macros in %%changelog + * Thu Aug 03 2017 Fedora Release Engineering - 20170302-3.gita1c5f7c - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild @@ -119,7 +122,7 @@ make runtests || true * Sat Feb 23 2013 Jon Disnard 20130222gite6cf2c2-2 - Put back wcohen's fixes for i686 builds. -- Put back the patch to fix bmpblk_utility.cc printf formating %ld -> %zu +- Put back the patch to fix bmpblk_utility.cc printf formating %%ld -> %%zu - Put back BR for gcc-c++ & libstdc++ * Fri Feb 22 2013 Jon Disnard 20130222gite6cf2c2-1 From fe8cd89bdc714f9c986e0a4cde54061bc94da09c Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Sun, 18 Mar 2018 14:39:46 +0100 Subject: [PATCH 09/42] Update Python 2 dependency declarations to new packaging standards --- vboot-utils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vboot-utils.spec b/vboot-utils.spec index 5883307..bb0cf3b 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -2,7 +2,7 @@ Name: vboot-utils Version: 20170302 -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 @@ -31,7 +31,7 @@ BuildRequires: libuuid-devel # for the test scripts -BuildRequires: python +BuildRequires: python2 %description Verified boot is a collection of utilities helpful for chromebook computer. @@ -81,6 +81,10 @@ make runtests || true %{_bindir}/* %changelog +* Sun Mar 18 2018 Iryna Shcherbina - 20170302-5.gita1c5f7c +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Feb 09 2018 Igor Gnatenko - 20170302-4.gita1c5f7c - Escape macros in %%changelog From 08eb53027f1301b0e074030d2ea2d8f49b0aa3ae Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 4 Jun 2018 05:39:03 +0100 Subject: [PATCH 10/42] Update to upstream 2cc35b0 for new functionality and openssl 1.1 --- sources | 2 +- vboot-utils.spec | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sources b/sources index 734ab31..55f72de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vboot-utils-a1c5f7c.tar.xz) = 0324e9ab7578073893a35b461f4f9ebd5e1700eb39d342398981855597e01ad085acea4ca3e05c4a68801f646ce68fb86ab665c0f05ab3a169158020c09551b9 +SHA512 (vboot-utils-2cc35b0.tar.xz) = 73d4e8937749bbd07ec8b281b5be3ed7bc69457646fb1bd1a172382ce030e7069ccd562b8f01e434b577573b06606c045fd47c52846acfdbb72ae20f92abe50e diff --git a/vboot-utils.spec b/vboot-utils.spec index bb0cf3b..d77cec8 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -1,8 +1,9 @@ -%define gitshort a1c5f7c +%define _default_patch_fuzz 2 +%define gitshort 2cc35b0 Name: vboot-utils -Version: 20170302 -Release: 5.git%{gitshort}%{?dist} +Version: 20180531 +Release: 1.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference @@ -22,14 +23,12 @@ Patch0: vboot-utils-00-disable-static-linking.patch #make sure get the rpmbuild flags passed in Patch1: vboot-utils-cflags.patch - -BuildRequires: compat-openssl10-devel +BuildRequires: openssl-devel BuildRequires: trousers-devel BuildRequires: libyaml-devel BuildRequires: xz-devel BuildRequires: libuuid-devel - # for the test scripts BuildRequires: python2 @@ -81,6 +80,9 @@ make runtests || true %{_bindir}/* %changelog +* Sun Jun 3 2018 Peter Robinson 20180531-1.2cc35b0 +- New upstream snapshot + * Sun Mar 18 2018 Iryna Shcherbina - 20170302-5.gita1c5f7c - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 0dcdc2c8eb8e06501fb637a4392f871983387a80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:26:07 +0000 Subject: [PATCH 11/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 d77cec8..2fcc36e 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -3,7 +3,7 @@ Name: vboot-utils Version: 20180531 -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 @@ -80,6 +80,9 @@ make runtests || true %{_bindir}/* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 20180531-2.git2cc35b0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Jun 3 2018 Peter Robinson 20180531-1.2cc35b0 - New upstream snapshot From 259cd8f02eaf1a63e6ffea55367c33ac83b6fb5e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 24 Jul 2018 16:00:21 +0200 Subject: [PATCH 12/42] Add missing BuildRequires on gcc make: cc: Command not found References: https://bugzilla.redhat.com/show_bug.cgi?id=1606637 Signed-off-by: Igor Gnatenko --- vboot-utils.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vboot-utils.spec b/vboot-utils.spec index 2fcc36e..d4bfbcd 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -23,6 +23,7 @@ Patch0: vboot-utils-00-disable-static-linking.patch #make sure get the rpmbuild flags passed in Patch1: vboot-utils-cflags.patch +BuildRequires: gcc BuildRequires: openssl-devel BuildRequires: trousers-devel BuildRequires: libyaml-devel From 271ee0a0460559fe09f128c48788501976d8661e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 25 Jul 2018 11:51:08 +0200 Subject: [PATCH 13/42] add BR: gcc-c++ Signed-off-by: Igor Gnatenko --- vboot-utils.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vboot-utils.spec b/vboot-utils.spec index d4bfbcd..b395b3e 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -24,6 +24,7 @@ Patch0: vboot-utils-00-disable-static-linking.patch Patch1: vboot-utils-cflags.patch BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: openssl-devel BuildRequires: trousers-devel BuildRequires: libyaml-devel From 999d2c02f70cbc9ec7705ede8a81594062ff3e6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:07:27 +0000 Subject: [PATCH 14/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 b395b3e..6432ea3 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -3,7 +3,7 @@ Name: vboot-utils Version: 20180531 -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 @@ -82,6 +82,9 @@ make runtests || true %{_bindir}/* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 20180531-3.git2cc35b0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 20180531-2.git2cc35b0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 10a8ce4b774dba55e1090c0c88a87fe876379f12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:49:05 +0000 Subject: [PATCH 15/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 6432ea3..4a111fb 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -3,7 +3,7 @@ Name: vboot-utils Version: 20180531 -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 @@ -82,6 +82,9 @@ make runtests || true %{_bindir}/* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 20180531-4.git2cc35b0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 20180531-3.git2cc35b0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b29dd9ab7fee9474e4c95a1b4552486beaf43de7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Aug 2019 16:47:51 +0000 Subject: [PATCH 16/42] vboot-utils fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676185 --- .gitignore | 1 - dead.package | 1 + sources | 1 - vboot-utils-00-disable-static-linking.patch | 42 ----- vboot-utils-cflags.patch | 11 -- vboot-utils.spec | 167 -------------------- 6 files changed, 1 insertion(+), 222 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 vboot-utils-00-disable-static-linking.patch delete mode 100644 vboot-utils-cflags.patch delete mode 100644 vboot-utils.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 0a22629..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/vboot-utils-*.tar.xz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..c379f8f --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +vboot-utils fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676185 diff --git a/sources b/sources deleted file mode 100644 index 55f72de..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (vboot-utils-2cc35b0.tar.xz) = 73d4e8937749bbd07ec8b281b5be3ed7bc69457646fb1bd1a172382ce030e7069ccd562b8f01e434b577573b06606c045fd47c52846acfdbb72ae20f92abe50e diff --git a/vboot-utils-00-disable-static-linking.patch b/vboot-utils-00-disable-static-linking.patch deleted file mode 100644 index 4d02711..0000000 --- a/vboot-utils-00-disable-static-linking.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- vboot-utils-a1c5f7c/Makefile.orig 2017-06-04 14:06:10.707762796 +0100 -+++ vboot-utils-a1c5f7c/Makefile 2017-06-04 14:07:04.347718848 +0100 -@@ -227,12 +227,6 @@ - CXX ?= g++ - PKG_CONFIG ?= pkg-config - --# Static? --ifneq (${STATIC},) --LDFLAGS += -static --PKG_CONFIG += --static --endif -- - # Determine QEMU architecture needed, if any - ifeq (${ARCH},${HOST_ARCH}) - # Same architecture; no need for QEMU -@@ -999,7 +993,6 @@ - # Link tests for external repos - ${BUILD}/host/linktest/extern: ${HOSTLIB} - ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB} --${BUILD}/host/linktest/extern: LDLIBS += -static - TEST_OBJS += ${BUILD}/host/linktest/extern.o - - .PHONY: hostlib -@@ -1090,9 +1083,6 @@ - ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTILLIB} - ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB} - --# Utilities for auto-update toolkits must be statically linked. --${UTIL_BINS_STATIC}: LDFLAGS += -static -- - - .PHONY: utils - utils: ${UTIL_BINS} ${UTIL_SCRIPTS} -@@ -1124,7 +1114,7 @@ - - ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB} - @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" -- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS} -+ ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} - - ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS} ${FWLIB20} - ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB20} ${UTILBDB} diff --git a/vboot-utils-cflags.patch b/vboot-utils-cflags.patch deleted file mode 100644 index 32794e2..0000000 --- a/vboot-utils-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vboot-utils-a1c5f7c/Makefile.orig 2017-06-04 13:24:39.666009720 +0100 -+++ vboot-utils-a1c5f7c/Makefile 2017-06-04 13:25:23.960977143 +0100 -@@ -158,7 +158,7 @@ - else - # FIRMWARE_ARCH not defined; assuming local compile. - CC ?= gcc --CFLAGS += -DCHROMEOS_ENVIRONMENT -Wall ${WERROR} ${DEBUG_FLAGS} -+CFLAGS += $(COMMON_FLAGS) -DCHROMEOS_ENVIRONMENT -Wall ${WERROR} ${DEBUG_FLAGS} - endif - - ifneq (${CUSTOM_MUSIC},) diff --git a/vboot-utils.spec b/vboot-utils.spec deleted file mode 100644 index 4a111fb..0000000 --- a/vboot-utils.spec +++ /dev/null @@ -1,167 +0,0 @@ -%define _default_patch_fuzz 2 -%define gitshort 2cc35b0 - -Name: vboot-utils -Version: 20180531 -Release: 4.git%{gitshort}%{?dist} -Summary: Verified Boot Utility from Chromium OS -License: BSD -URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference - -ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - -# The source for this package was pulled from upstream's vcs. Use the -# 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 -Source0: %{name}-%{gitshort}.tar.xz - -## Patch0 disabled static building. -Patch0: vboot-utils-00-disable-static-linking.patch - -#make sure get the rpmbuild flags passed in -Patch1: vboot-utils-cflags.patch - -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: openssl-devel -BuildRequires: trousers-devel -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 .nostatic -%patch1 -p1 -b .cflags - - -%build - -%ifarch %{arm} aarch64 -%global ARCH arm -%endif - -%ifarch x86_64 -%global ARCH x86_64 -%endif - -%ifarch i686 -%global ARCH i386 -%endif - - -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" - -# Remove unneeded build artifacts -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 -%doc README -%{_bindir}/* - -%changelog -* Sat Jul 27 2019 Fedora Release Engineering - 20180531-4.git2cc35b0 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 20180531-3.git2cc35b0 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 20180531-2.git2cc35b0 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Jun 3 2018 Peter Robinson 20180531-1.2cc35b0 -- New upstream snapshot - -* Sun Mar 18 2018 Iryna Shcherbina - 20170302-5.gita1c5f7c -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Feb 09 2018 Igor Gnatenko - 20170302-4.gita1c5f7c -- Escape macros in %%changelog - -* Thu Aug 03 2017 Fedora Release Engineering - 20170302-3.gita1c5f7c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 20170302-2.gita1c5f7c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sun Jun 4 2017 Peter Robinson 20170302-1.gita1c5f7c -- Move to newer upstream snapshot needed for some devices -- Spec cleanups - -* Sat Feb 11 2017 Fedora Release Engineering - 20130222gite6cf2c2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 20130222gite6cf2c2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 20130222gite6cf2c2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 20130222gite6cf2c2-7 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Aug 18 2014 Fedora Release Engineering - 20130222gite6cf2c2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 20130222gite6cf2c2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 20130222gite6cf2c2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Apr 04 2013 Jon Disnard 20130222gite6cf2c2-3 -- Clean up spec file -- Honor rpmbuild CFLAGS -- Fix strncat arguments in cgpt/cgpt_add.c - -* Sat Feb 23 2013 Jon Disnard 20130222gite6cf2c2-2 -- Put back wcohen's fixes for i686 builds. -- Put back the patch to fix bmpblk_utility.cc printf formating %%ld -> %%zu -- Put back BR for gcc-c++ & libstdc++ - -* Fri Feb 22 2013 Jon Disnard 20130222gite6cf2c2-1 -- Pull upstream git -- Adjust ifarch conditionals to follow upstream changes in Makefile. -- Use XZ instead of BZIP2 for source archive, smaller SRPM size. -- Upstream fixed bug, so removing CC printf formating patch. -- Refactor patch that disabled static building for new Makefile. -- Enable test scripts again, but ignore failures (for mock builds). -- Remove BuildRequires for gcc-c++ & libstdc++, removed upstream. - -* Tue Feb 5 2013 William Cohen 20130129git68f54d4-4 -- Correct logic for setting 32-bit/64-bit x86. - -* Tue Feb 5 2013 William Cohen 20130129git68f54d4-3 -- Disable smp build because of problem with make dependencies - -* Mon Feb 4 2013 William Cohen 20130129git68f54d4-2 -- spec file clean up. - -* Sat Jan 5 2013 Jon Disnard 20130129git68f54d4-1 -- Inception -- Patch0 prevents static building. -- Patch1 fixes minor printf formating bug in c++ code. -- tests disabled as they do not work in mock chroot. From 8dd5d08cbe869771ad12bbaa5aad849df8bf0839 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Mon, 26 Aug 2019 13:56:43 +0200 Subject: [PATCH 17/42] Revert "vboot-utils fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676185" This reverts commit b29dd9ab7fee9474e4c95a1b4552486beaf43de7. Unretirement request: https://pagure.io/releng/issue/8688 --- .gitignore | 1 + dead.package | 1 - sources | 1 + vboot-utils-00-disable-static-linking.patch | 42 +++++ vboot-utils-cflags.patch | 11 ++ vboot-utils.spec | 167 ++++++++++++++++++++ 6 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100644 sources create mode 100644 vboot-utils-00-disable-static-linking.patch create mode 100644 vboot-utils-cflags.patch create mode 100644 vboot-utils.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0a22629 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/vboot-utils-*.tar.xz diff --git a/dead.package b/dead.package deleted file mode 100644 index c379f8f..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -vboot-utils fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1676185 diff --git a/sources b/sources new file mode 100644 index 0000000..55f72de --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (vboot-utils-2cc35b0.tar.xz) = 73d4e8937749bbd07ec8b281b5be3ed7bc69457646fb1bd1a172382ce030e7069ccd562b8f01e434b577573b06606c045fd47c52846acfdbb72ae20f92abe50e diff --git a/vboot-utils-00-disable-static-linking.patch b/vboot-utils-00-disable-static-linking.patch new file mode 100644 index 0000000..4d02711 --- /dev/null +++ b/vboot-utils-00-disable-static-linking.patch @@ -0,0 +1,42 @@ +--- vboot-utils-a1c5f7c/Makefile.orig 2017-06-04 14:06:10.707762796 +0100 ++++ vboot-utils-a1c5f7c/Makefile 2017-06-04 14:07:04.347718848 +0100 +@@ -227,12 +227,6 @@ + CXX ?= g++ + PKG_CONFIG ?= pkg-config + +-# Static? +-ifneq (${STATIC},) +-LDFLAGS += -static +-PKG_CONFIG += --static +-endif +- + # Determine QEMU architecture needed, if any + ifeq (${ARCH},${HOST_ARCH}) + # Same architecture; no need for QEMU +@@ -999,7 +993,6 @@ + # Link tests for external repos + ${BUILD}/host/linktest/extern: ${HOSTLIB} + ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB} +-${BUILD}/host/linktest/extern: LDLIBS += -static + TEST_OBJS += ${BUILD}/host/linktest/extern.o + + .PHONY: hostlib +@@ -1090,9 +1083,6 @@ + ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTILLIB} + ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB} + +-# Utilities for auto-update toolkits must be statically linked. +-${UTIL_BINS_STATIC}: LDFLAGS += -static +- + + .PHONY: utils + utils: ${UTIL_BINS} ${UTIL_SCRIPTS} +@@ -1124,7 +1114,7 @@ + + ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB} + @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" +- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS} ++ ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} + + ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS} ${FWLIB20} + ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB20} ${UTILBDB} diff --git a/vboot-utils-cflags.patch b/vboot-utils-cflags.patch new file mode 100644 index 0000000..32794e2 --- /dev/null +++ b/vboot-utils-cflags.patch @@ -0,0 +1,11 @@ +--- vboot-utils-a1c5f7c/Makefile.orig 2017-06-04 13:24:39.666009720 +0100 ++++ vboot-utils-a1c5f7c/Makefile 2017-06-04 13:25:23.960977143 +0100 +@@ -158,7 +158,7 @@ + else + # FIRMWARE_ARCH not defined; assuming local compile. + CC ?= gcc +-CFLAGS += -DCHROMEOS_ENVIRONMENT -Wall ${WERROR} ${DEBUG_FLAGS} ++CFLAGS += $(COMMON_FLAGS) -DCHROMEOS_ENVIRONMENT -Wall ${WERROR} ${DEBUG_FLAGS} + endif + + ifneq (${CUSTOM_MUSIC},) diff --git a/vboot-utils.spec b/vboot-utils.spec new file mode 100644 index 0000000..4a111fb --- /dev/null +++ b/vboot-utils.spec @@ -0,0 +1,167 @@ +%define _default_patch_fuzz 2 +%define gitshort 2cc35b0 + +Name: vboot-utils +Version: 20180531 +Release: 4.git%{gitshort}%{?dist} +Summary: Verified Boot Utility from Chromium OS +License: BSD +URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference + +ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 + +# The source for this package was pulled from upstream's vcs. Use the +# 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 +Source0: %{name}-%{gitshort}.tar.xz + +## Patch0 disabled static building. +Patch0: vboot-utils-00-disable-static-linking.patch + +#make sure get the rpmbuild flags passed in +Patch1: vboot-utils-cflags.patch + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: openssl-devel +BuildRequires: trousers-devel +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 .nostatic +%patch1 -p1 -b .cflags + + +%build + +%ifarch %{arm} aarch64 +%global ARCH arm +%endif + +%ifarch x86_64 +%global ARCH x86_64 +%endif + +%ifarch i686 +%global ARCH i386 +%endif + + +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" + +# Remove unneeded build artifacts +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 +%doc README +%{_bindir}/* + +%changelog +* Sat Jul 27 2019 Fedora Release Engineering - 20180531-4.git2cc35b0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 20180531-3.git2cc35b0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 20180531-2.git2cc35b0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Jun 3 2018 Peter Robinson 20180531-1.2cc35b0 +- New upstream snapshot + +* Sun Mar 18 2018 Iryna Shcherbina - 20170302-5.gita1c5f7c +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Feb 09 2018 Igor Gnatenko - 20170302-4.gita1c5f7c +- Escape macros in %%changelog + +* Thu Aug 03 2017 Fedora Release Engineering - 20170302-3.gita1c5f7c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 20170302-2.gita1c5f7c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sun Jun 4 2017 Peter Robinson 20170302-1.gita1c5f7c +- Move to newer upstream snapshot needed for some devices +- Spec cleanups + +* Sat Feb 11 2017 Fedora Release Engineering - 20130222gite6cf2c2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 20130222gite6cf2c2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 20130222gite6cf2c2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 20130222gite6cf2c2-7 +- Rebuilt for GCC 5 C++11 ABI change + +* Mon Aug 18 2014 Fedora Release Engineering - 20130222gite6cf2c2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 20130222gite6cf2c2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 20130222gite6cf2c2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Apr 04 2013 Jon Disnard 20130222gite6cf2c2-3 +- Clean up spec file +- Honor rpmbuild CFLAGS +- Fix strncat arguments in cgpt/cgpt_add.c + +* Sat Feb 23 2013 Jon Disnard 20130222gite6cf2c2-2 +- Put back wcohen's fixes for i686 builds. +- Put back the patch to fix bmpblk_utility.cc printf formating %%ld -> %%zu +- Put back BR for gcc-c++ & libstdc++ + +* Fri Feb 22 2013 Jon Disnard 20130222gite6cf2c2-1 +- Pull upstream git +- Adjust ifarch conditionals to follow upstream changes in Makefile. +- Use XZ instead of BZIP2 for source archive, smaller SRPM size. +- Upstream fixed bug, so removing CC printf formating patch. +- Refactor patch that disabled static building for new Makefile. +- Enable test scripts again, but ignore failures (for mock builds). +- Remove BuildRequires for gcc-c++ & libstdc++, removed upstream. + +* Tue Feb 5 2013 William Cohen 20130129git68f54d4-4 +- Correct logic for setting 32-bit/64-bit x86. + +* Tue Feb 5 2013 William Cohen 20130129git68f54d4-3 +- Disable smp build because of problem with make dependencies + +* Mon Feb 4 2013 William Cohen 20130129git68f54d4-2 +- spec file clean up. + +* Sat Jan 5 2013 Jon Disnard 20130129git68f54d4-1 +- Inception +- Patch0 prevents static building. +- Patch1 fixes minor printf formating bug in c++ code. +- tests disabled as they do not work in mock chroot. From f5ff76ceeaa393fadf602dbf9e4a6195eccaf12f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 26 Aug 2019 13:47:10 +0100 Subject: [PATCH 18/42] upstream 595108c0 snapshot --- sources | 2 +- vboot-utils-00-disable-static-linking.patch | 42 --------------------- vboot-utils-cflags.patch | 11 ------ vboot-utils.spec | 24 +++++------- 4 files changed, 10 insertions(+), 69 deletions(-) delete mode 100644 vboot-utils-00-disable-static-linking.patch delete mode 100644 vboot-utils-cflags.patch diff --git a/sources b/sources index 55f72de..a8140d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vboot-utils-2cc35b0.tar.xz) = 73d4e8937749bbd07ec8b281b5be3ed7bc69457646fb1bd1a172382ce030e7069ccd562b8f01e434b577573b06606c045fd47c52846acfdbb72ae20f92abe50e +SHA512 (vboot-utils-595108c0.tar.xz) = ee31b77920a8df706ec85edfbfbafc649d91645d8bf0e75f50ca0858006285b1f02b19b353161c5f779ecb499d263ffacfdf178742aad295d6f74fc87909cd56 diff --git a/vboot-utils-00-disable-static-linking.patch b/vboot-utils-00-disable-static-linking.patch deleted file mode 100644 index 4d02711..0000000 --- a/vboot-utils-00-disable-static-linking.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- vboot-utils-a1c5f7c/Makefile.orig 2017-06-04 14:06:10.707762796 +0100 -+++ vboot-utils-a1c5f7c/Makefile 2017-06-04 14:07:04.347718848 +0100 -@@ -227,12 +227,6 @@ - CXX ?= g++ - PKG_CONFIG ?= pkg-config - --# Static? --ifneq (${STATIC},) --LDFLAGS += -static --PKG_CONFIG += --static --endif -- - # Determine QEMU architecture needed, if any - ifeq (${ARCH},${HOST_ARCH}) - # Same architecture; no need for QEMU -@@ -999,7 +993,6 @@ - # Link tests for external repos - ${BUILD}/host/linktest/extern: ${HOSTLIB} - ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB} --${BUILD}/host/linktest/extern: LDLIBS += -static - TEST_OBJS += ${BUILD}/host/linktest/extern.o - - .PHONY: hostlib -@@ -1090,9 +1083,6 @@ - ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTILLIB} - ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB} - --# Utilities for auto-update toolkits must be statically linked. --${UTIL_BINS_STATIC}: LDFLAGS += -static -- - - .PHONY: utils - utils: ${UTIL_BINS} ${UTIL_SCRIPTS} -@@ -1124,7 +1114,7 @@ - - ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB} - @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" -- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS} -+ ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} - - ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS} ${FWLIB20} - ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB20} ${UTILBDB} diff --git a/vboot-utils-cflags.patch b/vboot-utils-cflags.patch deleted file mode 100644 index 32794e2..0000000 --- a/vboot-utils-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vboot-utils-a1c5f7c/Makefile.orig 2017-06-04 13:24:39.666009720 +0100 -+++ vboot-utils-a1c5f7c/Makefile 2017-06-04 13:25:23.960977143 +0100 -@@ -158,7 +158,7 @@ - else - # FIRMWARE_ARCH not defined; assuming local compile. - CC ?= gcc --CFLAGS += -DCHROMEOS_ENVIRONMENT -Wall ${WERROR} ${DEBUG_FLAGS} -+CFLAGS += $(COMMON_FLAGS) -DCHROMEOS_ENVIRONMENT -Wall ${WERROR} ${DEBUG_FLAGS} - endif - - ifneq (${CUSTOM_MUSIC},) diff --git a/vboot-utils.spec b/vboot-utils.spec index 4a111fb..43d09a4 100644 --- a/vboot-utils.spec +++ b/vboot-utils.spec @@ -1,9 +1,8 @@ -%define _default_patch_fuzz 2 -%define gitshort 2cc35b0 +%define gitshort 595108c0 Name: vboot-utils -Version: 20180531 -Release: 4.git%{gitshort}%{?dist} +Version: 20190823 +Release: 1.git%{gitshort}%{?dist} Summary: Verified Boot Utility from Chromium OS License: BSD URL: https://chromium.googlesource.com/chromiumos/platform/vboot_reference @@ -17,14 +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 -## Patch0 disabled static building. -Patch0: vboot-utils-00-disable-static-linking.patch - -#make sure get the rpmbuild flags passed in -Patch1: vboot-utils-cflags.patch - -BuildRequires: gcc -BuildRequires: gcc-c++ +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: glibc-static BuildRequires: openssl-devel BuildRequires: trousers-devel BuildRequires: libyaml-devel @@ -41,9 +35,6 @@ Pack and sign the kernel, manage gpt partitions. %prep %setup -q -n %{name}-%{gitshort} -%patch0 -p1 -b .nostatic -%patch1 -p1 -b .cflags - %build @@ -82,6 +73,9 @@ make runtests || true %{_bindir}/* %changelog +* Mon Aug 26 2019 Peter Robinson 20190823.1.git595108c0 +- Rebase to upstream 595108c0 snapshot + * Sat Jul 27 2019 Fedora Release Engineering - 20180531-4.git2cc35b0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 7ac6841013a9b5b1678baf7f90e2cd22b45b2c98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:57:53 +0000 Subject: [PATCH 19/42] - 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 20/42] 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 21/42] 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 22/42] - 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 23/42] 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 24/42] - 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 25/42] - 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 26/42] 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 27/42] - 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 28/42] - 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 29/42] - 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 30/42] 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 31/42] 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 32/42] 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 33/42] 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 34/42] 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 35/42] 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 36/42] 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 37/42] 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 38/42] 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 39/42] 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 40/42] 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 41/42] 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 42/42] 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