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=cd6201...
https://src.fedoraproject.org/cgit/rpms/vboot-utils.git/commit/?id=eec7c7...
https://src.fedoraproject.org/cgit/rpms/vboot-utils.git/commit/?id=b29dd9...
https://src.fedoraproject.org/cgit/rpms/vboot-utils.git/commit/?id=8dd5d0....
Change:
+%ifarch %{arm} aarch64
+%ifarch i686
-%ifarch i686
+%ifarch i686
Thanks.
Full change:
============
commit f5ff76ceeaa393fadf602dbf9e4a6195eccaf12f
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Mon Aug 26 13:47:10 2019 +0100
upstream 595108c0 snapshot
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 <pbrobinson(a)fedoraproject.org>
20190823.1.git595108c0
+- Rebase to upstream 595108c0 snapshot
+
* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
20180531-4.git2cc35b0
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
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.
commit b29dd9ab7fee9474e4c95a1b4552486beaf43de7
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 8 16:47:51 2019 +0000
vboot-utils fails to build from source:
https://bugzilla.redhat.com/show_bug.cgi?id=1676185
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 <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.
commit 10a8ce4b774dba55e1090c0c88a87fe876379f12
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 27 02:49:05 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
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 <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
commit 999d2c02f70cbc9ec7705ede8a81594062ff3e6d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sun Feb 3 11:07:27 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
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 <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
commit 271ee0a0460559fe09f128c48788501976d8661e
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Wed Jul 25 11:51:08 2018 +0200
add BR: gcc-c++
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
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
commit 259cd8f02eaf1a63e6ffea55367c33ac83b6fb5e
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Tue Jul 24 16:00:21 2018 +0200
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 <ignatenkobrain(a)fedoraproject.org>
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
commit 0dcdc2c8eb8e06501fb637a4392f871983387a80
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 14 08:26:07 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
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 <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
commit 08eb53027f1301b0e074030d2ea2d8f49b0aa3ae
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Mon Jun 4 05:39:03 2018 +0100
Update to upstream 2cc35b0 for new functionality and openssl 1.1
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 <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)
commit fe8cd89bdc714f9c986e0a4cde54061bc94da09c
Author: Iryna Shcherbina <shcherbina.iryna(a)gmail.com>
Date: Sun Mar 18 14:39:46 2018 +0100
Update Python 2 dependency declarations to new packaging standards
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 <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
commit 836ed467768e88372ff03177770328a7a63b1d37
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Fri Feb 9 09:06:28 2018 +0100
Escape macros in %changelog
Reference:
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
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 <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
@@ -119,7 +122,7 @@ make runtests || true
* 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 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
commit d729362386ef39c7aeda1377daba3fbc2a5a3f6a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Aug 3 09:58:57 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
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 <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
commit 95e089444959e87f4e1eab6ac13fccb4f7a158e7
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 27 21:11:53 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
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 <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
commit cd6201e4e692d0d2345dc3e5bfc9ce73db3a0fac
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Sun Jun 4 14:56:24 2017 +0100
Move to newer upstream snapshot needed for some devices, Spec cleanups
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 @@
+%define gitshort a1c5f7c
+
Name: vboot-utils
-Version: 20130222gite6cf2c2
-Release: 10%{?dist}
+Version: 20170302
+Release: 1.git%{gitshort}%{?dist}
Summary: Verified Boot Utility from Chromium OS
-ExclusiveArch: %{arm} %{ix86} x86_64
-
-Group: Applications/System
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 <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
@@ -111,7 +106,7 @@ make runtests || true
* 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 07 2013 Jon Disnard <jdisnard(a)gmail.com> 20130222gite6cf2c2-3
+* 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
@@ -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.
-
commit 1a55cffc607d5fcce0f75de6f4631e74686ab3f4
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 11 16:57:26 2017 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
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 <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
commit 3168024813f4d3948ca8161d18b86e10fc8d1094
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 5 02:34:22 2016 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
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 <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
commit 3a995cedaa776e0cd27ee2ae977433aafcc320ef
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Jun 19 01:50:54 2015 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
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 <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
commit 5063084b03d1c1b1bad20401dabfdc613f52d787
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Sat May 2 18:24:24 2015 +0200
Rebuilt for GCC 5 C++11 ABI change
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 <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
commit c90cd4fee40f2096b18b50b80cd0fcf60cc2fb70
Author: Peter Robinson <pbrobinson(a)fedoraproject.org>
Date: Mon Aug 18 07:34:01 2014 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/vboot-utils.spec b/vboot-utils.spec
index 5523e2a..c4fe2cd 100644
--- a/vboot-utils.spec
+++ b/vboot-utils.spec
@@ -1,6 +1,6 @@
Name: vboot-utils
Version: 20130222gite6cf2c2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Verified Boot Utility from Chromium OS
ExclusiveArch: %{arm} %{ix86} x86_64
@@ -90,6 +90,9 @@ make runtests || true
%doc LICENSE README
%changelog
+* 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
commit c3e1b458b1a648ebd10487b521c66450a66787bc
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Jun 7 22:19:55 2014 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/vboot-utils.spec b/vboot-utils.spec
index b5f3e57..5523e2a 100644
--- a/vboot-utils.spec
+++ b/vboot-utils.spec
@@ -1,6 +1,6 @@
Name: vboot-utils
Version: 20130222gite6cf2c2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Verified Boot Utility from Chromium OS
ExclusiveArch: %{arm} %{ix86} x86_64
@@ -90,6 +90,9 @@ make runtests || true
%doc LICENSE README
%changelog
+* 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
commit cbbf50ef27b459405ad517a35e2eac002b097f3f
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sun Aug 4 00:58:39 2013 -0500
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/vboot-utils.spec b/vboot-utils.spec
index 81f9215..b5f3e57 100644
--- a/vboot-utils.spec
+++ b/vboot-utils.spec
@@ -1,6 +1,6 @@
Name: vboot-utils
Version: 20130222gite6cf2c2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Verified Boot Utility from Chromium OS
ExclusiveArch: %{arm} %{ix86} x86_64
@@ -90,6 +90,9 @@ make runtests || true
%doc LICENSE README
%changelog
+* 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 07 2013 Jon Disnard <jdisnard(a)gmail.com> 20130222gite6cf2c2-3
- Clean up spec file
- Honor rpmbuild CFLAGS
commit eec7c70bdaa4e851ad79f1879b7989c47ced9b03
Author: Jon Disnard <jdisnard(a)gmail.com>
Date: Sun Apr 28 12:31:51 2013 -0500
initial package import
diff --git a/.gitignore b/.gitignore
index e69de29..c6cfa70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/vboot-utils-20130222gite6cf2c2.tar.xz
diff --git a/sources b/sources
index e69de29..bf8266b 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+11df5e40246ad87ac4d6f8b1de2a8edd vboot-utils-20130222gite6cf2c2.tar.xz
diff --git a/vboot-utils-00-disable-static-linking.patch
b/vboot-utils-00-disable-static-linking.patch
new file mode 100644
index 0000000..ddc3ee3
--- /dev/null
+++ b/vboot-utils-00-disable-static-linking.patch
@@ -0,0 +1,20 @@
+--- 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}
+
+-${CGPT}: LDFLAGS += -static
++#${CGPT}: LDFLAGS += -static
+ ${CGPT}: LDLIBS += -luuid
+
+ ${CGPT}: ${CGPT_OBJS} ${LIBS}
+@@ -662,7 +662,7 @@
+ ${BUILD}/utility/%: INCLUDES += -Ihost/include -Iutility/include
+
+ # 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}
diff --git a/vboot-utils-01-bmpblk_utility-fix-printf.patch
b/vboot-utils-01-bmpblk_utility-fix-printf.patch
new file mode 100644
index 0000000..f0e6bbc
--- /dev/null
+++ b/vboot-utils-01-bmpblk_utility-fix-printf.patch
@@ -0,0 +1,43 @@
+--- 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
new file mode 100644
index 0000000..64ccf38
--- /dev/null
+++ b/vboot-utils-cflags.patch
@@ -0,0 +1,12 @@
+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} \
+ 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?
+ endif
+
+ ifneq (${DEBUG},)
diff --git a/vboot-utils-pthread.patch b/vboot-utils-pthread.patch
new file mode 100644
index 0000000..a8e77fd
--- /dev/null
+++ b/vboot-utils-pthread.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..a0d467e
--- /dev/null
+++ b/vboot-utils-strncat.patch
@@ -0,0 +1,68 @@
+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
new file mode 100644
index 0000000..fa36062
--- /dev/null
+++ b/vboot-utils-unused.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 0000000..81f9215
--- /dev/null
+++ b/vboot-utils.spec
@@ -0,0 +1,126 @@
+Name: vboot-utils
+Version: 20130222gite6cf2c2
+Release: 3%{?dist}
+Summary: Verified Boot Utility from Chromium OS
+ExclusiveArch: %{arm} %{ix86} x86_64
+
+Group: Applications/System
+License: BSD
+# 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
+
+
+## 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
+
+
+BuildRequires: openssl-devel
+BuildRequires: trousers-devel
+BuildRequires: libyaml-devel
+BuildRequires: xz-devel
+BuildRequires: libuuid-devel
+
+
+# for the test scripts
+BuildRequires: python
+
+%description
+Verified boot is a collection of utilities helpful for chromebook computer.
+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
+
+
+%build
+
+%ifarch %{arm}
+%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}%{_bindir} ARCH=%{ARCH}
COMMON_FLAGS="$RPM_OPT_FLAGS"
+
+
+## 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
+%{_bindir}/*
+%doc LICENSE README
+
+%changelog
+* Thu Apr 07 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.
+