commit:     c4c5f331811119b0e5e4c855f4ce63a98a8887aa
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Nov 22 16:31:42 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Nov 29 12:05:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4c5f331

app-emulation/xen: add 4.18.4_pre1, 4.19.1_pre1

Bug: https://bugs.gentoo.org/944489
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-emulation/xen/Manifest               |   2 +
 app-emulation/xen/xen-4.18.4_pre1.ebuild | 179 +++++++++++++++++++++++++++++++
 app-emulation/xen/xen-4.19.1_pre1.ebuild | 179 +++++++++++++++++++++++++++++++
 3 files changed, 360 insertions(+)

diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index c130298c6d99..a41cdefa0174 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -2,4 +2,6 @@ DIST xen-4.18.3.tar.gz 51911584 BLAKE2B 
01bc915ea88c6a80608bb4f9c37ec75cd4abcc78
 DIST xen-4.19.0.tar.gz 52011199 BLAKE2B 
bc6502bf5b68ab130f1d64e20e8a6d8ca656240545f0a4f5fe500413504c7610352bd7577f0e7e9d9354745afaf39d3edd3ad775718e20d14181dd2dca28ec0a
 SHA512 
bc0b4257cab66b0f9d4a1fe72e07f4980398b2934989c02ffe488b465eca3443caa0ded903871480aba6e36212921f335b68d67f202f22548c31899225f2d657
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-2.tar.bz2 4001 BLAKE2B 
7afce426759952e202a1dd819fe0a23108072bf9552ba14a0bd787a96ffe5e7a36f37e03dad8db9c46f5731acbc122c258eef6d517816aad9c8db1ca64700d19
 SHA512 
bcb1479f9ff5e194a4e452da9d0479febc2bcd465b4be69bb8f30e2e6b858fb77a71216dcb3e74dfb65e7ca6513742c294cd6b5eaa5ce82d0b122a00f1cbc450
 DIST xen-upstream-patches-4.18.4-pre-patchset-0.tar.bz2 30806 BLAKE2B 
29654a8bbf5515ba51b278cc62222bc741ddab59976655e4b5df02fe75277d20686e4f4cda7a38997fab86a179fa511fc6c2b9c830080a4af80a24215c0e6e71
 SHA512 
b188c5111714eb1775ee7ad91ed443c03cdb6342c2e26ad5e2f4724f82220191695ecb0b616c8dc3956c07560d0d4056eb1cfdd1143a7b138c4a8669ac24c945
+DIST xen-upstream-patches-4.18.4-pre-patchset-1.tar.bz2 55216 BLAKE2B 
9cc25750cc48db6efbc349278a89cfc3880326ad4556d5dad28a016bbf270435acff606d545420d44a3143ab1f540156c6997ad676d36b3ec3d5e85a63fb495c
 SHA512 
3752998f804c7e1e5dc327a1a84dafbdac6c06eefa404766fc94089521d836a5fecd2f760e229200d4b6267af88f55b119505336be4d57e9fd74457b122f896f
 DIST xen-upstream-patches-4.19.1-pre-patchset-0.tar.bz2 39681 BLAKE2B 
cdec8853ee6b7f6ccac332bd6dcb65294f282e14c6085d4a3c4f90fa6c96850acc5bd0e4cb27ef71d7145e6bdc780ba0223c6e2ba13bea77b9f3803f32954918
 SHA512 
7ecf5380211cebab5bed3276caa23d9b3fffa0dabfbcb46c1900e35883e8af21773a9c7bcc0a6b584ac3ba61e7cb49eed2bc5492e2571268929e59dde5856170
+DIST xen-upstream-patches-4.19.1-pre-patchset-1.tar.bz2 77344 BLAKE2B 
8f201a0aee7f0dda2d06f2a476de213d835b94e55ff0c5ddbcae539db49dc51993bf424a68fcc70e67469394590e6d2256107efd9cfc578c9a09f5c55750c828
 SHA512 
a8ebf31d5805d238298b77ff086270b7077f38786249237601eba716b62ad63b4b8f13158ed6c3ca126f78d7bf991a55ffce85fd8826d59061410a5bc24bb883

diff --git a/app-emulation/xen/xen-4.18.4_pre1.ebuild 
b/app-emulation/xen/xen-4.18.4_pre1.ebuild
new file mode 100644
index 000000000000..16b027565136
--- /dev/null
+++ b/app-emulation/xen/xen-4.18.4_pre1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic mount-boot python-any-r1 secureboot toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://xenbits.xen.org/git-http/xen.git";
+       SRC_URI=""
+else
+       KEYWORDS="~amd64 ~arm -x86"
+
+       XEN_GENTOO_PATCHSET_NUM=2
+       XEN_GENTOO_PATCHSET_BASE=4.17.0
+       XEN_PRE_PATCHSET_NUM=1
+       XEN_PRE_VERSION_BASE=4.18.3
+
+       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 uefi flask"
+REQUIRED_USE="arm? ( debug )"
+
+DEPEND="${PYTHON_DEPS}
+       uefi? ( >=sys-devel/binutils-2.22[multitarget] )
+       !uefi? ( >=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
+       use uefi && secureboot_pkg_setup
+}
+
+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 uefi; 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 uefi; 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 uefi; then
+               mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+       fi
+
+       xen_make DESTDIR="${D}" -C xen install
+
+       if use uefi; then
+               secureboot_auto_sign --in-place
+       else
+               # make install likes to throw in some extra EFI bits if it built
+               rm -rf "${D}/usr/$(get_libdir)/efi"
+       fi
+}

diff --git a/app-emulation/xen/xen-4.19.1_pre1.ebuild 
b/app-emulation/xen/xen-4.19.1_pre1.ebuild
new file mode 100644
index 000000000000..41c66e724d68
--- /dev/null
+++ b/app-emulation/xen/xen-4.19.1_pre1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic mount-boot python-any-r1 secureboot toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://xenbits.xen.org/git-http/xen.git";
+       SRC_URI=""
+else
+       KEYWORDS="~amd64 ~arm -x86"
+
+       XEN_GENTOO_PATCHSET_NUM=2
+       XEN_GENTOO_PATCHSET_BASE=4.17.0
+       XEN_PRE_PATCHSET_NUM=1
+       XEN_PRE_VERSION_BASE=4.19.0
+
+       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 uefi flask"
+REQUIRED_USE="arm? ( debug )"
+
+DEPEND="${PYTHON_DEPS}
+       uefi? ( >=sys-devel/binutils-2.22[multitarget] )
+       !uefi? ( >=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
+       use uefi && secureboot_pkg_setup
+}
+
+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 uefi; 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 uefi; 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 uefi; then
+               mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+       fi
+
+       xen_make DESTDIR="${D}" -C xen install
+
+       if use uefi; then
+               secureboot_auto_sign --in-place
+       else
+               # make install likes to throw in some extra EFI bits if it built
+               rm -rf "${D}/usr/$(get_libdir)/efi"
+       fi
+}

Reply via email to