diff options
| author |   Tomas Mozes <hydrapolic@gmail.com> | 2019-12-13 07:15:44 +0100 |
|---|---|---|
| committer |   Yixun Lan <dlan@gentoo.org> | 2019-12-13 09:46:17 +0000 |
| commit | 4ff6960975e9334ceba78d3c5d4a921b2ac7d00c (patch) | |
| tree | e2580bb82d08d2009c15f2767283709e481b5f28 /app-emulation/xen/files | |
| parent | media-libs/fidlib: amd64 stable wrt bug #702634 (diff) | |
| download | gentoo-4ff6960975e9334ceba78d3c5d4a921b2ac7d00c.tar.gz gentoo-4ff6960975e9334ceba78d3c5d4a921b2ac7d00c.tar.bz2 gentoo-4ff6960975e9334ceba78d3c5d4a921b2ac7d00c.zip | |
app-emulation/xen: bump to 4.11.3-r1
Fix XSA-{307,308,309,310,311}
Closes: https://bugs.gentoo.org/700374
Cloese: https://github.com/gentoo/gentoo/pull/13966
Bug: https://bugs.gentoo.org/702644
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Signed-off-by: Yixun Lan <dlan@gentoo.org>
Diffstat (limited to 'app-emulation/xen/files')
| -rw-r--r-- | app-emulation/xen/files/xen-4.11-efi.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/app-emulation/xen/files/xen-4.11-efi.patch b/app-emulation/xen/files/xen-4.11-efi.patch new file mode 100644 index 000000000000..c7173d91b244 --- /dev/null +++ b/app-emulation/xen/files/xen-4.11-efi.patch @@ -0,0 +1,36 @@ +diff --git a/xen/Makefile b/xen/Makefile +index af27147777..a5299b3868 100644 +--- a/xen/Makefile ++++ b/xen/Makefile +@@ -57,9 +57,15 @@ _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 ec02972f2b..628c245564 100644 +--- a/xen/arch/x86/Makefile ++++ b/xen/arch/x86/Makefile +@@ -156,7 +156,7 @@ note.o: $(TARGET)-syms + --rename-section=.data=.note.gnu.build-id -S $@.bin $@ + rm -f $@.bin + +-EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10 ++EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10 + EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug + EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20 + EFI_LDFLAGS += --major-image-version=$(XEN_VERSION) |