[Xen-changelog] [xen-unstable] Merge

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1343235399 -3600
# Node ID a955d722c2e3366d7776be7f2ec0c436f5f9aee4
# Parent  be2ca8280da9709248d606c057afe27a46117943
# Parent  663eb766cdde864cd8c8b9037677a07a56bb0290
Merge
---


diff -r be2ca8280da9 -r a955d722c2e3 config/x86_64.mk
--- a/config/x86_64.mk  Wed Jul 25 17:39:23 2012 +0100
+++ b/config/x86_64.mk  Wed Jul 25 17:56:39 2012 +0100
@@ -12,6 +12,8 @@ CFLAGS += -m64
 
 SunOS_LIBDIR = $(SunOS_LIBDIR_x86_64)
 
+EFI_DIR ?= /usr/lib64/efi
+
 # Use only if calling $(LD) directly.
 ifeq ($(XEN_OS),OpenBSD)
 LDFLAGS_DIRECT += -melf_x86_64_obsd
diff -r be2ca8280da9 -r a955d722c2e3 docs/misc/efi.markdown
--- a/docs/misc/efi.markdown    Wed Jul 25 17:39:23 2012 +0100
+++ b/docs/misc/efi.markdown    Wed Jul 25 17:56:39 2012 +0100
@@ -4,10 +4,12 @@ newer. Additionally, the binutils build 
 for the x86_64-pep emulation (i.e. `--enable-targets=x86_64-pep` or an option
 of equivalent effect should be passed to the configure script).
 
-Once built, `make install-xen` can place the resulting binary directly into
+Once built, `make install-xen` will place the resulting binary directly into
 the EFI boot partition, provided `EFI_VENDOR` is set in the environment (and
 `EFI_MOUNTPOINT` is overridden as needed, should the default of `/boot/efi` not
-match your system).
+match your system). The xen.efi binary will also be installed in
+`/usr/lib64/efi/`, unless `EFI_DIR` is set in the environment to override this
+default.
 
 The binary itself will require a configuration file (names with the `.efi`
 extension of the binary's name replaced by `.cfg`, and - until an existing
diff -r be2ca8280da9 -r a955d722c2e3 xen/Makefile
--- a/xen/Makefile      Wed Jul 25 17:39:23 2012 +0100
+++ b/xen/Makefile      Wed Jul 25 17:56:39 2012 +0100
@@ -35,12 +35,12 @@ _install: $(TARGET).gz
        ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz 
$(DESTDIR)/boot/$(notdir $(TARGET))-$(XEN_VERSION).gz
        ln -f -s $(notdir $(TARGET))-$(XEN_FULLVERSION).gz 
$(DESTDIR)/boot/$(notdir $(TARGET)).gz
        $(INSTALL_DATA) $(TARGET)-syms $(DESTDIR)/boot/$(notdir 
$(TARGET))-syms-$(XEN_FULLVERSION)
-       if [ -r $(TARGET).efi ]; then \
-               [ -d $(DESTDIR)$(LIBDIR)/efi ] || $(INSTALL_DIR) 
$(DESTDIR)$(LIBDIR)/efi; \
-               $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(LIBDIR)/efi/$(notdir 
$(TARGET))-$(XEN_FULLVERSION).efi; \
-               ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi 
$(DESTDIR)$(LIBDIR)/efi/$(notdir 
$(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \
-               ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi 
$(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET))-$(XEN_VERSION).efi; \
-               ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi 
$(DESTDIR)$(LIBDIR)/efi/$(notdir $(TARGET)).efi; \
+       if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
+               [ -d $(DESTDIR)$(EFI_DIR) ] || $(INSTALL_DIR) 
$(DESTDIR)$(EFI_DIR); \
+               $(INSTALL_DATA) $(TARGET).efi $(DESTDIR)$(EFI_DIR)/$(notdir 
$(TARGET))-$(XEN_FULLVERSION).efi; \
+               ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi 
$(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \
+               ln -sf $(notdir $(TARGET))-$(XEN_FULLVERSION).efi 
$(DESTDIR)$(EFI_DIR)/$(notdir $(TARGET))-$(XEN_VERSION).efi; \
+               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 [ "$(DESTDIR)" = "$(patsubst $(shell cd $(XEN_ROOT) && 
pwd)/%,%,$(DESTDIR))" ]; then \

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog