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....
Change:
+%ifarch %{arm} aarch64
Thanks.
Full change:
============
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.
-