* [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" @ 2016-09-08 12:45 Jan Beulich 2016-09-08 12:52 ` Wei Liu 2016-09-08 16:21 ` Konrad Rzeszutek Wilk 0 siblings, 2 replies; 15+ messages in thread From: Jan Beulich @ 2016-09-08 12:45 UTC (permalink / raw) To: xen-devel Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper, Ian Jackson, Tim Deegan [-- Attachment #1: Type: text/plain, Size: 918 bytes --] Commit 6ea24e53f1 introduced two problems: It left out a semicolon and typo-ed the source file name of the EFI map file install command. Signed-off-by: Jan Beulich <jbeulich@suse.com> --- a/xen/Makefile +++ b/xen/Makefile @@ -67,7 +67,7 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_ 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 \ + $(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \ 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; \ [-- Attachment #2: EFI-install-fix.patch --] [-- Type: text/plain, Size: 966 bytes --] fix EFI part of "symbols: Generate an xen-sym.map" Commit 6ea24e53f1 introduced two problems: It left out a semicolon and typo-ed the source file name of the EFI map file install command. Signed-off-by: Jan Beulich <jbeulich@suse.com> --- a/xen/Makefile +++ b/xen/Makefile @@ -67,7 +67,7 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_ 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 \ + $(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \ 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; \ [-- Attachment #3: Type: text/plain, Size: 127 bytes --] _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 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 1 sibling, 0 replies; 15+ messages in thread From: Wei Liu @ 2016-09-08 12:52 UTC (permalink / raw) To: Jan Beulich Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper, Ian Jackson, Tim Deegan, xen-devel On Thu, Sep 08, 2016 at 06:45:36AM -0600, Jan Beulich wrote: > Commit 6ea24e53f1 introduced two problems: It left out a semicolon and > typo-ed the source file name of the EFI map file install command. > > Signed-off-by: Jan Beulich <jbeulich@suse.com> > Acked-by: Wei Liu <wei.liu2@citrix.com> > --- a/xen/Makefile > +++ b/xen/Makefile > @@ -67,7 +67,7 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_ > 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 \ > + $(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \ > 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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 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 ` (2 more replies) 1 sibling, 3 replies; 15+ messages in thread From: Konrad Rzeszutek Wilk @ 2016-09-08 16:21 UTC (permalink / raw) To: Jan Beulich Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper, Ian Jackson, Tim Deegan, xen-devel On Thu, Sep 08, 2016 at 06:45:36AM -0600, Jan Beulich wrote: > Commit 6ea24e53f1 introduced two problems: It left out a semicolon and > typo-ed the source file name of the EFI map file install command. <sigh> I really need Fedora to start building ld with PE support. > > Signed-off-by: Jan Beulich <jbeulich@suse.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > > --- a/xen/Makefile > +++ b/xen/Makefile > @@ -67,7 +67,7 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_ > 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 \ > + $(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \ > 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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 2016-09-08 16:21 ` Konrad Rzeszutek Wilk @ 2016-09-08 16:24 ` Jan Beulich 2016-09-09 15:20 ` Doug Goldstein 2016-09-20 14:22 ` Jan Beulich 2 siblings, 0 replies; 15+ messages in thread From: Jan Beulich @ 2016-09-08 16:24 UTC (permalink / raw) To: Konrad Rzeszutek Wilk Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper, Ian Jackson, Tim Deegan, xen-devel >>> On 08.09.16 at 18:21, <konrad.wilk@oracle.com> wrote: > On Thu, Sep 08, 2016 at 06:45:36AM -0600, Jan Beulich wrote: >> Commit 6ea24e53f1 introduced two problems: It left out a semicolon and >> typo-ed the source file name of the EFI map file install command. > > <sigh> I really need Fedora to start building ld with PE support. Just build binutils yourself? Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 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 2 siblings, 1 reply; 15+ messages in thread From: Doug Goldstein @ 2016-09-09 15:20 UTC (permalink / raw) To: Konrad Rzeszutek Wilk, Jan Beulich Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper, Ian Jackson, Tim Deegan, xen-devel [-- Attachment #1.1.1: Type: text/plain, Size: 964 bytes --] On 9/8/16 11:21 AM, Konrad Rzeszutek Wilk wrote: > On Thu, Sep 08, 2016 at 06:45:36AM -0600, Jan Beulich wrote: >> Commit 6ea24e53f1 introduced two problems: It left out a semicolon and >> typo-ed the source file name of the EFI map file install command. > > <sigh> I really need Fedora to start building ld with PE support. So locally we've got a script called "containerize.sh" that uses Docker and fetches down a container and then runs whatever commands you want in that environment. This allows us to use whatever distro we want on our desktop/laptops but have 1 toolchain setup that is the blessed toolchain. Would something like this be useful to commit upstream? Not that we'd want to bless one toolchain but it would be an environment where all the dependencies are installed and its in a known good state. This also allows me to develop for Linux based projects when I'm on travel and only have my Mac with me. -- Doug Goldstein [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 959 bytes --] [-- Attachment #2: Type: text/plain, Size: 127 bytes --] _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 2016-09-09 15:20 ` Doug Goldstein @ 2016-09-12 8:42 ` Wei Liu 0 siblings, 0 replies; 15+ messages in thread From: Wei Liu @ 2016-09-12 8:42 UTC (permalink / raw) To: Doug Goldstein Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper, Ian Jackson, Tim Deegan, Jan Beulich, xen-devel On Fri, Sep 09, 2016 at 10:20:40AM -0500, Doug Goldstein wrote: > On 9/8/16 11:21 AM, Konrad Rzeszutek Wilk wrote: > > On Thu, Sep 08, 2016 at 06:45:36AM -0600, Jan Beulich wrote: > >> Commit 6ea24e53f1 introduced two problems: It left out a semicolon and > >> typo-ed the source file name of the EFI map file install command. > > > > <sigh> I really need Fedora to start building ld with PE support. > > So locally we've got a script called "containerize.sh" that uses Docker > and fetches down a container and then runs whatever commands you want in > that environment. This allows us to use whatever distro we want on our > desktop/laptops but have 1 toolchain setup that is the blessed > toolchain. Would something like this be useful to commit upstream? Not > that we'd want to bless one toolchain but it would be an environment > where all the dependencies are installed and its in a known good state. > This also allows me to develop for Linux based projects when I'm on > travel and only have my Mac with me. > Wouldn't hurt to just post your script to xen-devel IMHO. Wei. > -- > Doug Goldstein > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 2016-09-08 16:21 ` Konrad Rzeszutek Wilk 2016-09-08 16:24 ` Jan Beulich 2016-09-09 15:20 ` Doug Goldstein @ 2016-09-20 14:22 ` Jan Beulich 2016-09-21 15:59 ` Konrad Rzeszutek Wilk 2 siblings, 1 reply; 15+ messages in thread From: Jan Beulich @ 2016-09-20 14:22 UTC (permalink / raw) To: Konrad Rzeszutek Wilk Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper, Ian Jackson, Tim Deegan, xen-devel >>> On 08.09.16 at 18:21, <konrad.wilk@oracle.com> wrote: > On Thu, Sep 08, 2016 at 06:45:36AM -0600, Jan Beulich wrote: >> Commit 6ea24e53f1 introduced two problems: It left out a semicolon and >> typo-ed the source file name of the EFI map file install command. > > <sigh> I really need Fedora to start building ld with PE support. >> >> Signed-off-by: Jan Beulich <jbeulich@suse.com> > > Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> >> >> --- a/xen/Makefile >> +++ b/xen/Makefile >> @@ -67,7 +67,7 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_ >> 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 \ >> + $(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \ Sadly this has further fallout: The file being installed here does not exist in an ARM64 build. Can you please invent a fix for that? Thanks, Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 2016-09-20 14:22 ` Jan Beulich @ 2016-09-21 15:59 ` Konrad Rzeszutek Wilk 2016-09-21 16:04 ` Jan Beulich 0 siblings, 1 reply; 15+ messages in thread From: Konrad Rzeszutek Wilk @ 2016-09-21 15:59 UTC (permalink / raw) To: Jan Beulich Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper, Ian Jackson, Tim Deegan, xen-devel On Tue, Sep 20, 2016 at 08:22:01AM -0600, Jan Beulich wrote: > >>> On 08.09.16 at 18:21, <konrad.wilk@oracle.com> wrote: > > On Thu, Sep 08, 2016 at 06:45:36AM -0600, Jan Beulich wrote: > >> Commit 6ea24e53f1 introduced two problems: It left out a semicolon and > >> typo-ed the source file name of the EFI map file install command. > > > > <sigh> I really need Fedora to start building ld with PE support. > >> > >> Signed-off-by: Jan Beulich <jbeulich@suse.com> > > > > Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > >> > >> --- a/xen/Makefile > >> +++ b/xen/Makefile > >> @@ -67,7 +67,7 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_ > >> 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 \ > >> + $(INSTALL_DATA) $(TARGET).efi.map $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map; \ > > Sadly this has further fallout: The file being installed here does not > exist in an ARM64 build. Can you please invent a fix for that? From 24f37051126f04de42dee5cff24b8c05541db2d8 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] 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 latter. 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> --- xen/arch/arm/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 1d9051c..09a3518 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -72,6 +72,7 @@ $(TARGET): $(TARGET)-syms $(TARGET).axf $(OBJCOPY) -O binary -S $< $@ ifeq ($(CONFIG_ARM_64),y) ln -sf $(notdir $@) ../../$(notdir $@).efi + ln -sf $(notdir $@)-syms.map ../../$(notdir $@).efi.map endif $(TARGET).axf: $(TARGET)-syms -- 2.4.11 > > Thanks, Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 2016-09-21 15:59 ` Konrad Rzeszutek Wilk @ 2016-09-21 16:04 ` Jan Beulich 2016-09-21 16:17 ` Konrad Rzeszutek Wilk 0 siblings, 1 reply; 15+ messages in thread From: Jan Beulich @ 2016-09-21 16:04 UTC (permalink / raw) To: Konrad Rzeszutek Wilk Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper, Ian Jackson, Tim Deegan, xen-devel >>> 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. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 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 0 siblings, 2 replies; 15+ messages in thread From: Konrad Rzeszutek Wilk @ 2016-09-21 16:17 UTC (permalink / raw) To: Jan Beulich Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper, Ian Jackson, Tim Deegan, xen-devel 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. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 2016-09-21 16:17 ` Konrad Rzeszutek Wilk @ 2016-10-05 12:44 ` Jan Beulich 2016-10-07 17:57 ` Stefano Stabellini 1 sibling, 0 replies; 15+ messages in thread From: Jan Beulich @ 2016-10-05 12:44 UTC (permalink / raw) To: Julien Grall, Stefano Stabellini, Konrad Rzeszutek Wilk Cc: Wei Liu, George Dunlap, Andrew Cooper, Tim Deegan, xen-devel, Ian Jackson >>> On 21.09.16 at 18:17, <konrad.wilk@oracle.com> 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: Ping? I'd really like to see this bogus error gone from the build. Jan > 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. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 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 1 sibling, 1 reply; 15+ messages in thread From: Stefano Stabellini @ 2016-10-07 17:57 UTC (permalink / raw) To: Konrad Rzeszutek Wilk Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper, Ian Jackson, Tim Deegan, Jan Beulich, xen-devel 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> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 2016-10-07 17:57 ` Stefano Stabellini @ 2016-10-10 7:28 ` Jan Beulich 2016-10-10 18:48 ` Konrad Rzeszutek Wilk 0 siblings, 1 reply; 15+ messages in thread From: Jan Beulich @ 2016-10-10 7:28 UTC (permalink / raw) To: Stefano Stabellini, Konrad Rzeszutek Wilk Cc: Wei Liu, George Dunlap, Andrew Cooper, Tim Deegan, xen-devel, Ian Jackson >>> 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. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 2016-10-10 7:28 ` Jan Beulich @ 2016-10-10 18:48 ` Konrad Rzeszutek Wilk 2016-10-10 18:57 ` Stefano Stabellini 0 siblings, 1 reply; 15+ messages in thread From: Konrad Rzeszutek Wilk @ 2016-10-10 18:48 UTC (permalink / raw) To: Jan Beulich Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper, Ian Jackson, Tim Deegan, xen-devel 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. --- 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; \ -- 2.5.5 > > Jan > _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH] fix EFI part of "symbols: Generate an xen-sym.map" 2016-10-10 18:48 ` Konrad Rzeszutek Wilk @ 2016-10-10 18:57 ` Stefano Stabellini 0 siblings, 0 replies; 15+ messages in thread From: Stefano Stabellini @ 2016-10-10 18:57 UTC (permalink / raw) To: Konrad Rzeszutek Wilk Cc: Stefano Stabellini, Wei Liu, George Dunlap, Andrew Cooper, Ian Jackson, Tim Deegan, Jan Beulich, xen-devel 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 ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2016-10-10 18:57 UTC | newest] Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 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 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.