Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/
Date: Tue, 03 May 2022 18:41:36
Message-Id: 1651603276.31d604909588dceccb1803f2c36908360afc22fb.sam@gentoo
1 commit: 31d604909588dceccb1803f2c36908360afc22fb
2 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Tue May 3 18:25:25 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 18:41:16 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d60490
7
8 app-emulation/xen: drop vulnerable
9
10 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 app-emulation/xen/Manifest | 1 -
14 app-emulation/xen/xen-4.15.2-r1.ebuild | 163 ---------------------------------
15 2 files changed, 164 deletions(-)
16
17 diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
18 index 12d6f57015df..44b29c37ebee 100644
19 --- a/app-emulation/xen/Manifest
20 +++ b/app-emulation/xen/Manifest
21 @@ -1,6 +1,5 @@
22 DIST xen-4.15.1-upstream-patches-3.tar.xz 49644 BLAKE2B 261d45d726ba9b06a817fd4f4e9d2a83e516cd637f73dff50ccb9b046d562e14bee47fc64795c0406947fb06988679047a19e5851482fbf85701bcc495225258 SHA512 8d8b7e42f9a401f6d3a7cb87b980714aa14dadbeadb3a26f495b6a1892d1a04de244490255b589952f565d0a0b8c69fd527c0168d40e974e0f77cecda25e7cb3
23 DIST xen-4.15.1.tar.gz 40800852 BLAKE2B 39475ea33f029fb0e84b82b4a2b13fd613bab01e3ef6c241dfede3d190ee9be53c99b62121d37d83b1e078764b3e4d88d1dfb99be1b5623691e56519850c6798 SHA512 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9
24 -DIST xen-4.15.2-upstream-patches-1.tar.xz 43148 BLAKE2B 0f5b43ecd32d3a91444e92387cec69bbfd4fa5bd182dfaf7e6fb9980fe6e6244e83e420e9c5f8eb525ffc073c0f473c05f4fa7d8bbe5a185fcd6fc33a16323a8 SHA512 83d9199811e529bbcda7f349fdbece15719f0678114640389fc674e62899aea1daece3ccbf667928825884924ea1085f448056f79728bfea75730a1ef0405d5c
25 DIST xen-4.15.2-upstream-patches-2.tar.xz 93208 BLAKE2B 5b01953ba93551830e533cf7e9e8675a44ed6c2ad3da152e0b5feeb3782b9bc3a1a0a7c0a84ac1de8ed7146fcf364db7604ea269ee243438df34c91b4b6acc5b SHA512 c2f585223d3d9e08d08b295c0f35e4856e4801d214cf0a1f925585c28a7a25cb3b82a5f5e7d41d35b2c746d5a307cd5b5a369d5342f35681e227d8ce91e741c2
26 DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104 SHA512 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
27 DIST xen-4.16.0-upstream-patches-2.tar.xz 111668 BLAKE2B e8bbedb7cc50f7a6cb1a3869f0165cce3d02c33f04b935384e770aa5206e6aa6cb51329c5d69375391a8781ba23f20c35e06406d5164720d253b405a77f5aee9 SHA512 6b6770117e81ae407e3ded0e366b14f3fa2411cc93a95187db27548c3dd17a1f85e60fc3971b008693297ad97aa0c5fa7b4d88e01d67a972f39e51bf0a2cf39d
28
29 diff --git a/app-emulation/xen/xen-4.15.2-r1.ebuild b/app-emulation/xen/xen-4.15.2-r1.ebuild
30 deleted file mode 100644
31 index acf7c38a0d94..000000000000
32 --- a/app-emulation/xen/xen-4.15.2-r1.ebuild
33 +++ /dev/null
34 @@ -1,163 +0,0 @@
35 -# Copyright 1999-2022 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -PYTHON_COMPAT=( python3_{8..10} )
41 -
42 -inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs
43 -
44 -MY_PV=${PV/_/-}
45 -MY_P=${PN}-${MY_PV}
46 -
47 -if [[ ${PV} == *9999 ]]; then
48 - inherit git-r3
49 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
50 - SRC_URI=""
51 -else
52 - KEYWORDS="~amd64 ~arm -x86"
53 - UPSTREAM_VER=1
54 - SECURITY_VER=
55 - GENTOO_VER=
56 -
57 - [[ -n ${UPSTREAM_VER} ]] && \
58 - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
59 - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
60 - [[ -n ${SECURITY_VER} ]] && \
61 - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
62 - [[ -n ${GENTOO_VER} ]] && \
63 - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
64 - SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
65 - ${UPSTREAM_PATCHSET_URI}
66 - ${SECURITY_PATCHSET_URI}
67 - ${GENTOO_PATCHSET_URI}"
68 -fi
69 -
70 -DESCRIPTION="The Xen virtual machine monitor"
71 -HOMEPAGE="https://xenproject.org"
72 -LICENSE="GPL-2"
73 -SLOT="0"
74 -IUSE="debug efi flask"
75 -
76 -DEPEND="${PYTHON_DEPS}
77 - efi? ( >=sys-devel/binutils-2.22[multitarget] )
78 - !efi? ( >=sys-devel/binutils-2.22 )
79 - flask? ( sys-apps/checkpolicy )"
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 -
110 -src_prepare() {
111 - # Upstream's patchset
112 - [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
113 -
114 - # Security patchset
115 - if [[ -n ${SECURITY_VER} ]]; then
116 - einfo "Try to apply Xen Security patch set"
117 - # apply main xen patches
118 - # Two parallel systems, both work side by side
119 - # Over time they may concdense into one. This will suffice for now
120 - source "${WORKDIR}"/patches-security/${PV}.conf
121 -
122 - local i
123 - for i in ${XEN_SECURITY_MAIN}; do
124 - eapply "${WORKDIR}"/patches-security/xen/$i
125 - done
126 - fi
127 -
128 - # Gentoo's patchset
129 - [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
130 -
131 - # Symlinks do not work on fat32 volumes
132 - eapply "${FILESDIR}"/${PN}-4.15-efi.patch
133 -
134 - # Enable XSM-FLASK
135 - use flask && eapply "${FILESDIR}"/${PN}-4.15-flask.patch
136 -
137 - # Workaround new gcc-11 options
138 - sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die
139 -
140 - # Drop .config
141 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
142 -
143 - if use efi; then
144 - export EFI_VENDOR="gentoo"
145 - export EFI_MOUNTPOINT="/boot"
146 - fi
147 -
148 - default
149 -}
150 -
151 -src_configure() {
152 - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
153 - use debug && myopt="${myopt} debug=y"
154 -
155 - # remove flags
156 - unset CFLAGS
157 - unset LDFLAGS
158 - unset ASFLAGS
159 -
160 - tc-ld-disable-gold # Bug 700374
161 -}
162 -
163 -src_compile() {
164 - # Send raw LDFLAGS so that --as-needed works
165 - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
166 -}
167 -
168 -src_install() {
169 - local myopt
170 - use debug && myopt="${myopt} debug=y"
171 -
172 - # The 'make install' doesn't 'mkdir -p' the subdirs
173 - if use efi; then
174 - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
175 - fi
176 -
177 - emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
178 -
179 - # make install likes to throw in some extra EFI bits if it built
180 - use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
181 -}
182 -
183 -pkg_postinst() {
184 - elog "Official Xen Guide:"
185 - elog " https://wiki.gentoo.org/wiki/Xen"
186 -
187 - use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
188 -
189 - ewarn
190 - ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
191 - ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
192 - ewarn "to work fine."
193 - ewarn
194 - ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
195 - ewarn
196 - ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
197 -}