rpms/vboot-utils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upstream 595108c0 snapshot

Browse source
This commit is contained in:
Peter Robinson 2019-08-26 13:47:10 +01:00
commit f5ff76ceea
4 changed files with 10 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sources
View file

@ -1 +1 @@
SHA512 (vboot-utils-2cc35b0.tar.xz) = 73d4e8937749bbd07ec8b281b5be3ed7bc69457646fb1bd1a172382ce030e7069ccd562b8f01e434b577573b06606c045fd47c52846acfdbb72ae20f92abe50e
SHA512 (vboot-utils-595108c0.tar.xz) = ee31b77920a8df706ec85edfbfbafc649d91645d8bf0e75f50ca0858006285b1f02b19b353161c5f779ecb499d263ffacfdf178742aad295d6f74fc87909cd56

42
vboot-utils-00-disable-static-linking.patch
View file

@ -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}

11
vboot-utils-cflags.patch
View file

@ -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},)

24
vboot-utils.spec
View file

@ -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@fedoraproject.org> 20190823.1.git595108c0
- Rebase to upstream 595108c0 snapshot
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20180531-4.git2cc35b0
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild