[Xen-changelog] [xen-unstable] x86/EFI: adjust installation logic

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxxxx>
# Date 1309549342 -3600
# Node ID 638f31a30b6ccb3fe26f79b991bed4cd03995809
# Parent  7631c461132000979f05759705c055eb3c975c0b
x86/EFI: adjust installation logic

We should always install xen.efi into /usr/lib64/efi/; installation
into /boot/efi/efi/$(EFI_VENDOR) remains dependent upon specifying
EFI_VENDOR.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---


diff -r 7631c4611320 -r 638f31a30b6c xen/Makefile
--- a/xen/Makefile      Fri Jul 01 20:41:43 2011 +0100
+++ b/xen/Makefile      Fri Jul 01 20:42:22 2011 +0100
@@ -35,11 +35,16 @@
        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 -a -n "$(EFI_MOUNTPOINT)" ]; then \
-               if [ -n '$(EFI_VENDOR)' ]; then \
+       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 [ -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 \
-                       echo 'EFI installation not done (EFI_VENDOR not set)' 
>&2; \
+                       echo 'EFI installation only partially done (EFI_VENDOR 
not set)' >&2; \
                fi; \
        fi
 

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