Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/files/
Date: Mon, 19 Jul 2021 08:44:17
Message-Id: 1626684223.876ab7ed11bd125783fdb0708ff61780edf9b7d4.ionen@gentoo
1 commit: 876ab7ed11bd125783fdb0708ff61780edf9b7d4
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Jul 18 19:14:28 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 19 08:43:43 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876ab7ed
7
8 app-emulation/xen: remove unused patch
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/21708
13 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
14
15 app-emulation/xen/files/xen-4.11-efi.patch | 36 ------------------------------
16 1 file changed, 36 deletions(-)
17
18 diff --git a/app-emulation/xen/files/xen-4.11-efi.patch b/app-emulation/xen/files/xen-4.11-efi.patch
19 deleted file mode 100644
20 index c7173d91b24..00000000000
21 --- a/app-emulation/xen/files/xen-4.11-efi.patch
22 +++ /dev/null
23 @@ -1,36 +0,0 @@
24 -diff --git a/xen/Makefile b/xen/Makefile
25 -index af27147777..a5299b3868 100644
26 ---- a/xen/Makefile
27 -+++ b/xen/Makefile
28 -@@ -57,9 +57,15 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX)
29 - _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
30 - [ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR)
31 - $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z)
32 -- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z)
33 -- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z)
34 -- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z)
35 -+ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \
36 -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
37 -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
38 -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
39 -+ else \
40 -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
41 -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
42 -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
43 -+ fi;
44 - [ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR)
45 - $(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION)
46 - $(INSTALL_DATA) $(TARGET)-syms.map $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION).map
47 -diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
48 -index ec02972f2b..628c245564 100644
49 ---- a/xen/arch/x86/Makefile
50 -+++ b/xen/arch/x86/Makefile
51 -@@ -156,7 +156,7 @@ note.o: $(TARGET)-syms
52 - --rename-section=.data=.note.gnu.build-id -S $@.bin $@
53 - rm -f $@.bin
54 -
55 --EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
56 -+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
57 - EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
58 - EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
59 - EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)