diff mbox

[kvm-unit-tests] powerpc: fix boot_rom.bin build

Message ID 1457038529-4577-1-git-send-email-pfeiner@google.com (mailing list archive)
State New, archived
Headers show

Commit Message

Peter Feiner March 3, 2016, 8:55 p.m. UTC
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(-)

Comments

Andrew Jones March 4, 2016, 10:31 a.m. UTC | #1
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>
--
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
Andrew Jones March 4, 2016, 3:28 p.m. UTC | #2
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
--
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
Peter Feiner March 4, 2016, 4:54 p.m. UTC | #3
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.
--
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
diff mbox

Patch

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