diff options
| author | Jan Beulich <jbeulich@novell.com> | 2011-07-01 20:42:22 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@novell.com> | 2011-07-01 20:42:22 +0100 |
| commit | 8fa9467a783e1655f4fbb12ca1f48d659115a2ea (patch) | |
| tree | 4e357f73a6d14961ab19afd8f8b49cb74bf06547 /xen/Makefile | |
| parent | d89149543d5c791af2dc43f59edc2c23b45128f6 (diff) | |
| download | xen-8fa9467a783e1655f4fbb12ca1f48d659115a2ea.tar.gz xen-8fa9467a783e1655f4fbb12ca1f48d659115a2ea.tar.bz2 xen-8fa9467a783e1655f4fbb12ca1f48d659115a2ea.zip | |
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@novell.com>
Diffstat (limited to 'xen/Makefile')
| -rw-r--r-- | xen/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/xen/Makefile b/xen/Makefile index ad52e7998e..1d74b7ad11 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -35,11 +35,16 @@ _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 -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 |