diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
commit | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch) | |
tree | 464c922e949c7e4d5d891fb2cdda5daee5612537 /app-emulation/xen | |
parent | e68d405c5d712af4387159df07e226217bdda049 (diff) |
gentoo resync : 16.04.2022
Diffstat (limited to 'app-emulation/xen')
-rw-r--r-- | app-emulation/xen/Manifest | 6 | ||||
-rw-r--r-- | app-emulation/xen/xen-4.15.2-r2.ebuild | 163 | ||||
-rw-r--r-- | app-emulation/xen/xen-4.16.0-r5.ebuild (renamed from app-emulation/xen/xen-4.16.0-r4.ebuild) | 2 |
3 files changed, 168 insertions, 3 deletions
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 3dfa561a2c78..3cade1dda591 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -5,10 +5,12 @@ AUX xen-4.16-no-symlink.patch 1044 BLAKE2B 3f5cb93403e3cd606a5eabb8b0e7facb3c95a DIST xen-4.15.1-upstream-patches-3.tar.xz 49644 BLAKE2B 261d45d726ba9b06a817fd4f4e9d2a83e516cd637f73dff50ccb9b046d562e14bee47fc64795c0406947fb06988679047a19e5851482fbf85701bcc495225258 SHA512 8d8b7e42f9a401f6d3a7cb87b980714aa14dadbeadb3a26f495b6a1892d1a04de244490255b589952f565d0a0b8c69fd527c0168d40e974e0f77cecda25e7cb3 DIST xen-4.15.1.tar.gz 40800852 BLAKE2B 39475ea33f029fb0e84b82b4a2b13fd613bab01e3ef6c241dfede3d190ee9be53c99b62121d37d83b1e078764b3e4d88d1dfb99be1b5623691e56519850c6798 SHA512 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9 DIST xen-4.15.2-upstream-patches-1.tar.xz 43148 BLAKE2B 0f5b43ecd32d3a91444e92387cec69bbfd4fa5bd182dfaf7e6fb9980fe6e6244e83e420e9c5f8eb525ffc073c0f473c05f4fa7d8bbe5a185fcd6fc33a16323a8 SHA512 83d9199811e529bbcda7f349fdbece15719f0678114640389fc674e62899aea1daece3ccbf667928825884924ea1085f448056f79728bfea75730a1ef0405d5c +DIST xen-4.15.2-upstream-patches-2.tar.xz 93208 BLAKE2B 5b01953ba93551830e533cf7e9e8675a44ed6c2ad3da152e0b5feeb3782b9bc3a1a0a7c0a84ac1de8ed7146fcf364db7604ea269ee243438df34c91b4b6acc5b SHA512 c2f585223d3d9e08d08b295c0f35e4856e4801d214cf0a1f925585c28a7a25cb3b82a5f5e7d41d35b2c746d5a307cd5b5a369d5342f35681e227d8ce91e741c2 DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104 SHA512 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54 -DIST xen-4.16.0-upstream-patches-1.tar.xz 61124 BLAKE2B 11cd00b93a7f4af24ebced7e450d38624e317eaa455e5aa7cd50bff09700b349e47016863bb0523a68a1113627ef1cd3c1e269504de50ed54bf71b1908bc0ba4 SHA512 ef624b11b4ecd3d1ea05050744f5b0d45b1eb3d87f5f0e8b89e6aa489cd50e99478a4ff59df151241963a8acc8601662bd1ccd63b586ebdde291e9bfad21c54f +DIST xen-4.16.0-upstream-patches-2.tar.xz 111668 BLAKE2B e8bbedb7cc50f7a6cb1a3869f0165cce3d02c33f04b935384e770aa5206e6aa6cb51329c5d69375391a8781ba23f20c35e06406d5164720d253b405a77f5aee9 SHA512 6b6770117e81ae407e3ded0e366b14f3fa2411cc93a95187db27548c3dd17a1f85e60fc3971b008693297ad97aa0c5fa7b4d88e01d67a972f39e51bf0a2cf39d DIST xen-4.16.0.tar.gz 44982322 BLAKE2B 7e16a93b3f1131e2b10307fabc10641a9c5983173155b9a35eaf6ff317b6a747bccf6b8c87c06686830acc2c4bd3e19e5867eb443eabac9a1e4ee59124dfa87f SHA512 2869ed90d1779c9754d7f2397f5fc67a655304d9c32953ac20655ef96cb154521d8fce9f23915ac0c91f984dc54f72c67e5e619e2da318b5997748f44cf21b87 EBUILD xen-4.15.1-r3.ebuild 4408 BLAKE2B 8f72ece7a8fbc12f62409f98b5064feedcde24969010a1c7fdc84eb0421a317e05ca9066531b3dccf430a78414866d0e33e8d883ff8e8e4a4cdc720aeb7d6093 SHA512 ec445722ff6f1b6bdaa568f36a4ffb643ce35f72df8d5fc4c05c4016deb9582ece7e01010edaadecc645d84373eebc5030d139fa291fb23288eecac0d0fe3555 EBUILD xen-4.15.2-r1.ebuild 4410 BLAKE2B e2e423d9007e7b5ddeedcd93805703fbdf535ae9c49e954347ce9db1dfe7b02eb340db1925dddb0683f2c5bd037f4b99a7696ca5247b90f7a2d0f7b27f84e157 SHA512 9f72d6dc897f3c8b6d6cfb1c58612754be21a63c67ea022b6c982566f1e441424ecaadbe8445aa1d43782da5cbd4fc71efc88345a7e08d6c1b31ea2c2ee5713a -EBUILD xen-4.16.0-r4.ebuild 4530 BLAKE2B cf4b20851fbcf1a890c5585534ec2e3ec511235ac87bc8fe523907c48166a2d91e543deadb3c3833ca5bc8396fb4f8166e22e60e21563dd62eca03343175361e SHA512 2b90652ae245142d0ef43c0f31bc4f6930a91d984804fcd9eb3f42ac8eb04b4d9fc9e2e115432567a1727c50c56f88dd3db594870e441cba8bf0ecb6b2417919 +EBUILD xen-4.15.2-r2.ebuild 4410 BLAKE2B 243d070996fc45f71a755bc45738c6ff120e2117fb2febe0fc42082327b8377fb5df571c0f3191e64994ac55d26e4926bf638d732c0a3abca082fe659da22953 SHA512 aa1ebd93a2e43494d7ee92830213fa077ebc39e89d7a0a86763ea8f34fbbe52d01c17c40b78a3eaf5d6ffd8edaaabd7c0103dc4fd1b3b3fc16fd031f8a2fdbaa +EBUILD xen-4.16.0-r5.ebuild 4530 BLAKE2B f612f59966f36ef8b08fd8a6dc5c79a486c289b080d5db3cdf220b7d62c559a8d379d8ae8fba0592c8309a8a105a129ea775fe5367c3ff100012824cc4b256b1 SHA512 cb50cc8cbe7a979fe53bfcb62ca5f618e67f8d43441078ecec07aabae3eb61c6d92904d19736c6651221cd99224f9dcbdf86e62b0bfed6601aa6294ff879afa3 MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9 diff --git a/app-emulation/xen/xen-4.15.2-r2.ebuild b/app-emulation/xen/xen-4.15.2-r2.ebuild new file mode 100644 index 000000000000..f57e489fab47 --- /dev/null +++ b/app-emulation/xen/xen-4.15.2-r2.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs + +MY_PV=${PV/_/-} +MY_P=${PN}-${MY_PV} + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="git://xenbits.xen.org/xen.git" + SRC_URI="" +else + KEYWORDS="~amd64 ~arm -x86" + UPSTREAM_VER=2 + SECURITY_VER= + GENTOO_VER= + + [[ -n ${UPSTREAM_VER} ]] && \ + UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz + https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" + [[ -n ${GENTOO_VER} ]] && \ + GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" + SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz + ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} + ${GENTOO_PATCHSET_URI}" +fi + +DESCRIPTION="The Xen virtual machine monitor" +HOMEPAGE="https://www.xenproject.org" +LICENSE="GPL-2" +SLOT="0" +IUSE="debug efi flask" + +DEPEND="${PYTHON_DEPS} + efi? ( >=sys-devel/binutils-2.22[multitarget] ) + !efi? ( >=sys-devel/binutils-2.22 ) + flask? ( sys-apps/checkpolicy )" +RDEPEND="" +PDEPEND="~app-emulation/xen-tools-${PV}" + +# no tests are available for the hypervisor +# prevent the silliness of /usr/lib/debug/usr/lib/debug files +# prevent stripping of the debug info from the /usr/lib/debug/xen-syms +RESTRICT="test splitdebug strip" + +# Approved by QA team in bug #144032 +QA_WX_LOAD="boot/xen-syms-${PV}" + +REQUIRED_USE="arm? ( debug )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + python-any-r1_pkg_setup + if [[ -z ${XEN_TARGET_ARCH} ]]; then + if use amd64; then + export XEN_TARGET_ARCH="x86_64" + elif use arm; then + export XEN_TARGET_ARCH="arm32" + elif use arm64; then + export XEN_TARGET_ARCH="arm64" + else + die "Unsupported architecture!" + fi + fi +} + +src_prepare() { + # Upstream's patchset + [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream + + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + einfo "Try to apply Xen Security patch set" + # apply main xen patches + # Two parallel systems, both work side by side + # Over time they may concdense into one. This will suffice for now + source "${WORKDIR}"/patches-security/${PV}.conf + + local i + for i in ${XEN_SECURITY_MAIN}; do + eapply "${WORKDIR}"/patches-security/xen/$i + done + fi + + # Gentoo's patchset + [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo + + # Symlinks do not work on fat32 volumes + eapply "${FILESDIR}"/${PN}-4.15-efi.patch + + # Enable XSM-FLASK + use flask && eapply "${FILESDIR}"/${PN}-4.15-flask.patch + + # Workaround new gcc-11 options + sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die + + # Drop .config + sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" + + if use efi; then + export EFI_VENDOR="gentoo" + export EFI_MOUNTPOINT="/boot" + fi + + default +} + +src_configure() { + use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" + use debug && myopt="${myopt} debug=y" + + # remove flags + unset CFLAGS + unset LDFLAGS + unset ASFLAGS + + tc-ld-disable-gold # Bug 700374 +} + +src_compile() { + # Send raw LDFLAGS so that --as-needed works + emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} +} + +src_install() { + local myopt + use debug && myopt="${myopt} debug=y" + + # The 'make install' doesn't 'mkdir -p' the subdirs + if use efi; then + mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die + fi + + emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install + + # make install likes to throw in some extra EFI bits if it built + use efi || rm -rf "${D}/usr/$(get_libdir)/efi" +} + +pkg_postinst() { + elog "Official Xen Guide:" + elog " https://wiki.gentoo.org/wiki/Xen" + + use efi && einfo "The efi executable is installed in /boot/efi/gentoo" + + ewarn + ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause" + ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems" + ewarn "to work fine." + ewarn + ewarn "Add sched=credit to xen command line options to use the legacy scheduler." + ewarn + ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B" +} diff --git a/app-emulation/xen/xen-4.16.0-r4.ebuild b/app-emulation/xen/xen-4.16.0-r5.ebuild index 3bd91d3024b8..6342aaf23287 100644 --- a/app-emulation/xen/xen-4.16.0-r4.ebuild +++ b/app-emulation/xen/xen-4.16.0-r5.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then SRC_URI="" else KEYWORDS="~amd64 ~arm -x86" - UPSTREAM_VER=1 + UPSTREAM_VER=2 SECURITY_VER= GENTOO_VER= |