diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2013-02-24 08:23:59 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2013-02-24 08:23:59 +0000 |
| commit | ac22335564735d89ef73319cf2d178fa78353c05 (patch) | |
| tree | c8aa2039f5b0abc3a0c7cf3687714ef0da47e7ee /app-emulation/xen/files | |
| parent | Mark stable for amd64 wrt #458444 (diff) | |
| download | gentoo-2-ac22335564735d89ef73319cf2d178fa78353c05.tar.gz gentoo-2-ac22335564735d89ef73319cf2d178fa78353c05.tar.bz2 gentoo-2-ac22335564735d89ef73319cf2d178fa78353c05.zip | |
After further review, reverted both -r1 ebuilds, revbumped both to -r2, fixed deps and install, reduced efi.patch accordingly and re-named to xen-4.2-efi.patch, all wrt Bug #458160
(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Diffstat (limited to 'app-emulation/xen/files')
| -rw-r--r-- | app-emulation/xen/files/xen-4-efi.patch | 34 | ||||
| -rw-r--r-- | app-emulation/xen/files/xen-4.2-efi.patch | 13 |
2 files changed, 13 insertions, 34 deletions
diff --git a/app-emulation/xen/files/xen-4-efi.patch b/app-emulation/xen/files/xen-4-efi.patch deleted file mode 100644 index ccffab2cd8e0..000000000000 --- a/app-emulation/xen/files/xen-4-efi.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur xen-4.2.0.orig/xen/arch/x86/Makefile xen-4.2.0/xen/arch/x86/Makefile ---- xen/arch/x86/Makefile 2012-09-17 18:21:19.000000000 +0800 -+++ xen/arch/x86/Makefile 2013-02-23 20:37:30.679918815 +0800 -@@ -112,7 +112,7 @@ - $(@D)/.$(@F).1.o -o $@ - rm -f $(@D)/.$(@F).[0-9]* - --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) -diff -ur xen-4.2.0.orig/xen/Makefile xen-4.2.0/xen/Makefile ---- xen/Makefile 2012-09-17 18:21:19.000000000 +0800 -+++ xen/Makefile 2013-02-23 21:26:41.396771995 +0800 -@@ -12,7 +12,7 @@ - export BASEDIR := $(CURDIR) - export XEN_ROOT := $(BASEDIR)/.. - --EFI_MOUNTPOINT ?= /boot/efi -+export EFI_MOUNTPOINT = /boot/efi - - .PHONY: default - default: build -@@ -43,6 +43,8 @@ - ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET)).efi; \ - if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \ - $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ -+ elif [ -n '$(EFI_MOUNTPOINT)' ]; then \ -+ $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_MOUNTPOINT)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \ - elif [ "$(DESTDIR)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(DESTDIR))" ]; then \ - echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \ - fi; \ - diff --git a/app-emulation/xen/files/xen-4.2-efi.patch b/app-emulation/xen/files/xen-4.2-efi.patch new file mode 100644 index 000000000000..2d0b7d7d143a --- /dev/null +++ b/app-emulation/xen/files/xen-4.2-efi.patch @@ -0,0 +1,13 @@ +diff -ur xen-4.2.0.orig/xen/arch/x86/Makefile xen-4.2.0/xen/arch/x86/Makefile +--- xen/arch/x86/Makefile 2012-09-17 18:21:19.000000000 +0800 ++++ xen/arch/x86/Makefile 2013-02-23 20:37:30.679918815 +0800 +@@ -112,7 +112,7 @@ + $(@D)/.$(@F).1.o -o $@ + rm -f $(@D)/.$(@F).[0-9]* + +-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) + |