From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Wilson Subject: Re: [PATCH] x86/EFI: define and use EFI_DIR make variable, defaulting to /usr/lib64/efi Date: Fri, 20 Jul 2012 11:52:23 -0700 Message-ID: <20120720185223.GA4380@US-SEA-R8XVZTX> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich Cc: Olaf Hering , "xen-devel@lists.xen.org" List-Id: xen-devel@lists.xenproject.org On Mon, Jul 16, 2012 at 04:50:33PM -0700, Wilson, Matt wrote: > > x86/EFI: define and use EFI_DIR make variable, defaulting to /usr/lib64/efi > > After commit 25594:ad08cd8e7097, EFI Xen binaries were installed to > /efi instead of /usr/lib64/efi. This patch restores the previous > behviour established in commit 23645:638f31a30b6c. > > Signed-off-by: Matt Wilson > Reported-by: Olaf Hering Olaf, can you give this a test? Matt > diff -r 9950f2dc2ee6 -r dd1ab0cae2c8 Config.mk > --- a/Config.mk Mon Jul 09 10:10:27 2012 +0100 > +++ b/Config.mk Mon Jul 16 23:37:16 2012 +0000 > @@ -48,6 +48,7 @@ SHAREDIR ?= $(PREFIX)/share > DOCDIR ?= $(SHAREDIR)/doc/xen > MANDIR ?= $(SHAREDIR)/man > BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d > +EFI_DIR ?= /usr/lib64/efi > > # arguments: variable, common path part, path to test, if yes, if no > define setvar_dir > diff -r 9950f2dc2ee6 -r dd1ab0cae2c8 docs/misc/efi.markdown > --- a/docs/misc/efi.markdown Mon Jul 09 10:10:27 2012 +0100 > +++ b/docs/misc/efi.markdown Mon Jul 16 23:37:16 2012 +0000 > @@ -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 the 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 9950f2dc2ee6 -r dd1ab0cae2c8 xen/Makefile > --- a/xen/Makefile Mon Jul 09 10:10:27 2012 +0100 > +++ b/xen/Makefile Mon Jul 16 23:37:16 2012 +0000 > @@ -36,11 +36,11 @@ build install debug clean distclean csco > 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; \ > + [ -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-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel