Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen/files/
Date: Mon, 21 Feb 2022 18:14:53
Message-Id: 1645467285.fc1e067ca9b28eac6f420f2763c0e119920f3d59.flow@gentoo
1 commit: fc1e067ca9b28eac6f420f2763c0e119920f3d59
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Feb 20 16:11:58 2022 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 21 18:14:45 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1e067c
7
8 app-emulation/xen: remove unused patch
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/24283
13 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
14
15 app-emulation/xen/files/xen-4.14-efi.patch | 38 ------------------------------
16 1 file changed, 38 deletions(-)
17
18 diff --git a/app-emulation/xen/files/xen-4.14-efi.patch b/app-emulation/xen/files/xen-4.14-efi.patch
19 deleted file mode 100644
20 index 351e17843523..000000000000
21 --- a/app-emulation/xen/files/xen-4.14-efi.patch
22 +++ /dev/null
23 @@ -1,38 +0,0 @@
24 -diff --git a/xen/Makefile b/xen/Makefile
25 -index 0ade7f9..46c25d9 100644
26 ---- a/xen/Makefile
27 -+++ b/xen/Makefile
28 -@@ -272,9 +272,17 @@ _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 -+
36 -+ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \
37 -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
38 -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
39 -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
40 -+ else \
41 -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \
42 -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \
43 -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \
44 -+ fi;
45 -+
46 - [ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR)
47 - $(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION)
48 - $(INSTALL_DATA) $(TARGET)-syms.map $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION).map
49 -diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
50 -index 07eeefb..6b1c16b 100644
51 ---- a/xen/arch/x86/Makefile
52 -+++ b/xen/arch/x86/Makefile
53 -@@ -163,7 +163,7 @@ note.o: $(TARGET)-syms
54 - --rename-section=.data=.note.gnu.build-id -S $@.bin $@
55 - rm -f $@.bin
56 -
57 --EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10
58 -+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
59 - EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
60 - EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
61 - EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)