The package rpms/vboot-utils.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/vboot-utils.git/commit/?id=8dd5d0....
Change:
+%ifarch i686
Thanks.
Full change:
============
commit 8dd5d08cbe869771ad12bbaa5aad849df8bf0839
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Mon Aug 26 13:56:43 2019 +0200
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
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 <releng(a)fedoraproject.org> -
20180531-4.git2cc35b0
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
20180531-3.git2cc35b0
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
20180531-2.git2cc35b0
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sun Jun 3 2018 Peter Robinson <pbrobinson(a)fedoraproject.org> 20180531-1.2cc35b0
+- New upstream snapshot
+
+* Sun Mar 18 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 20170302-5.gita1c5f7c
+- Update Python 2 dependency declarations to new packaging standards
+ (See
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> -
20170302-4.gita1c5f7c
+- Escape macros in %%changelog
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
20170302-3.gita1c5f7c
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
20170302-2.gita1c5f7c
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sun Jun 4 2017 Peter Robinson <pbrobinson(a)fedoraproject.org>
20170302-1.gita1c5f7c
+- Move to newer upstream snapshot needed for some devices
+- Spec cleanups
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
20130222gite6cf2c2-10
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
20130222gite6cf2c2-9
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
20130222gite6cf2c2-8
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 20130222gite6cf2c2-7
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
20130222gite6cf2c2-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
20130222gite6cf2c2-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
20130222gite6cf2c2-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Apr 04 2013 Jon Disnard <jdisnard(a)gmail.com> 20130222gite6cf2c2-3
+- Clean up spec file
+- Honor rpmbuild CFLAGS
+- Fix strncat arguments in cgpt/cgpt_add.c
+
+* Sat Feb 23 2013 Jon Disnard <jdisnard(a)gmail.com> 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 <jdisnard(a)gmail.com> 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 <wcohen(a)redhat.c> 20130129git68f54d4-4
+- Correct logic for setting 32-bit/64-bit x86.
+
+* Tue Feb 5 2013 William Cohen <wcohen(a)redhat.c> 20130129git68f54d4-3
+- Disable smp build because of problem with make dependencies
+
+* Mon Feb 4 2013 William Cohen <wcohen(a)redhat.c> 20130129git68f54d4-2
+- spec file clean up.
+
+* Sat Jan 5 2013 Jon Disnard <jdisnard(a)gmail.com> 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.