Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/
Date: Thu, 28 Mar 2019 05:44:45
Message-Id: 1553751381.57566503adf785f1b2bc3d90cd33161580101908.dlan@gentoo
1 commit: 57566503adf785f1b2bc3d90cd33161580101908
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 28 05:36:07 2019 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 28 05:36:21 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57566503
7
8 app-emulation/xen: drop old vulnerable
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
12
13 app-emulation/xen/Manifest | 2 -
14 app-emulation/xen/xen-4.10.2-r2.ebuild | 171 ---------------------------------
15 2 files changed, 173 deletions(-)
16
17 diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
18 index dda039512ee..22834c78b91 100644
19 --- a/app-emulation/xen/Manifest
20 +++ b/app-emulation/xen/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST xen-4.10.2-upstream-patches-2.tar.xz 37800 BLAKE2B ecf4c1a97a1d76eef925e79fd25a654695a954f81bf8a5884cd4b1007714c888d6d7e19839556c457cf49a2f20ee88d5689a0287ffd7b16487dac676b3386daf SHA512 e9212efd65827286b729b08eded4bd6deda4a9f0b72af26bf0d106a111dddd1b56e51154d3e2a2ee4b38fcf4e8a81f30ffe2a6b711b9261e50e5954447d30e60
23 -DIST xen-4.10.2.tar.gz 24697204 BLAKE2B b331d3ad8d7842446f7d2da5dd31560f636aa1408dd3cc8798dff35b868ef5a609d17e97ef4355e1e5aa825a5abc74103796f9a8015037f0a564ffcebd825722 SHA512 2e301b4d6eb106fcb52203bc1208c8fd1fc7bb5d795166c0f86e4085227050301f7daa6f21db440c47bc2ca2c7f87d9b96753cfdf3fa724e0416b5679b84c163
24 DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B ec9339d00afd4057738a78165a82dbebbab73eb561984a049daff84dfb115c0550e67796bfa775d5e5a3a4576c4ea7db408d491fe745a68c412f93a04719c58d SHA512 b3761acdb7a581d172e1e2b1e09406c4748eda3e25c81c19bb53b38e005d27e10ac64109870b47ce72372dc7b7c63ec3eca6156389c174f28ab4ad1c2b9e5634
25 DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
26 DIST xen-4.11.1-upstream-patches-0.tar.xz 45416 BLAKE2B 3990dbf338c2aebe1cd601d7caccc6919352cc1f937677d447c3d2626143710bdfda7f1977e2ad7112abff9cad6bb660bc1b0993ca74b2eff51da6d4f4365813 SHA512 ecbc13e607581a6f9b4e318145afaa92ce641bda6fb12585408f61bcf24fa9b245004ad22150e109db5d38fcea38e6bdaf6bb2d6eaaf8e5d5fa8816b5a19e456
27
28 diff --git a/app-emulation/xen/xen-4.10.2-r2.ebuild b/app-emulation/xen/xen-4.10.2-r2.ebuild
29 deleted file mode 100644
30 index bc238c68ed1..00000000000
31 --- a/app-emulation/xen/xen-4.10.2-r2.ebuild
32 +++ /dev/null
33 @@ -1,171 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -PYTHON_COMPAT=( python2_7 )
40 -
41 -inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
42 -
43 -MY_PV=${PV/_/-}
44 -MY_P=${PN}-${MY_PV}
45 -
46 -if [[ $PV == *9999 ]]; then
47 - inherit git-r3
48 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
49 - SRC_URI=""
50 -else
51 - KEYWORDS="amd64 ~arm -x86"
52 - UPSTREAM_VER=2
53 - SECURITY_VER=
54 - GENTOO_VER=
55 -
56 - [[ -n ${UPSTREAM_VER} ]] && \
57 - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
58 - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
59 - [[ -n ${SECURITY_VER} ]] && \
60 - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
61 - [[ -n ${GENTOO_VER} ]] && \
62 - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
63 - SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
64 - ${UPSTREAM_PATCHSET_URI}
65 - ${SECURITY_PATCHSET_URI}
66 - ${GENTOO_PATCHSET_URI}"
67 -fi
68 -
69 -DESCRIPTION="The Xen virtual machine monitor"
70 -HOMEPAGE="https://www.xenproject.org"
71 -LICENSE="GPL-2"
72 -SLOT="0"
73 -IUSE="custom-cflags debug efi flask"
74 -
75 -DEPEND="${PYTHON_DEPS}
76 - efi? ( >=sys-devel/binutils-2.22[multitarget] )
77 - !efi? ( >=sys-devel/binutils-2.22 )"
78 -RDEPEND=""
79 -PDEPEND="~app-emulation/xen-tools-${PV}"
80 -
81 -# no tests are available for the hypervisor
82 -# prevent the silliness of /usr/lib/debug/usr/lib/debug files
83 -# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
84 -RESTRICT="test splitdebug strip"
85 -
86 -# Approved by QA team in bug #144032
87 -QA_WX_LOAD="boot/xen-syms-${PV}"
88 -
89 -REQUIRED_USE="arm? ( debug )"
90 -
91 -S="${WORKDIR}/${MY_P}"
92 -
93 -pkg_setup() {
94 - python-any-r1_pkg_setup
95 - if [[ -z ${XEN_TARGET_ARCH} ]]; then
96 - if use amd64; then
97 - export XEN_TARGET_ARCH="x86_64"
98 - elif use arm; then
99 - export XEN_TARGET_ARCH="arm32"
100 - elif use arm64; then
101 - export XEN_TARGET_ARCH="arm64"
102 - else
103 - die "Unsupported architecture!"
104 - fi
105 - fi
106 -
107 - if use flask ; then
108 - export "XSM_ENABLE=y"
109 - export "FLASK_ENABLE=y"
110 - fi
111 -}
112 -
113 -src_prepare() {
114 - # Upstream's patchset
115 - [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
116 -
117 - # Security patchset
118 - if [[ -n ${SECURITY_VER} ]]; then
119 - einfo "Try to apply Xen Security patch set"
120 - # apply main xen patches
121 - # Two parallel systems, both work side by side
122 - # Over time they may concdense into one. This will suffice for now
123 - source "${WORKDIR}"/patches-security/${PV}.conf
124 -
125 - local i
126 - for i in ${XEN_SECURITY_MAIN}; do
127 - eapply "${WORKDIR}"/patches-security/xen/$i
128 - done
129 - fi
130 -
131 - # Gentoo's patchset
132 - [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
133 -
134 - eapply "${FILESDIR}"/${PN}-4.6-efi.patch
135 -
136 - # Drop .config
137 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
138 -
139 - if use efi; then
140 - export EFI_VENDOR="gentoo"
141 - export EFI_MOUNTPOINT="boot"
142 - fi
143 -
144 - # if the user *really* wants to use their own custom-cflags, let them
145 - if use custom-cflags; then
146 - einfo "User wants their own CFLAGS - removing defaults"
147 - # try and remove all the default custom-cflags
148 - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
149 - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
150 - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
151 - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
152 - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
153 - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
154 - -i {} \; || die "failed to re-set custom-cflags"
155 - fi
156 -
157 - default
158 -}
159 -
160 -src_configure() {
161 - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
162 -
163 - use debug && myopt="${myopt} debug=y"
164 -
165 - if use custom-cflags; then
166 - filter-flags -fPIE -fstack-protector
167 - replace-flags -O3 -O2
168 - else
169 - unset CFLAGS
170 - unset LDFLAGS
171 - unset ASFLAGS
172 - fi
173 -}
174 -
175 -src_compile() {
176 - # Send raw LDFLAGS so that --as-needed works
177 - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
178 -}
179 -
180 -src_install() {
181 - local myopt
182 - use debug && myopt="${myopt} debug=y"
183 -
184 - # The 'make install' doesn't 'mkdir -p' the subdirs
185 - if use efi; then
186 - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
187 - fi
188 -
189 - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
190 -
191 - # make install likes to throw in some extra EFI bits if it built
192 - use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
193 -}
194 -
195 -pkg_postinst() {
196 - elog "Official Xen Guide:"
197 - elog " https://wiki.gentoo.org/wiki/Xen"
198 -
199 - use efi && einfo "The efi executable is installed in boot/efi/gentoo"
200 -
201 - elog "You can optionally block the installation of /boot/xen-syms by an entry"
202 - elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
203 - elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
204 -}