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, 30 Apr 2020 14:46:06
Message-Id: 1588257764.11be7af2a980a01a1cc4b4676209d70a85ae3818.dlan@gentoo
1 commit: 11be7af2a980a01a1cc4b4676209d70a85ae3818
2 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Tue Apr 28 11:57:37 2020 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 30 14:42:44 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11be7af2
7
8 app-emulation/xen: drop vulnerable version
9
10 Bug: https://bugs.gentoo.org/717446
11 Closes: https://github.com/gentoo/gentoo/pull/15554
12
13 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
14 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
15
16 app-emulation/xen/Manifest | 1 -
17 app-emulation/xen/xen-4.12.2-r1.ebuild | 165 ---------------------------------
18 2 files changed, 166 deletions(-)
19
20 diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
21 index 23baac2b284..fa09ca454f3 100644
22 --- a/app-emulation/xen/Manifest
23 +++ b/app-emulation/xen/Manifest
24 @@ -1,4 +1,3 @@
25 -DIST xen-4.12.2-upstream-patches-1.tar.xz 17016 BLAKE2B 5bd27f6187c13b1c4792aa81c0ca8cde0d687566e0fde322e7cb249e1c8665fca0def5a137493a04598b617c46f052cf69701257ea1b97823fd1534d94cabd8f SHA512 dab5e7a3ac1a82faff3069f07945dc0b9651f90e8e87b3c342bb98a06ac244d212dc0baf8c7f1997f285b06baca9dc57d4823bfb220ca34274bd3d6d31421b02
26 DIST xen-4.12.2-upstream-patches-2.tar.xz 34484 BLAKE2B 79799a2fa9e638adf80ff1b5a1609b28747dad254da2e8ebd94afd75d5b7c061d25d507e7d388af17905347e180537dec8d0e27bd18cf6c53f51f7272d4adafe SHA512 abf9d82fe20fc9411384283876cf020a31e6c22ab2e54a7fae0d95ade02f434e4afb08d47c3ed5e4bc7ea5f518df7dc57baef2b8e76e3439bd937e2ee3c2b658
27 DIST xen-4.12.2.tar.gz 26985135 BLAKE2B 530821011a6dd0ac0a99fb135ff5311eb8e975c3791818093b5e250eed7854d153de6d4340197f9b949c0ad2c3d7b2b7180deb42bc71748ff70ff6fad195269d SHA512 7d9e7921271830c9eadf1bb8eca1aec20d343ad7475b0dc3165ef6d681759e7cb70739f8d9f85622a23aef960988820e822267fb198b12ee3dd657ad6164069f
28 DIST xen-4.13.0-upstream-patches-2.tar.xz 55980 BLAKE2B b85512456cac253d7f4dd0dca120d694cde0b0f4d0270023bca337f9bc693eb768c1a43d74d412c38dc665ee50a70d2985e5bfc6edde3eacc4376d2f6d7877c8 SHA512 fb852be98209e135a11241dd15e9bd174a5a3724bfaea1fc3b12ba964b8fc275946b1c443c70a78212dff0bc9b25015a00d9f902183c135053e27957b55b6bb6
29
30 diff --git a/app-emulation/xen/xen-4.12.2-r1.ebuild b/app-emulation/xen/xen-4.12.2-r1.ebuild
31 deleted file mode 100644
32 index 1610c864961..00000000000
33 --- a/app-emulation/xen/xen-4.12.2-r1.ebuild
34 +++ /dev/null
35 @@ -1,165 +0,0 @@
36 -# Copyright 1999-2020 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -
41 -PYTHON_COMPAT=( python2_7 )
42 -
43 -inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
44 -
45 -MY_PV=${PV/_/-}
46 -MY_P=${PN}-${MY_PV}
47 -
48 -if [[ $PV == *9999 ]]; then
49 - inherit git-r3
50 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
51 - SRC_URI=""
52 -else
53 - KEYWORDS="amd64 ~arm -x86"
54 - UPSTREAM_VER=1
55 - SECURITY_VER=
56 - GENTOO_VER=
57 -
58 - [[ -n ${UPSTREAM_VER} ]] && \
59 - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
60 - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
61 - [[ -n ${SECURITY_VER} ]] && \
62 - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
63 - [[ -n ${GENTOO_VER} ]] && \
64 - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
65 - SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
66 - ${UPSTREAM_PATCHSET_URI}
67 - ${SECURITY_PATCHSET_URI}
68 - ${GENTOO_PATCHSET_URI}"
69 -fi
70 -
71 -DESCRIPTION="The Xen virtual machine monitor"
72 -HOMEPAGE="https://www.xenproject.org"
73 -LICENSE="GPL-2"
74 -SLOT="0"
75 -IUSE="debug efi flask"
76 -
77 -DEPEND="${PYTHON_DEPS}
78 - efi? ( >=sys-devel/binutils-2.22[multitarget] )
79 - !efi? ( >=sys-devel/binutils-2.22 )"
80 -RDEPEND=""
81 -PDEPEND="~app-emulation/xen-tools-${PV}"
82 -
83 -# no tests are available for the hypervisor
84 -# prevent the silliness of /usr/lib/debug/usr/lib/debug files
85 -# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
86 -RESTRICT="test splitdebug strip"
87 -
88 -# Approved by QA team in bug #144032
89 -QA_WX_LOAD="boot/xen-syms-${PV}"
90 -
91 -REQUIRED_USE="arm? ( debug )"
92 -
93 -S="${WORKDIR}/${MY_P}"
94 -
95 -pkg_setup() {
96 - python-any-r1_pkg_setup
97 - if [[ -z ${XEN_TARGET_ARCH} ]]; then
98 - if use amd64; then
99 - export XEN_TARGET_ARCH="x86_64"
100 - elif use arm; then
101 - export XEN_TARGET_ARCH="arm32"
102 - elif use arm64; then
103 - export XEN_TARGET_ARCH="arm64"
104 - else
105 - die "Unsupported architecture!"
106 - fi
107 - fi
108 -
109 - if use flask ; then
110 - export "XSM_ENABLE=y"
111 - export "FLASK_ENABLE=y"
112 - fi
113 -}
114 -
115 -src_prepare() {
116 - # Upstream's patchset
117 - [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
118 -
119 - # Security patchset
120 - if [[ -n ${SECURITY_VER} ]]; then
121 - einfo "Try to apply Xen Security patch set"
122 - # apply main xen patches
123 - # Two parallel systems, both work side by side
124 - # Over time they may concdense into one. This will suffice for now
125 - source "${WORKDIR}"/patches-security/${PV}.conf
126 -
127 - local i
128 - for i in ${XEN_SECURITY_MAIN}; do
129 - eapply "${WORKDIR}"/patches-security/xen/$i
130 - done
131 - fi
132 -
133 - # Gentoo's patchset
134 - [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
135 -
136 - eapply "${FILESDIR}"/${PN}-4.11-efi.patch
137 -
138 - # Drop .config
139 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
140 -
141 - if use efi; then
142 - export EFI_VENDOR="gentoo"
143 - export EFI_MOUNTPOINT="/boot"
144 - fi
145 -
146 - default
147 -}
148 -
149 -src_configure() {
150 - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
151 -
152 - use debug && myopt="${myopt} debug=y"
153 -
154 - # remove flags
155 - unset CFLAGS
156 - unset LDFLAGS
157 - unset ASFLAGS
158 -
159 - tc-ld-disable-gold # Bug 700374
160 -}
161 -
162 -src_compile() {
163 - # Send raw LDFLAGS so that --as-needed works
164 - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
165 -}
166 -
167 -src_install() {
168 - local myopt
169 - use debug && myopt="${myopt} debug=y"
170 -
171 - # The 'make install' doesn't 'mkdir -p' the subdirs
172 - if use efi; then
173 - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
174 - fi
175 -
176 - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
177 -
178 - # make install likes to throw in some extra EFI bits if it built
179 - use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
180 -}
181 -
182 -pkg_postinst() {
183 - elog "Official Xen Guide:"
184 - elog " https://wiki.gentoo.org/wiki/Xen"
185 -
186 - use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
187 -
188 - elog "You can optionally block the installation of /boot/xen-syms by an entry"
189 - elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
190 - elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
191 -
192 - ewarn
193 - ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
194 - ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
195 - ewarn "to work fine."
196 - ewarn
197 - ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
198 - ewarn
199 - ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
200 -}