All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefano Stabellini <sstabellini@kernel.org>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>,
	Wei Liu <wei.liu2@citrix.com>,
	George Dunlap <George.Dunlap@eu.citrix.com>,
	Andrew Cooper <andrew.cooper3@citrix.com>,
	Ian Jackson <Ian.Jackson@eu.citrix.com>, Tim Deegan <tim@xen.org>,
	Jan Beulich <JBeulich@suse.com>,
	xen-devel <xen-devel@lists.xenproject.org>
Subject: Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map"
Date: Mon, 10 Oct 2016 11:57:42 -0700 (PDT)	[thread overview]
Message-ID: <alpine.DEB.2.10.1610101157080.4018@sstabellini-ThinkPad-X260> (raw)
In-Reply-To: <20161010184835.GA28607@char.us.oracle.com>

On Mon, 10 Oct 2016, Konrad Rzeszutek Wilk wrote:
> On Mon, Oct 10, 2016 at 01:28:16AM -0600, Jan Beulich wrote:
> > >>> On 07.10.16 at 19:57, <sstabellini@kernel.org> wrote:
> > > On Wed, 21 Sep 2016, Konrad Rzeszutek Wilk wrote:
> > >> On Wed, Sep 21, 2016 at 10:04:21AM -0600, Jan Beulich wrote:
> > >> > >>> On 21.09.16 at 17:59, <konrad.wilk@oracle.com> wrote:
> > >> > > The fix can be done two ways:
> > >> > >  a) See if xen.efi.map exists and then copy it
> > >> > >  b) Or link xen.efi.map to xen-syms.map (similar to how xen.efi is linked
> > >> > >     against xen).
> > >> > > 
> > >> > > The patch chooses the latter.
> > >> > 
> > >> > Well, if the ARM maintainers like that ... I don't really see a point in
> > >> > installing the same file twice without its second incarnation having a
> > >> > specific purpose.
> > >> 
> > >> I also have the a) part ready, which is simple:
> > >> 
> > >> 
> > >> diff --git a/xen/Makefile b/xen/Makefile
> > >> index e989a20..678f188 100644
> > >> --- a/xen/Makefile
> > >> +++ b/xen/Makefile
> > >> @@ -67,7 +67,9 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
> > >>  	if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
> > >>  		[ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \
> > >>  		$(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi; \
> > >> -		$(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \
> > >> +                if [ -e $(TARGET).efi.map ]; then \
> > >> +		        $(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \
> > >> +                fi; \
> > >>  		ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \
> > >>  		ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \
> > >>  		ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \
> > >> 
> > >> Either fix works.
> > > 
> > > This is fine.
> > > 
> > > Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> > 
> > But I hope only with indentation properly cleaned up.
> 
> Like this:
> 
> 
> >From cc3edf6c2614fa69ab1d33c38a44a10c0f4a50e8 Mon Sep 17 00:00:00 2001
> From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Date: Wed, 21 Sep 2016 11:39:44 -0400
> Subject: [PATCH v2] Makefile: fix (again) EFI part of "symbols: Generate an
>  xen-sym.map
> 
> This is a follow-up to commit d14fffcc6a7c054db9e337026a3c850152244ac4
> "fix EFI part of "symbols: Generate an xen-sym.map" which fixed most of
> the issues.
> 
> However we still have an issue - The file being installed (xen.efi.map)
> does not exist in an ARM64 build (the xen.efi is linked againts xen).
> 
> The fix can be done two ways:
>  a) See if xen.efi.map exists and then copy it
>  b) Or link xen.efi.map to xen-syms.map (similar to how xen.efi is linked
>     against xen).
> 
> The patch chooses the first.
> 
> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
> Reported-by: Jan Beulich <JBeulich@suse.com>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
> Cc: Julien Grall <julien.grall@arm.com>
> Cc: Stefano Stabellini <sstabellini@kernel.org>
> 
> v1: First submission
> v2: Use the b) instead of a) option.
>     Fix indentations.

Thanks. I had already fixed up the patch and committed it.

Cheers,

Stefano


>  xen/Makefile | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/xen/Makefile b/xen/Makefile
> index c511330..54a3bc8 100644
> --- a/xen/Makefile
> +++ b/xen/Makefile
> @@ -67,7 +67,9 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX)
>  	if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \
>  		[ -d $(D)$(EFI_DIR) ] || $(INSTALL_DIR) $(D)$(EFI_DIR); \
>  		$(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_DIR)/$(T)-$(XEN_FULLVERSION).efi; \
> -		$(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \
> +		if [ -e $(TARGET).efi.map ]; then \
> +                        $(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \
> +		fi; \
>  		ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi; \
>  		ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \
>  		ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \
 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

      reply	other threads:[~2016-10-10 18:57 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-08 12:45 [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" Jan Beulich
2016-09-08 12:52 ` Wei Liu
2016-09-08 16:21 ` Konrad Rzeszutek Wilk
2016-09-08 16:24   ` Jan Beulich
2016-09-09 15:20   ` Doug Goldstein
2016-09-12  8:42     ` Wei Liu
2016-09-20 14:22   ` Jan Beulich
2016-09-21 15:59     ` Konrad Rzeszutek Wilk
2016-09-21 16:04       ` Jan Beulich
2016-09-21 16:17         ` Konrad Rzeszutek Wilk
2016-10-05 12:44           ` Jan Beulich
2016-10-07 17:57           ` Stefano Stabellini
2016-10-10  7:28             ` Jan Beulich
2016-10-10 18:48               ` Konrad Rzeszutek Wilk
2016-10-10 18:57                 ` Stefano Stabellini [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.DEB.2.10.1610101157080.4018@sstabellini-ThinkPad-X260 \
    --to=sstabellini@kernel.org \
    --cc=George.Dunlap@eu.citrix.com \
    --cc=Ian.Jackson@eu.citrix.com \
    --cc=JBeulich@suse.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=konrad.wilk@oracle.com \
    --cc=tim@xen.org \
    --cc=wei.liu2@citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.