commit: 66b06eccaf32f646e34c984463800b2d7e6b10a7
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 7 06:54:21 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jul 7 06:56:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66b06ecc
app-emulation/xen-tools: gitweb as patch source, bump gentoo-patches
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
app-emulation/xen-tools/Manifest | 3 ++-
app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild | 18 +++++++++++++-----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 90f6dde9ad79..bfa4bb3f3f57 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -13,4 +13,5 @@ DIST xen-4.16.1.tar.gz 44964667 BLAKE2B
190d9c330b5dcdd47bae26b6ef42111c9c63b71b
DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B
0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5
SHA512
09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49
DIST xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2 4681 BLAKE2B
59fe5c2d5f3b975f281778ee96f8771debde7ae738636fc8294e7e2578dffc40938d8c48e4e94f0341762b2ba8e1b6769f71b7783322fb3b2a0a187bbf2b5104
SHA512
8540aa3631277fb652f90c53f6f5b4e9d119a7ed267dec96d7aecca4eac2c465ec3be32b0b82057e79f858cc8115bfdfbf2af5c4879a0be3f98ed68cbe64fdae
DIST xen-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz 5289 BLAKE2B
4946056ee631ec0fa4d29f1cd643f66b491ef3ea049755d10d7b8e189f02816b990e53bffbeeeae0a61fb4e20aa877f5903a8aadfb26d0c78566a0e9fde540c7
SHA512
59d4101879bd18e828349db3814a9082b85c5ba8203ce98e5082491a9ede9c832a02ac7e4d7a0a51a52e38b72e5cce1eea6a09d6c5202e96bfe2aa4d47e12e65
-DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.gz 46026 BLAKE2B
57bca21962c9a451316f486f5db94e9c1b98b5e029a15dbd702007d573fe02571e648866c9ddbc293e53ceb5de92122b13d21e28c8879d918129134725c9ff91
SHA512
f665640fc686dfc5f718531601f66e3f30c4c8c7cb78293b6a615fe9f53a3763f2c864642a19336bb077d432b776ab1c9fa39e6fa5857ca3360e4d1b1ce63f50
+DIST xen-gentoo-patches-4.16.1-gentoo-patchset-1.tar.bz2 4351 BLAKE2B
1ba306fbc4a55aa1fea71139f7a900c8c363cf948f34a2aabd1ff6f8a68f2e632154ea0e0289580c84328b372c4f8cfdb2879bc63ae3ec163bfb29487783a758
SHA512
8d8198fbf8d9d4b46a83cf46c965448cb47b30438518a70c9b552c7cd1b23616e50f615206ddb18603e8482d19b25ccb611904c404d445898928ecf88051b70d
+DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.bz2 40645 BLAKE2B
198beb134604b221bc81fb4d32daec074a7c088c7f9bf99c2a9e98bdab2d8bf7e10c0fea9106d039de255fb209a8ac2955d1e724325a5016e6ecbdd94fbb9584
SHA512
d849418fb215a5bb9ea31ea03de6fbb8b1834d9a8e9face0bd3f20ab7bbd3a17cb13e9b3b653a3a5f06fad609b01dbcaa16f7377ead015a9d97cb8f960d0de49
diff --git a/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild
b/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild
index 8e3c152ee863..1aa03defc2a3 100644
--- a/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.16.2_pre1.ebuild
@@ -24,7 +24,7 @@ else
IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
XEN_PRE_PATCHSET_NUM=0
- XEN_GENTOO_PATCHSET_NUM=0
+ XEN_GENTOO_PATCHSET_NUM=1
XEN_PRE_VERSION_BASE=4.16.1
XEN_BASE_PV="${PV}"
@@ -46,13 +46,13 @@ else
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"
+ 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_BASE_PV})-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"
+ 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
@@ -241,6 +241,16 @@ src_prepare() {
eapply "${XEN_GENTOO_PATCHES_DIR}"
fi
+ # Rename qemu-bridge-helper to xen-bridge-helper to avoid file
+ # collisions with app-emulation/qemu.
+ sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
+ tools/qemu-xen/include/net/net.h \
+ tools/qemu-xen/meson.build \
+ tools/qemu-xen/qemu-bridge-helper.c \
+ tools/qemu-xen/qemu-options.hx \
+ || die
+ mv tools/qemu-xen/qemu-bridge-helper.c
tools/qemu-xen/xen-bridge-helper.c || die
+
if use ovmf; then
mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
rm -r
tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
@@ -272,8 +282,6 @@ src_prepare() {
echo ipxe-gcc11.patch >>
tools/firmware/etherboot/patches/series || die
fi
- mv tools/qemu-xen/qemu-bridge-helper.c
tools/qemu-xen/xen-bridge-helper.c || die
-
# Fix texi2html build error with new texi2html, qemu.doc.html
sed -i -e "/texi2html -monolithic/s/-number//"
tools/qemu-xen-traditional/Makefile || die
