From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EB8C9158020 for ; Wed, 26 Oct 2022 14:27:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35288E0921; Wed, 26 Oct 2022 14:27:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10839E0921 for ; Wed, 26 Oct 2022 14:27:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2997341114 for ; Wed, 26 Oct 2022 14:27:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A10761D for ; Wed, 26 Oct 2022 14:27:53 +0000 (UTC) From: "John Helmert III" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" Message-ID: <1666794376.4bff25a0b75caa9a2bc6a8d34d8f77a267399856.ajak@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/xen/xen-4.15.3.ebuild app-emulation/xen/xen-4.16.2.ebuild X-VCS-Directories: app-emulation/xen/ X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: 4bff25a0b75caa9a2bc6a8d34d8f77a267399856 X-VCS-Branch: master Date: Wed, 26 Oct 2022 14:27:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7351d74c-31de-4d94-9c9e-45fd3407d21c X-Archives-Hash: 3b8581bb8448c434ee8b80e092584a37 commit: 4bff25a0b75caa9a2bc6a8d34d8f77a267399856 Author: Tomáš Mózes gmail com> AuthorDate: Wed Oct 26 05:07:20 2022 +0000 Commit: John Helmert III gentoo org> CommitDate: Wed Oct 26 14:26:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bff25a0 app-emulation/xen: drop vulnerable Bug: https://bugs.gentoo.org/876790 Signed-off-by: Tomáš Mózes gmail.com> Signed-off-by: John Helmert III gentoo.org> app-emulation/xen/xen-4.15.3.ebuild | 183 ------------------------------------ app-emulation/xen/xen-4.16.2.ebuild | 174 ---------------------------------- 2 files changed, 357 deletions(-) diff --git a/app-emulation/xen/xen-4.15.3.ebuild b/app-emulation/xen/xen-4.15.3.ebuild deleted file mode 100644 index ff611b2ed315..000000000000 --- a/app-emulation/xen/xen-4.15.3.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git" - SRC_URI="" -else - KEYWORDS="amd64 ~arm -x86" - - XEN_PRE_PATCHSET_NUM= - XEN_GENTOO_PATCHSET_NUM= - XEN_PRE_VERSION_BASE= - - XEN_BASE_PV="${PV}" - if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then - XEN_BASE_PV="${XEN_PRE_VERSION_BASE}" - fi - - SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz" - - if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then - XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}" - XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}" - SRC_URI+=" https://github.com/Flowdalic/xen-upstream-patches/archive/refs/tags/${XEN_UPSTREAM_PATCHES_TAG}.tar.gz -> ${XEN_UPSTREAM_PATCHES_NAME}.tar.gz" - XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}" - fi - if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then - XEN_GENTOO_PATCHES_TAG="4.16.1-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}" - XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}" - SRC_URI+=" https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/${XEN_GENTOO_PATCHES_TAG}.tar.gz -> ${XEN_GENTOO_PATCHES_NAME}.tar.gz" - XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}" - fi -fi - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="https://xenproject.org" - -S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})" - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug efi flask" -REQUIRED_USE="arm? ( debug )" - -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}" - -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() { - if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then - eapply "${XEN_UPSTREAM_PATCHES_DIR}" - fi - - if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then - eapply "${XEN_GENTOO_PATCHES_DIR}" - fi - - 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 -} - -xen_make() { - # Setting clang to either 'y' or 'n' tells Xen's build system - # whether or not clang is used. - local clang=n - if tc-is-clang; then - clang=y - fi - - # Send raw LDFLAGS so that --as-needed works - emake \ - V=1 \ - LDFLAGS="$(raw-ldflags)" \ - HOSTCC="$(tc-getBUILD_CC)" \ - HOSTCXX="$(tc-getBUILD_CXX)" \ - clang="${clang}" \ - "$@" -} - -src_configure() { - cd xen || die - - touch gentoo-config || die - if use arm; then - echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die - fi - if use debug; then - cat <<-EOF >> gentoo-config || die - CONFIG_DEBUG=y - CONFIG_CRASH_DEBUG=y -EOF - fi - if use flask; then - echo "CONFIG_XSM=y" >> gentoo-config || die - fi - - # remove flags - unset CFLAGS - - tc-ld-disable-gold # Bug 700374 - - xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig -} - -src_compile() { - xen_make -C xen -} - -src_install() { - # The 'make install' doesn't 'mkdir -p' the subdirs - if use efi; then - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die - fi - - xen_make DESTDIR="${D}" -C xen 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.2.ebuild b/app-emulation/xen/xen-4.16.2.ebuild deleted file mode 100644 index 108e94c663c3..000000000000 --- a/app-emulation/xen/xen-4.16.2.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) - -inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git" - SRC_URI="" -else - KEYWORDS="~amd64 ~arm -x86" - - XEN_GENTOO_PATCHSET_NUM=2 - XEN_GENTOO_PATCHSET_BASE=4.16.1 - XEN_PRE_PATCHSET_NUM= - XEN_PRE_VERSION_BASE= - - XEN_BASE_PV="${PV}" - if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then - XEN_BASE_PV="${XEN_PRE_VERSION_BASE}" - fi - - SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz" - - if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then - XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}" - XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}" - SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2" - XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}" - fi - if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then - XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}" - XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}" - SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2" - XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}" - fi -fi - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="https://xenproject.org" - -S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+boot-symlinks debug efi flask" -REQUIRED_USE="arm? ( debug )" - -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}" - -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() { - if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then - eapply "${XEN_UPSTREAM_PATCHES_DIR}" - fi - - if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then - eapply "${XEN_GENTOO_PATCHES_DIR}" - fi - - # Symlinks do not work on fat32 volumes # 829765 - if ! use boot-symlinks || use efi; then - eapply "${XEN_GENTOO_PATCHES_DIR}"/no-boot-symlinks/${PN}-4.16-no-symlinks.patch - fi - - # 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 -} - -xen_make() { - # Setting clang to either 'y' or 'n' tells Xen's build system - # whether or not clang is used. - local clang=n - if tc-is-clang; then - clang=y - fi - - # Send raw LDFLAGS so that --as-needed works - emake \ - V=1 \ - LDFLAGS="$(raw-ldflags)" \ - HOSTCC="$(tc-getBUILD_CC)" \ - HOSTCXX="$(tc-getBUILD_CXX)" \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - LD="$(tc-getLD)" \ - AR="$(tc-getAR)" \ - OBJDUMP="$(tc-getOBJDUMP)" \ - RANLIB="$(tc-getRANLIB)" \ - clang="${clang}" \ - "$@" -} - -src_configure() { - cd xen || die - - touch gentoo-config || die - if use arm; then - echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die - fi - if use debug; then - cat <<-EOF >> gentoo-config || die - CONFIG_DEBUG=y - CONFIG_CRASH_DEBUG=y -EOF - fi - if use flask; then - echo "CONFIG_XSM=y" >> gentoo-config || die - fi - - # remove flags - unset CFLAGS - - tc-ld-disable-gold # Bug 700374 - - xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig -} - -src_compile() { - xen_make -C xen -} - -src_install() { - # The 'make install' doesn't 'mkdir -p' the subdirs - if use efi; then - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die - fi - - xen_make DESTDIR="${D}" -C xen install - - # make install likes to throw in some extra EFI bits if it built - use efi || rm -rf "${D}/usr/$(get_libdir)/efi" -}