diff mbox

fix EFI part of "symbols: Generate an xen-sym.map"

Message ID 57D17990020000780010D10A@prv-mh.provo.novell.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jan Beulich Sept. 8, 2016, 12:45 p.m. UTC 
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>
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; \

Comments

Wei Liu Sept. 8, 2016, 12:52 p.m. UTC | #1 
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; \
> 
> 
>
Konrad Rzeszutek Wilk Sept. 8, 2016, 4:21 p.m. UTC | #2 
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; \
Jan Beulich Sept. 8, 2016, 4:24 p.m. UTC | #3 
>>> 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
Douglas Goldstein Sept. 9, 2016, 3:20 p.m. UTC | #4 
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.
Wei Liu Sept. 12, 2016, 8:42 a.m. UTC | #5 
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
>
Jan Beulich Sept. 20, 2016, 2:22 p.m. UTC | #6 
>>> 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
diff mbox

Patch

--- 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; \