kvm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [kvm-unit-tests] powerpc: fix boot_rom.bin build
@ 2016-03-03 20:55 Peter Feiner
  2016-03-04 10:31 ` Andrew Jones
  2016-03-04 17:09 ` [PATCH kvm-unit-tests v2] " Peter Feiner
  0 siblings, 2 replies; 7+ messages in thread
From: Peter Feiner @ 2016-03-03 20:55 UTC (permalink / raw)
  To: kvm, drjones, pbonzini; +Cc: pfeiner

My powerpc objcopy (version 2.23.52.20130305) did a seek() that
bash process substitution couldn't handle! I've changed the
Makefile to do things the old fashioned way.

Signed-off-by: Peter Feiner <pfeiner@google.com>
---
 powerpc/Makefile.common | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common
index 424983e..7818c48 100644
--- a/powerpc/Makefile.common
+++ b/powerpc/Makefile.common
@@ -48,7 +48,8 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive)
 
 $(TEST_DIR)/boot_rom.bin: $(TEST_DIR)/boot_rom.elf
 	dd if=/dev/zero of=$@ bs=256 count=1
-	$(OBJCOPY) -O binary $^ >(cat - >>$@)
+	$(OBJCOPY) -O binary $^ $@.suffix
+	cat $@.suffix >> $@
 
 $(TEST_DIR)/boot_rom.elf: CFLAGS = -mbig-endian
 $(TEST_DIR)/boot_rom.elf: $(TEST_DIR)/boot_rom.o
-- 
2.7.0.rc3.207.g0ac5344


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [kvm-unit-tests] powerpc: fix boot_rom.bin build
  2016-03-03 20:55 [kvm-unit-tests] powerpc: fix boot_rom.bin build Peter Feiner
@ 2016-03-04 10:31 ` Andrew Jones
  2016-03-04 15:28   ` Andrew Jones
  2016-03-04 17:09 ` [PATCH kvm-unit-tests v2] " Peter Feiner
  1 sibling, 1 reply; 7+ messages in thread
From: Andrew Jones @ 2016-03-04 10:31 UTC (permalink / raw)
  To: Peter Feiner; +Cc: kvm, pbonzini

On Thu, Mar 03, 2016 at 12:55:29PM -0800, Peter Feiner wrote:
> My powerpc objcopy (version 2.23.52.20130305) did a seek() that
> bash process substitution couldn't handle! I've changed the
> Makefile to do things the old fashioned way.
> 
> Signed-off-by: Peter Feiner <pfeiner@google.com>
> ---
>  powerpc/Makefile.common | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common
> index 424983e..7818c48 100644
> --- a/powerpc/Makefile.common
> +++ b/powerpc/Makefile.common
> @@ -48,7 +48,8 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive)
>  
>  $(TEST_DIR)/boot_rom.bin: $(TEST_DIR)/boot_rom.elf
>  	dd if=/dev/zero of=$@ bs=256 count=1
> -	$(OBJCOPY) -O binary $^ >(cat - >>$@)
> +	$(OBJCOPY) -O binary $^ $@.suffix
> +	cat $@.suffix >> $@
>  
>  $(TEST_DIR)/boot_rom.elf: CFLAGS = -mbig-endian
>  $(TEST_DIR)/boot_rom.elf: $(TEST_DIR)/boot_rom.o
> -- 
> 2.7.0.rc3.207.g0ac5344

Reviewed-by: Andrew Jones <drjones@redhat.com>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [kvm-unit-tests] powerpc: fix boot_rom.bin build
  2016-03-04 10:31 ` Andrew Jones
@ 2016-03-04 15:28   ` Andrew Jones
  2016-03-04 16:54     ` Peter Feiner
  0 siblings, 1 reply; 7+ messages in thread
From: Andrew Jones @ 2016-03-04 15:28 UTC (permalink / raw)
  To: Peter Feiner; +Cc: kvm, pbonzini

On Fri, Mar 04, 2016 at 11:31:53AM +0100, Andrew Jones wrote:
> On Thu, Mar 03, 2016 at 12:55:29PM -0800, Peter Feiner wrote:
> > My powerpc objcopy (version 2.23.52.20130305) did a seek() that
> > bash process substitution couldn't handle! I've changed the
> > Makefile to do things the old fashioned way.
> > 
> > Signed-off-by: Peter Feiner <pfeiner@google.com>
> > ---
> >  powerpc/Makefile.common | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common
> > index 424983e..7818c48 100644
> > --- a/powerpc/Makefile.common
> > +++ b/powerpc/Makefile.common
> > @@ -48,7 +48,8 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive)
> >  
> >  $(TEST_DIR)/boot_rom.bin: $(TEST_DIR)/boot_rom.elf
> >  	dd if=/dev/zero of=$@ bs=256 count=1
> > -	$(OBJCOPY) -O binary $^ >(cat - >>$@)
> > +	$(OBJCOPY) -O binary $^ $@.suffix
> > +	cat $@.suffix >> $@
> >  
> >  $(TEST_DIR)/boot_rom.elf: CFLAGS = -mbig-endian
> >  $(TEST_DIR)/boot_rom.elf: $(TEST_DIR)/boot_rom.o
> > -- 
> > 2.7.0.rc3.207.g0ac5344
> 
> Reviewed-by: Andrew Jones <drjones@redhat.com>

Actually, Unreviewed-by: drew

This leaves boot_rom.bin.suffix laying around. We need rm -f $@.suffix
too. And, why '.suffix'? How about '.tmp', or even use a tempfile?

Thanks,
drew


> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [kvm-unit-tests] powerpc: fix boot_rom.bin build
  2016-03-04 15:28   ` Andrew Jones
@ 2016-03-04 16:54     ` Peter Feiner
  0 siblings, 0 replies; 7+ messages in thread
From: Peter Feiner @ 2016-03-04 16:54 UTC (permalink / raw)
  To: Andrew Jones; +Cc: kvm, Paolo Bonzini

On Fri, Mar 4, 2016 at 7:28 AM, Andrew Jones <drjones@redhat.com> wrote:
> On Fri, Mar 04, 2016 at 11:31:53AM +0100, Andrew Jones wrote:
>> On Thu, Mar 03, 2016 at 12:55:29PM -0800, Peter Feiner wrote:
>> > My powerpc objcopy (version 2.23.52.20130305) did a seek() that
>> > bash process substitution couldn't handle! I've changed the
>> > Makefile to do things the old fashioned way.
>> >
>> > Signed-off-by: Peter Feiner <pfeiner@google.com>
>> > ---
>> >  powerpc/Makefile.common | 3 ++-
>> >  1 file changed, 2 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common
>> > index 424983e..7818c48 100644
>> > --- a/powerpc/Makefile.common
>> > +++ b/powerpc/Makefile.common
>> > @@ -48,7 +48,8 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive)
>> >
>> >  $(TEST_DIR)/boot_rom.bin: $(TEST_DIR)/boot_rom.elf
>> >     dd if=/dev/zero of=$@ bs=256 count=1
>> > -   $(OBJCOPY) -O binary $^ >(cat - >>$@)
>> > +   $(OBJCOPY) -O binary $^ $@.suffix
>> > +   cat $@.suffix >> $@
>> >
>> >  $(TEST_DIR)/boot_rom.elf: CFLAGS = -mbig-endian
>> >  $(TEST_DIR)/boot_rom.elf: $(TEST_DIR)/boot_rom.o
>> > --
>> > 2.7.0.rc3.207.g0ac5344
>>
>> Reviewed-by: Andrew Jones <drjones@redhat.com>
>
> Actually, Unreviewed-by: drew
>
> This leaves boot_rom.bin.suffix laying around. We need rm -f $@.suffix
> too. And, why '.suffix'? How about '.tmp', or even use a tempfile?

.suffix because it's the end of the file.

I don't think tempfile is necessary because, in general, a Makefile
has first refusal on the files in a directory. If you create a
boot_rom.bin.suffix and make overwrites it, it's your problem!

I'll add the rm -f.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH kvm-unit-tests v2] powerpc: fix boot_rom.bin build
  2016-03-03 20:55 [kvm-unit-tests] powerpc: fix boot_rom.bin build Peter Feiner
  2016-03-04 10:31 ` Andrew Jones
@ 2016-03-04 17:09 ` Peter Feiner
  2016-03-04 18:34   ` Andrew Jones
  2016-03-08 12:49   ` Paolo Bonzini
  1 sibling, 2 replies; 7+ messages in thread
From: Peter Feiner @ 2016-03-04 17:09 UTC (permalink / raw)
  To: kvm, drjones, pbonzini; +Cc: pfeiner

My powerpc objcopy (version 2.23.52.20130305) did a seek() that
bash process substitution couldn't handle! I've changed the
Makefile to do things the old fashioned way.

Signed-off-by: Peter Feiner <pfeiner@google.com>

---

v2:
	* rm the temporary file
	* renamed temporary file to .tmp instead of .suffix
---
 powerpc/Makefile.common | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common
index 424983e..2074289 100644
--- a/powerpc/Makefile.common
+++ b/powerpc/Makefile.common
@@ -48,7 +48,9 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive)
 
 $(TEST_DIR)/boot_rom.bin: $(TEST_DIR)/boot_rom.elf
 	dd if=/dev/zero of=$@ bs=256 count=1
-	$(OBJCOPY) -O binary $^ >(cat - >>$@)
+	$(OBJCOPY) -O binary $^ $@.tmp
+	cat $@.tmp >> $@
+	$(RM) $@.tmp
 
 $(TEST_DIR)/boot_rom.elf: CFLAGS = -mbig-endian
 $(TEST_DIR)/boot_rom.elf: $(TEST_DIR)/boot_rom.o
-- 
2.7.0.rc3.207.g0ac5344


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH kvm-unit-tests v2] powerpc: fix boot_rom.bin build
  2016-03-04 17:09 ` [PATCH kvm-unit-tests v2] " Peter Feiner
@ 2016-03-04 18:34   ` Andrew Jones
  2016-03-08 12:49   ` Paolo Bonzini
  1 sibling, 0 replies; 7+ messages in thread
From: Andrew Jones @ 2016-03-04 18:34 UTC (permalink / raw)
  To: Peter Feiner; +Cc: kvm, pbonzini

On Fri, Mar 04, 2016 at 09:09:17AM -0800, Peter Feiner wrote:
> My powerpc objcopy (version 2.23.52.20130305) did a seek() that
> bash process substitution couldn't handle! I've changed the
> Makefile to do things the old fashioned way.
> 
> Signed-off-by: Peter Feiner <pfeiner@google.com>

Reviewed-by: Andrew Jones <drjones@redhat.com>

Thanks for the v2!

drew

> 
> ---
> 
> v2:
> 	* rm the temporary file
> 	* renamed temporary file to .tmp instead of .suffix
> ---
>  powerpc/Makefile.common | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common
> index 424983e..2074289 100644
> --- a/powerpc/Makefile.common
> +++ b/powerpc/Makefile.common
> @@ -48,7 +48,9 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive)
>  
>  $(TEST_DIR)/boot_rom.bin: $(TEST_DIR)/boot_rom.elf
>  	dd if=/dev/zero of=$@ bs=256 count=1
> -	$(OBJCOPY) -O binary $^ >(cat - >>$@)
> +	$(OBJCOPY) -O binary $^ $@.tmp
> +	cat $@.tmp >> $@
> +	$(RM) $@.tmp
>  
>  $(TEST_DIR)/boot_rom.elf: CFLAGS = -mbig-endian
>  $(TEST_DIR)/boot_rom.elf: $(TEST_DIR)/boot_rom.o
> -- 
> 2.7.0.rc3.207.g0ac5344
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH kvm-unit-tests v2] powerpc: fix boot_rom.bin build
  2016-03-04 17:09 ` [PATCH kvm-unit-tests v2] " Peter Feiner
  2016-03-04 18:34   ` Andrew Jones
@ 2016-03-08 12:49   ` Paolo Bonzini
  1 sibling, 0 replies; 7+ messages in thread
From: Paolo Bonzini @ 2016-03-08 12:49 UTC (permalink / raw)
  To: Peter Feiner, kvm, drjones



On 04/03/2016 18:09, Peter Feiner wrote:
> My powerpc objcopy (version 2.23.52.20130305) did a seek() that
> bash process substitution couldn't handle! I've changed the
> Makefile to do things the old fashioned way.
> 
> Signed-off-by: Peter Feiner <pfeiner@google.com>
> 
> ---
> 
> v2:
> 	* rm the temporary file
> 	* renamed temporary file to .tmp instead of .suffix
> ---
>  powerpc/Makefile.common | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common
> index 424983e..2074289 100644
> --- a/powerpc/Makefile.common
> +++ b/powerpc/Makefile.common
> @@ -48,7 +48,9 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive)
>  
>  $(TEST_DIR)/boot_rom.bin: $(TEST_DIR)/boot_rom.elf
>  	dd if=/dev/zero of=$@ bs=256 count=1
> -	$(OBJCOPY) -O binary $^ >(cat - >>$@)
> +	$(OBJCOPY) -O binary $^ $@.tmp
> +	cat $@.tmp >> $@
> +	$(RM) $@.tmp
>  
>  $(TEST_DIR)/boot_rom.elf: CFLAGS = -mbig-endian
>  $(TEST_DIR)/boot_rom.elf: $(TEST_DIR)/boot_rom.o
> 


Applied, thanks.

Paolo

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2016-03-08 12:49 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-03 20:55 [kvm-unit-tests] powerpc: fix boot_rom.bin build Peter Feiner
2016-03-04 10:31 ` Andrew Jones
2016-03-04 15:28   ` Andrew Jones
2016-03-04 16:54     ` Peter Feiner
2016-03-04 17:09 ` [PATCH kvm-unit-tests v2] " Peter Feiner
2016-03-04 18:34   ` Andrew Jones
2016-03-08 12:49   ` Paolo Bonzini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).