|
 |
c9994c1 |
--- xen-4.2.0/xen/arch/x86/Makefile.orig 2012-05-12 16:40:48.000000000 +0100
|
|
|
c9994c1 |
+++ xen-4.2.0/xen/arch/x86/Makefile 2012-08-02 21:47:39.849910608 +0100
|
|
|
c9994c1 |
@@ -126,18 +126,18 @@
|
|
|
c9994c1 |
$(TARGET).efi: guard = $(if $(shell echo efi/dis* | grep disabled),:)
|
|
|
c9994c1 |
$(TARGET).efi: prelink-efi.o efi.lds efi/relocs-dummy.o $(BASEDIR)/common/symbols-dummy.o efi/mkreloc
|
|
|
c9994c1 |
$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
|
|
|
c9994c1 |
- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
|
|
|
c9994c1 |
+ $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
|
|
|
c9994c1 |
$(BASEDIR)/common/symbols-dummy.o -o $(@D)/.$(@F).$(base).0 &&) :
|
|
|
c9994c1 |
$(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S
|
|
|
c9994c1 |
$(guard) $(NM) -n $(@D)/.$(@F).$(VIRT_BASE).0 | $(guard) $(BASEDIR)/tools/symbols >$(@D)/.$(@F).0s.S
|
|
|
c9994c1 |
$(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o
|
|
|
c9994c1 |
$(foreach base, $(VIRT_BASE) $(ALT_BASE), \
|
|
|
c9994c1 |
- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \
|
|
|
c9994c1 |
+ $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \
|
|
|
c9994c1 |
$(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o -o $(@D)/.$(@F).$(base).1 &&) :
|
|
|
c9994c1 |
$(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S
|
|
|
c9994c1 |
$(guard) $(NM) -n $(@D)/.$(@F).$(VIRT_BASE).1 | $(guard) $(BASEDIR)/tools/symbols >$(@D)/.$(@F).1s.S
|
|
|
c9994c1 |
$(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o
|
|
|
c9994c1 |
- $(guard) $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \
|
|
|
c9994c1 |
+ $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \
|
|
|
c9994c1 |
$(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o -o $@
|
|
|
c9994c1 |
if $(guard) false; then rm -f $@; echo 'EFI support disabled'; fi
|
|
|
c9994c1 |
rm -f $(@D)/.$(@F).[0-9]*
|
|
|
c9994c1 |
--- xen-4.2.0/xen/arch/x86/efi/Makefile.orig 2012-05-12 16:40:48.000000000 +0100
|
|
|
c9994c1 |
+++ xen-4.2.0/xen/arch/x86/efi/Makefile 2012-08-02 22:01:43.956357825 +0100
|
|
|
c9994c1 |
@@ -6,7 +6,7 @@
|
|
|
c9994c1 |
|
|
|
c9994c1 |
efi := $(filter y,$(x86_64)$(shell rm -f disabled))
|
|
|
a4a0b81 |
efi := $(if $(efi),$(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c check.c 2>disabled && echo y))
|
|
|
c9994c1 |
-efi := $(if $(efi),$(shell $(LD) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y))
|
|
|
c9994c1 |
+efi := $(if $(efi),$(shell $(LD_EFI) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y))
|
|
|
c9994c1 |
efi := $(if $(efi),$(shell rm disabled)y,$(shell $(call create,boot.init.o); $(call create,runtime.o)))
|
|
|
c9994c1 |
|
|
|
c9994c1 |
extra-$(efi) += boot.init.o relocs-dummy.o runtime.o compat.o
|
|
|
c9994c1 |
--- xen-4.2.0/xen/Makefile.orig 2012-07-30 19:21:20.000000000 +0100
|
|
|
c9994c1 |
+++ xen-4.2.0/xen/Makefile 2012-08-02 22:07:22.801121685 +0100
|
|
|
c9994c1 |
@@ -13,6 +13,8 @@
|
|
|
c9994c1 |
export XEN_ROOT := $(BASEDIR)/..
|
|
|
c9994c1 |
|
|
|
c9994c1 |
EFI_MOUNTPOINT ?= /boot/efi
|
|
|
c9994c1 |
+EFI_VENDOR=fedora
|
|
|
c9994c1 |
+LD_EFI ?= $(LD)
|
|
|
c9994c1 |
|
|
|
c9994c1 |
.PHONY: default
|
|
|
c9994c1 |
default: build
|