diff options
| author |   Michael Mair-Keimberger <mmk@levelnine.at> | 2023-09-05 11:16:27 +0200 |
|---|---|---|
| committer |   Arthur Zamarin <arthurzam@gentoo.org> | 2023-09-09 21:02:19 +0300 |
| commit | e6532325c5b3efe4778b2843576b48c2c9e17475 (patch) | |
| tree | d9f718018b244dde950362d2ae2741fba1d0a11a | |
| parent | app-emulation/xen-tools: remove unused patch (diff) | |
| download | gentoo-e6532325c5b3efe4778b2843576b48c2c9e17475.tar.gz gentoo-e6532325c5b3efe4778b2843576b48c2c9e17475.tar.bz2 gentoo-e6532325c5b3efe4778b2843576b48c2c9e17475.zip | |
app-emulation/xen: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32619
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
| -rw-r--r-- | app-emulation/xen/files/xen-4.15-efi.patch | 38 | ||||
| -rw-r--r-- | app-emulation/xen/files/xen-4.15-flask.patch | 13 |
2 files changed, 0 insertions, 51 deletions
diff --git a/app-emulation/xen/files/xen-4.15-efi.patch b/app-emulation/xen/files/xen-4.15-efi.patch deleted file mode 100644 index 01133e98dde3..000000000000 --- a/app-emulation/xen/files/xen-4.15-efi.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/xen/Makefile b/xen/Makefile -index acb2d28..b9dbd9c 100644 ---- a/xen/Makefile -+++ b/xen/Makefile -@@ -272,9 +272,17 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX) - _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) - [ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR) - $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z) -- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z) -- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z) -- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z) -+ -+ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \ -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \ -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \ -+ else \ -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \ -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \ -+ fi; -+ - [ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR) - $(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION) - $(INSTALL_DATA) $(TARGET)-syms.map $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION).map -diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile -index b6567c4..0320a4a 100644 ---- a/xen/arch/x86/Makefile -+++ b/xen/arch/x86/Makefile -@@ -123,7 +123,7 @@ ifneq ($(efi-y),) - # Check if the compiler supports the MS ABI. - export XEN_BUILD_EFI := $(shell $(CC) $(XEN_CFLAGS) -c efi/check.c -o efi/check.o 2>/dev/null && echo y) - # Check if the linker supports PE. --EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 --strip-debug -+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 --strip-debug - XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) $(EFI_LDFLAGS) -o efi/check.efi efi/check.o 2>/dev/null && echo y)) - CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI - # Check if the linker produces fixups in PE by default (we need to disable it doing so for now). diff --git a/app-emulation/xen/files/xen-4.15-flask.patch b/app-emulation/xen/files/xen-4.15-flask.patch deleted file mode 100644 index 7dcf91b30fc1..000000000000 --- a/app-emulation/xen/files/xen-4.15-flask.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/xen/common/Kconfig b/xen/common/Kconfig -index eb953d1..78f058c 100644 ---- a/xen/common/Kconfig -+++ b/xen/common/Kconfig -@@ -198,7 +198,7 @@ config XENOPROF - - config XSM - bool "Xen Security Modules support" -- default ARM -+ default y - ---help--- - Enables the security framework known as Xen Security Modules which - allows administrators fine-grained control over a Xen domain and |