Diff vboot-utils-72_p20181229-r1 with a vboot-utils-80_p20200108

/usr/portage/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild 2020-01-13 04:39:00.000000000 +0300
1
# Copyright 1999-2019 Gentoo Authors
1
# Copyright 1999-2020 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=6
4
EAPI=7
5 5

  
6
inherit eutils toolchain-funcs
6
inherit toolchain-funcs
7 7

  
8
# This is the latest commit in the latest branch.
9
GIT_SHA1="a32c930e8c46424a3bba3c296fd78b3e60f50aeb"
8
# Can't use gitiles directly until b/19710536 is fixed.
9
# This is the name of the latest release branch.
10
#RELEASE="release-R80-12739.B"
11
# This is the latest commit in the release-R80-12739.B branch.
12
#GIT_SHA1="236bd46bfb59f0262dcb1771a108ebb5e90df578"
10 13

  
11 14
DESCRIPTION="Chrome OS verified boot tools"
12
HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot"
15
HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ https://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot"
13 16
# Can't use gitiles directly until b/19710536 is fixed.
17
#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/refs/heads/${RELEASE}.tar.gz -> ${P}.tar.gz"
14 18
#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/${GIT_SHA1}.tar.gz -> ${P}.tar.gz"
15 19
SRC_URI="mirror://gentoo/${P}.tar.xz
16 20
	https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"
......
18 22
LICENSE="BSD"
19 23
SLOT="0"
20 24
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
21
IUSE="libressl minimal static"
25
IUSE="libressl +libzip minimal static"
22 26

  
23 27
LIB_DEPEND="
24 28
	dev-libs/libyaml:=[static-libs(+)]
25 29
	app-arch/xz-utils:=[static-libs(+)]"
26 30
LIB_DEPEND_MINIMAL="
31
	elibc_musl? ( sys-libs/fts-standalone:=[static-libs(+)] )
27 32
	!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
28 33
	libressl? ( dev-libs/libressl:0=[static-libs(+)] )
29
	sys-apps/util-linux:=[static-libs(+)]
30
	dev-libs/libzip:=[static-libs(+)]"
34
	libzip? ( dev-libs/libzip:=[static-libs(+)] )
35
	sys-apps/util-linux:=[static-libs(+)]"
31 36
RDEPEND="!static? (
32 37
		${LIB_DEPEND_MINIMAL//\[static-libs(+)]}
33 38
		!minimal? ( ${LIB_DEPEND//\[static-libs(+)]} )
34
	)
35
	elibc_musl? ( sys-libs/fts-standalone )"
39
	)"
36 40
DEPEND="${RDEPEND}
37 41
	static? (
38 42
		${LIB_DEPEND_MINIMAL}
39 43
		!minimal? ( ${LIB_DEPEND} )
40 44
	)
41 45
	app-crypt/trousers"
46
BDEPEND="virtual/pkgconfig"
42 47

  
43 48
S=${WORKDIR}
44 49

  
45
src_prepare() {
46
	eapply "${FILESDIR}"/${P}-libressl.patch
50
PATCHES=(
51
	# Bug #687820
52
	"${FILESDIR}"/${PN}-80-musl-fts.patch
53
)
47 54

  
55
src_prepare() {
48 56
	default
57

  
58
	# Bug #687008
59
	if ! use libzip; then
60
		sed -e 's|^\(LIBZIP_VERSION :=\).*|\1|' -i Makefile || die
61
	fi
62

  
49 63
	sed -i \
50
		-e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \
64
		-e 's:${DESTDIR}/\(bin\|include\|${LIBDIR}\|share\):${DESTDIR}/usr/\1:g' \
51 65
		-e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \
52 66
		-e 's:${TEST_INSTALL_DIR}/bin:${TEST_INSTALL_DIR}/usr/bin:' \
53
		-e '/cgpt -D 358400/d' \
54 67
		Makefile || die
55 68
	sed -e 's:^BIN_DIR=${BUILD_DIR}/install_for_test/bin:BIN_DIR=${BUILD_DIR}/install_for_test/usr/bin:' \
56 69
		-i tests/common.sh || die
57
	sed -e "s:/mnt/host/source/src/platform/vboot_reference:${S}:" \
58
		-i tests/futility/expect_output/* || die
59 70
}
60 71

  
61 72
_emake() {
......
76 87

  
77 88
src_compile() {
78 89
	tc-export CC AR CXX PKG_CONFIG
79
	_emake TEST_BINS= all
90
	_emake FUZZ_TEST_BINS= TEST_BINS= all
80 91
}
81 92

  
82 93
src_test() {
......
84 95
}
85 96

  
86 97
src_install() {
87
	_emake DESTDIR="${ED}" install
98
	_emake DESTDIR="${ED}" install install_dev
88 99

  
89 100
	insinto /usr/share/vboot/devkeys
90 101
	doins tests/devkeys/*
91 102

  
92
	insinto /usr/include/vboot
93
	doins host/include/* \
94
		firmware/include/gpt.h \
95
		firmware/include/tlcl.h \
96
		firmware/include/tss_constants.h
97

  
98
	dolib.a build/libvboot_host.a
99

  
100 103
	dodoc README
101 104
}
Thank you!