Gentoo Archives: gentoo-commits

From: "Ian Delaney (idella4)" <idella4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/xen/files: xen-4-efi.patch
Date: Sat, 23 Feb 2013 16:34:09
Message-Id: 20130223163406.B95052171F@flycatcher.gentoo.org
1 idella4 13/02/23 16:34:06
2
3 Added: xen-4-efi.patch
4 Log:
5 local efi IUSE flag added, efi support to both 4.2.0 & 4.2.1, fixes Bug #458160 by Jiří Moravec
6
7 (Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
8
9 Revision Changes Path
10 1.1 app-emulation/xen/files/xen-4-efi.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/files/xen-4-efi.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen/files/xen-4-efi.patch?rev=1.1&content-type=text/plain
14
15 Index: xen-4-efi.patch
16 ===================================================================
17 diff -ur xen-4.2.0.orig/xen/arch/x86/Makefile xen-4.2.0/xen/arch/x86/Makefile
18 --- xen/arch/x86/Makefile 2012-09-17 18:21:19.000000000 +0800
19 +++ xen/arch/x86/Makefile 2013-02-23 20:37:30.679918815 +0800
20 @@ -112,7 +112,7 @@
21 $(@D)/.$(@F).1.o -o $@
22 rm -f $(@D)/.$(@F).[0-9]*
23
24 -EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
25 +EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10
26 EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug
27 EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20
28 EFI_LDFLAGS += --major-image-version=$(XEN_VERSION)
29 diff -ur xen-4.2.0.orig/xen/Makefile xen-4.2.0/xen/Makefile
30 --- xen/Makefile 2012-09-17 18:21:19.000000000 +0800
31 +++ xen/Makefile 2013-02-23 21:26:41.396771995 +0800
32 @@ -12,7 +12,7 @@
33 export BASEDIR := $(CURDIR)
34 export XEN_ROOT := $(BASEDIR)/..
35
36 -EFI_MOUNTPOINT ?= /boot/efi
37 +export EFI_MOUNTPOINT = /boot/efi
38
39 .PHONY: default
40 default: build
41 @@ -43,6 +43,8 @@
42 ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi $(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET)).efi; \
43 if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \
44 $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \
45 + elif [ -n '$(EFI_MOUNTPOINT)' ]; then \
46 + $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_MOUNTPOINT)/$(notdir $(TARGET))-$(XEN_FULLVERSION).efi; \
47 elif [ "$(DESTDIR)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(DESTDIR))" ]; then \
48 echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \
49 fi; \