1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH] pc-bios/s390-ccw: use STRIP variable in Makefile

Greg Kurz posted 1 patch 6 years, 10 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/149615665491.28067.17765793725374594694.stgit@bahia.lan
Test checkpatch passed
Test docker passed
Test s390x passed
There is a newer version of this series
pc-bios/s390-ccw/Makefile |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[Qemu-devel] [PATCH] pc-bios/s390-ccw: use STRIP variable in Makefile
Posted by Greg Kurz 6 years, 10 months ago 
The docker-run-test-build@debian-s390x-cross target fails with:

strip --strip-unneeded s390-ccw.elf -o s390-ccw.img
strip: Unable to recognise the format of the input file `s390-ccw.elf'

The configure script defines a STRIP makefile variable whose default
value is ${cross_prefix}strip. Let's use it.

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 pc-bios/s390-ccw/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index 79a46b67356f..7af57dad109c 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -22,7 +22,7 @@ s390-ccw.elf: $(OBJECTS)
 	$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),"BUILD","$(TARGET_DIR)$@")
 
 s390-ccw.img: s390-ccw.elf
-	$(call quiet-command,strip --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
+	$(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
 
 $(OBJECTS): Makefile
Re: [Qemu-devel] [Qemu-trivial] [PATCH] pc-bios/s390-ccw: use STRIP variable in Makefile
Posted by Philippe Mathieu-Daudé 6 years, 10 months ago 
On 05/30/2017 12:04 PM, Greg Kurz wrote:
> The docker-run-test-build@debian-s390x-cross target fails with:
>
> strip --strip-unneeded s390-ccw.elf -o s390-ccw.img
> strip: Unable to recognise the format of the input file `s390-ccw.elf'
>
> The configure script defines a STRIP makefile variable whose default
> value is ${cross_prefix}strip. Let's use it.
>
> Signed-off-by: Greg Kurz <groug@kaod.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  pc-bios/s390-ccw/Makefile |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
> index 79a46b67356f..7af57dad109c 100644
> --- a/pc-bios/s390-ccw/Makefile
> +++ b/pc-bios/s390-ccw/Makefile
> @@ -22,7 +22,7 @@ s390-ccw.elf: $(OBJECTS)
>  	$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),"BUILD","$(TARGET_DIR)$@")
>
>  s390-ccw.img: s390-ccw.elf
> -	$(call quiet-command,strip --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
> +	$(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
>
>  $(OBJECTS): Makefile
>
>
>
Re: [Qemu-devel] [PATCH] pc-bios/s390-ccw: use STRIP variable in Makefile
Posted by Christian Borntraeger 6 years, 10 months ago 
On 05/30/2017 05:04 PM, Greg Kurz wrote:
> The docker-run-test-build@debian-s390x-cross target fails with:
> 
> strip --strip-unneeded s390-ccw.elf -o s390-ccw.img
> strip: Unable to recognise the format of the input file `s390-ccw.elf'
> 
> The configure script defines a STRIP makefile variable whose default
> value is ${cross_prefix}strip. Let's use it.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
>  pc-bios/s390-ccw/Makefile |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
> index 79a46b67356f..7af57dad109c 100644
> --- a/pc-bios/s390-ccw/Makefile
> +++ b/pc-bios/s390-ccw/Makefile
> @@ -22,7 +22,7 @@ s390-ccw.elf: $(OBJECTS)
>  	$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),"BUILD","$(TARGET_DIR)$@")
> 
>  s390-ccw.img: s390-ccw.elf
> -	$(call quiet-command,strip --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
> +	$(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
> 
>  $(OBJECTS): Makefile
> 
> 

I was going to apply this, but it fails with --disable-strip like

    /bin/sh: --strip-unneeded: command not found
    Makefile:25: recipe for target 's390-ccw.img' failed
    make[1]: *** [s390-ccw.img] Error 127
    Makefile:354: recipe for target 'romsubdir-s390-ccw' failed
    make: *** [romsubdir-s390-ccw] Error 2

Not yet sure whats going on.
Re: [Qemu-devel] [PATCH] pc-bios/s390-ccw: use STRIP variable in Makefile
Posted by Greg Kurz 6 years, 10 months ago 
On Tue, 30 May 2017 18:34:46 +0200
Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> On 05/30/2017 05:04 PM, Greg Kurz wrote:
> > The docker-run-test-build@debian-s390x-cross target fails with:
> > 
> > strip --strip-unneeded s390-ccw.elf -o s390-ccw.img
> > strip: Unable to recognise the format of the input file `s390-ccw.elf'
> > 
> > The configure script defines a STRIP makefile variable whose default
> > value is ${cross_prefix}strip. Let's use it.
> > 
> > Signed-off-by: Greg Kurz <groug@kaod.org>
> > ---
> >  pc-bios/s390-ccw/Makefile |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
> > index 79a46b67356f..7af57dad109c 100644
> > --- a/pc-bios/s390-ccw/Makefile
> > +++ b/pc-bios/s390-ccw/Makefile
> > @@ -22,7 +22,7 @@ s390-ccw.elf: $(OBJECTS)
> >  	$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),"BUILD","$(TARGET_DIR)$@")
> > 
> >  s390-ccw.img: s390-ccw.elf
> > -	$(call quiet-command,strip --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
> > +	$(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
> > 
> >  $(OBJECTS): Makefile
> > 
> >   
> 
> I was going to apply this, but it fails with --disable-strip like
> 
>     /bin/sh: --strip-unneeded: command not found
>     Makefile:25: recipe for target 's390-ccw.img' failed
>     make[1]: *** [s390-ccw.img] Error 127
>     Makefile:354: recipe for target 'romsubdir-s390-ccw' failed
>     make: *** [romsubdir-s390-ccw] Error 2
> 
> Not yet sure whats going on.
> 

configure doesn't generate STRIP when --disable-strip or --enable-debug... so
I guess we shouldn't use it here, but rather generate a s390_cross_prefix like
in roms/Makefile ?
Re: [Qemu-devel] [Qemu-trivial] [PATCH] pc-bios/s390-ccw: use STRIP variable in Makefile
Posted by Laurent Vivier 6 years, 10 months ago 
On 30/05/2017 18:56, Greg Kurz wrote:
> On Tue, 30 May 2017 18:34:46 +0200
> Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> 
>> On 05/30/2017 05:04 PM, Greg Kurz wrote:
>>> The docker-run-test-build@debian-s390x-cross target fails with:
>>>
>>> strip --strip-unneeded s390-ccw.elf -o s390-ccw.img
>>> strip: Unable to recognise the format of the input file `s390-ccw.elf'
>>>
>>> The configure script defines a STRIP makefile variable whose default
>>> value is ${cross_prefix}strip. Let's use it.
>>>
>>> Signed-off-by: Greg Kurz <groug@kaod.org>
>>> ---
>>>  pc-bios/s390-ccw/Makefile |    2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
>>> index 79a46b67356f..7af57dad109c 100644
>>> --- a/pc-bios/s390-ccw/Makefile
>>> +++ b/pc-bios/s390-ccw/Makefile
>>> @@ -22,7 +22,7 @@ s390-ccw.elf: $(OBJECTS)
>>>  	$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),"BUILD","$(TARGET_DIR)$@")
>>>
>>>  s390-ccw.img: s390-ccw.elf
>>> -	$(call quiet-command,strip --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
>>> +	$(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
>>>
>>>  $(OBJECTS): Makefile
>>>
>>>   
>>
>> I was going to apply this, but it fails with --disable-strip like
>>
>>     /bin/sh: --strip-unneeded: command not found
>>     Makefile:25: recipe for target 's390-ccw.img' failed
>>     make[1]: *** [s390-ccw.img] Error 127
>>     Makefile:354: recipe for target 'romsubdir-s390-ccw' failed
>>     make: *** [romsubdir-s390-ccw] Error 2
>>
>> Not yet sure whats going on.
>>
> 
> configure doesn't generate STRIP when --disable-strip or --enable-debug... so
> I guess we shouldn't use it here, but rather generate a s390_cross_prefix like
> in roms/Makefile ?
> 

I experimented the problem when I played with docker, and fixed the
problem as you did (with STRIP).

But I think it's a good idea to compile s390 rom as it is done for ppc64
and ppc roms.

Laurent
Re: [Qemu-devel] [Qemu-trivial] [PATCH] pc-bios/s390-ccw: use STRIP variable in Makefile
Posted by Greg Kurz 6 years, 10 months ago 
On Wed, 31 May 2017 15:15:56 +0200
Laurent Vivier <lvivier@redhat.com> wrote:

> On 30/05/2017 18:56, Greg Kurz wrote:
> > On Tue, 30 May 2017 18:34:46 +0200
> > Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> >   
> >> On 05/30/2017 05:04 PM, Greg Kurz wrote:  
> >>> The docker-run-test-build@debian-s390x-cross target fails with:
> >>>
> >>> strip --strip-unneeded s390-ccw.elf -o s390-ccw.img
> >>> strip: Unable to recognise the format of the input file `s390-ccw.elf'
> >>>
> >>> The configure script defines a STRIP makefile variable whose default
> >>> value is ${cross_prefix}strip. Let's use it.
> >>>
> >>> Signed-off-by: Greg Kurz <groug@kaod.org>
> >>> ---
> >>>  pc-bios/s390-ccw/Makefile |    2 +-
> >>>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
> >>> index 79a46b67356f..7af57dad109c 100644
> >>> --- a/pc-bios/s390-ccw/Makefile
> >>> +++ b/pc-bios/s390-ccw/Makefile
> >>> @@ -22,7 +22,7 @@ s390-ccw.elf: $(OBJECTS)
> >>>  	$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),"BUILD","$(TARGET_DIR)$@")
> >>>
> >>>  s390-ccw.img: s390-ccw.elf
> >>> -	$(call quiet-command,strip --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
> >>> +	$(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@")
> >>>
> >>>  $(OBJECTS): Makefile
> >>>
> >>>     
> >>
> >> I was going to apply this, but it fails with --disable-strip like
> >>
> >>     /bin/sh: --strip-unneeded: command not found
> >>     Makefile:25: recipe for target 's390-ccw.img' failed
> >>     make[1]: *** [s390-ccw.img] Error 127
> >>     Makefile:354: recipe for target 'romsubdir-s390-ccw' failed
> >>     make: *** [romsubdir-s390-ccw] Error 2
> >>
> >> Not yet sure whats going on.
> >>  
> > 
> > configure doesn't generate STRIP when --disable-strip or --enable-debug... so
> > I guess we shouldn't use it here, but rather generate a s390_cross_prefix like
> > in roms/Makefile ?
> >   
> 
> I experimented the problem when I played with docker, and fixed the
> problem as you did (with STRIP).
> 

I've sent a v2 with a 'STRIP ?= strip' line to handle the issue reported
by Christian.

> But I think it's a good idea to compile s390 rom as it is done for ppc64
> and ppc roms.
> 

Yeah, I was thinking about that too but I don't know all the ins and outs.

> Laurent

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.