| 1 |
commit: fdb300ad461c96e6f555b2dec4edab4d962b85fc |
| 2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 6 17:02:22 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 6 18:48:59 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb300ad |
| 7 |
|
| 8 |
app-emulation/xen-tools: fix qemu-bridge-helper build error |
| 9 |
|
| 10 |
Also use the tarballs from gitweb.gentoo.org. |
| 11 |
|
| 12 |
Thanks to Tomáš Mózes for reporting the issue. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/856697 |
| 15 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 16 |
|
| 17 |
app-emulation/xen-tools/Manifest | 1 + |
| 18 |
app-emulation/xen-tools/xen-tools-4.15.3.ebuild | 24 +++++++++++++----------- |
| 19 |
2 files changed, 14 insertions(+), 11 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest |
| 22 |
index 448d9c3a557e..90f6dde9ad79 100644 |
| 23 |
--- a/app-emulation/xen-tools/Manifest |
| 24 |
+++ b/app-emulation/xen-tools/Manifest |
| 25 |
@@ -11,5 +11,6 @@ DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32c |
| 26 |
DIST xen-4.15.3.tar.gz 40793144 BLAKE2B 33932d855a0502cfe2768a7c8ae19d7da285d70b4970d96fd703daf0ee24a77ad47a3d1b4bcf5f465aa81aa7eb7f9295bce96302b2149ca208fa662cd966d6af SHA512 c25903cc263891885ec76500488405226c8e025bb461d2bf0d590b9bd2d7ca5c2693de7ecc38b3655bfd6793cc96314826559f14a09cc139de8cfdbeb914cbd3 |
| 27 |
DIST xen-4.16.1.tar.gz 44964667 BLAKE2B 190d9c330b5dcdd47bae26b6ef42111c9c63b71b8b92e20eae268054c6b40aaabadef78c0c9634cb3c3b1bde32a746cbb1404b5eed2a82ab829ba10632103856 SHA512 eeabba9c263cd2425bca083e32b5ebfc6c716c00553759c144fd4b6f64a89836b260787fa25ba22c1f5c4ea65aaad7c95b8c2c1070d3377b1c43c9517aa7032a |
| 28 |
DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49 |
| 29 |
+DIST xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2 4681 BLAKE2B 59fe5c2d5f3b975f281778ee96f8771debde7ae738636fc8294e7e2578dffc40938d8c48e4e94f0341762b2ba8e1b6769f71b7783322fb3b2a0a187bbf2b5104 SHA512 8540aa3631277fb652f90c53f6f5b4e9d119a7ed267dec96d7aecca4eac2c465ec3be32b0b82057e79f858cc8115bfdfbf2af5c4879a0be3f98ed68cbe64fdae |
| 30 |
DIST xen-gentoo-patches-4.16.1-gentoo-patchset-0.tar.gz 5289 BLAKE2B 4946056ee631ec0fa4d29f1cd643f66b491ef3ea049755d10d7b8e189f02816b990e53bffbeeeae0a61fb4e20aa877f5903a8aadfb26d0c78566a0e9fde540c7 SHA512 59d4101879bd18e828349db3814a9082b85c5ba8203ce98e5082491a9ede9c832a02ac7e4d7a0a51a52e38b72e5cce1eea6a09d6c5202e96bfe2aa4d47e12e65 |
| 31 |
DIST xen-upstream-patches-4.16.2-pre-patchset-0.tar.gz 46026 BLAKE2B 57bca21962c9a451316f486f5db94e9c1b98b5e029a15dbd702007d573fe02571e648866c9ddbc293e53ceb5de92122b13d21e28c8879d918129134725c9ff91 SHA512 f665640fc686dfc5f718531601f66e3f30c4c8c7cb78293b6a615fe9f53a3763f2c864642a19336bb077d432b776ab1c9fa39e6fa5857ca3360e4d1b1ce63f50 |
| 32 |
|
| 33 |
diff --git a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild |
| 34 |
index 0a779bde587e..60ce532a0998 100644 |
| 35 |
--- a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild |
| 36 |
+++ b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild |
| 37 |
@@ -24,7 +24,7 @@ else |
| 38 |
IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb" |
| 39 |
|
| 40 |
XEN_PRE_PATCHSET_NUM= |
| 41 |
- XEN_GENTOO_PATCHSET_NUM=0 |
| 42 |
+ XEN_GENTOO_PATCHSET_NUM=2 |
| 43 |
XEN_PRE_VERSION_BASE= |
| 44 |
|
| 45 |
XEN_BASE_PV="${PV}" |
| 46 |
@@ -46,13 +46,13 @@ else |
| 47 |
if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then |
| 48 |
XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}" |
| 49 |
XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}" |
| 50 |
- SRC_URI+=" https://github.com/Flowdalic/xen-upstream-patches/archive/refs/tags/${XEN_UPSTREAM_PATCHES_TAG}.tar.gz -> ${XEN_UPSTREAM_PATCHES_NAME}.tar.gz" |
| 51 |
+ SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2" |
| 52 |
XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}" |
| 53 |
fi |
| 54 |
if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then |
| 55 |
- XEN_GENTOO_PATCHES_TAG="4.16.1-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}" |
| 56 |
+ XEN_GENTOO_PATCHES_TAG="${PV}-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}" |
| 57 |
XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}" |
| 58 |
- SRC_URI+=" https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/${XEN_GENTOO_PATCHES_TAG}.tar.gz -> ${XEN_GENTOO_PATCHES_NAME}.tar.gz" |
| 59 |
+ SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2" |
| 60 |
XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}" |
| 61 |
fi |
| 62 |
fi |
| 63 |
@@ -236,16 +236,18 @@ src_prepare() { |
| 64 |
fi |
| 65 |
|
| 66 |
if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then |
| 67 |
- rm "${XEN_GENTOO_PATCHES_DIR}"/xen-tools-4.16.0-qemu-bridge.patch || die |
| 68 |
- sed -i 's/qemu-bridge-helper/xen-bridge-helper/' \ |
| 69 |
- tools/qemu-xen/include/net/net.h \ |
| 70 |
- tools/qemu-xen/meson.build \ |
| 71 |
- tools/qemu-xen/qemu-bridge-helper.c \ |
| 72 |
- tools/qemu-xen/qemu-options.hx |
| 73 |
- |
| 74 |
eapply "${XEN_GENTOO_PATCHES_DIR}" |
| 75 |
fi |
| 76 |
|
| 77 |
+ # Rename qemu-bridge-helper to xen-bridge-helper to avoid file |
| 78 |
+ # collisions with app-emulation/qemu. |
| 79 |
+ sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \ |
| 80 |
+ tools/qemu-xen/include/net/net.h \ |
| 81 |
+ tools/qemu-xen/Makefile \ |
| 82 |
+ tools/qemu-xen/qemu-bridge-helper.c \ |
| 83 |
+ tools/qemu-xen/qemu-options.hx \ |
| 84 |
+ || die |
| 85 |
+ |
| 86 |
if use ovmf; then |
| 87 |
mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die |
| 88 |
rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die |
Archives