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 7789415808B for ; Sat, 19 Feb 2022 03:06:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C84972BC001; Sat, 19 Feb 2022 03:06:38 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF3CE2BC001 for ; Sat, 19 Feb 2022 03:06:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 95C8B343761 for ; Sat, 19 Feb 2022 03:06:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4FDF026D for ; Sat, 19 Feb 2022 03:06:36 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1645239968.bc032ce580e626d871ca0f919172c6af899180a5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/files/, app-emulation/xen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/xen/files/xen-4.16-efi.patch app-emulation/xen/xen-4.16.0-r2.ebuild app-emulation/xen/xen-4.16.0-r3.ebuild X-VCS-Directories: app-emulation/xen/ app-emulation/xen/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bc032ce580e626d871ca0f919172c6af899180a5 X-VCS-Branch: master Date: Sat, 19 Feb 2022 03:06:36 +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: 71ed7972-23c8-41ed-89da-c101486616e7 X-Archives-Hash: 0c96b1f46af25456514e41fdeb6c67a4 commit: bc032ce580e626d871ca0f919172c6af899180a5 Author: Tomáš Mózes gmail com> AuthorDate: Sat Feb 19 03:00:26 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Feb 19 03:06:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc032ce5 app-emulation/xen: re-add accidentally removed patch Closes: https://bugs.gentoo.org/833527 Signed-off-by: Tomáš Mózes gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24267 Signed-off-by: Sam James gentoo.org> app-emulation/xen/files/xen-4.16-efi.patch | 12 ++++++++++++ .../xen/{xen-4.16.0-r2.ebuild => xen-4.16.0-r3.ebuild} | 2 ++ 2 files changed, 14 insertions(+) diff --git a/app-emulation/xen/files/xen-4.16-efi.patch b/app-emulation/xen/files/xen-4.16-efi.patch new file mode 100644 index 000000000000..0de5575fc9e1 --- /dev/null +++ b/app-emulation/xen/files/xen-4.16-efi.patch @@ -0,0 +1,12 @@ +diff -urN a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile +--- a/xen/arch/x86/Makefile 2021-11-30 06:42:42.000000000 -0500 ++++ b/xen/arch/x86/Makefile 2022-02-17 07:43:06.597244620 -0500 +@@ -127,7 +127,7 @@ + CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI + + # Check if the linker supports PE. +-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 ++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 + XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(call ld-option,$(EFI_LDFLAGS) --image-base=0x100000000 -o efi/check.efi efi/check.o)) + # If the above failed, it may be merely because of the linker not dealing well + # with debug info. Try again with stripping it. diff --git a/app-emulation/xen/xen-4.16.0-r2.ebuild b/app-emulation/xen/xen-4.16.0-r3.ebuild similarity index 99% rename from app-emulation/xen/xen-4.16.0-r2.ebuild rename to app-emulation/xen/xen-4.16.0-r3.ebuild index d42ab1882530..1d8a4d366e2c 100644 --- a/app-emulation/xen/xen-4.16.0-r2.ebuild +++ b/app-emulation/xen/xen-4.16.0-r3.ebuild @@ -93,6 +93,8 @@ src_prepare() { # Gentoo's patchset [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo + eapply "${FILESDIR}"/${PN}-4.16-efi.patch + # Symlinks do not work on fat32 volumes # 829765 if ! use boot-symlinks || use efi; then eapply "${FILESDIR}"/${PN}-4.16-no-symlink.patch