[Qemu-devel] [PULL for-2.10 0/1] bugfix for s390x

[Qemu-devel] [PULL for-2.10 0/1] bugfix for s390x

[Cornelia Huck]

The following changes since commit 83c3a1f61673ef554facf4d6d29ed56c5a219f9d:

  xlnx-qspi: add a property for mmio-execution (2017-08-14 14:17:18 +0100)

are available in the git repository at:

  git://github.com/cohuck/qemu tags/s390x-20170815

for you to fetch changes up to 88b3739acdec0b8ccdbb65425b0d31235e2c7ca3:

  pc-bios/s390-ccw: Use rm command during make clean (2017-08-15 09:06:01 +0200)

----------------------------------------------------------------
Regression fix for 'make clean' on s390x.

----------------------------------------------------------------

Eric Farman (1):
  pc-bios/s390-ccw: Use rm command during make clean

 pc-bios/s390-ccw/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.13.5

[Qemu-devel] [PULL for-2.10 1/1] pc-bios/s390-ccw: Use rm command during make clean

[Cornelia Huck]

From: Eric Farman <farman@linux.vnet.ibm.com>

This reverts a change that replaced the "rm -f" command with the
undefined variable RM (expected to be set by make), and causes the
"make clean" command to fail for a s390 target:

make[1]: Entering directory '/usr/src/qemu/build/pc-bios/s390-ccw'
rm -f *.timestamp
*.o *.d *.img *.elf *~ *.a
/bin/sh: *.o: command not found
Makefile:39: recipe for target 'clean' failed
make[1]: *** [clean] Error 127
make[1]: Leaving directory '/usr/src/qemu/build/pc-bios/s390-ccw'
Makefile:489: recipe for target 'clean' failed
make: *** [clean] Error 1

Fixes: 3e4415a751d2 ("pc-bios/s390-ccw: Add core files for the network
                      bootloading program")
Signed-off-by: Eric Farman <farman@linux.vnet.ibm.com>
Message-Id: <20170814204450.24118-2-farman@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
 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 cbae74522a..6d0c2ee691 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -36,4 +36,4 @@ s390-netboot.img:
 endif
 
 clean:
-	$(RM) *.o *.d *.img *.elf *~ *.a
+	rm -f *.o *.d *.img *.elf *~ *.a
-- 
2.13.5

Re: [Qemu-devel] [PULL for-2.10 0/1] bugfix for s390x

[Peter Maydell]

On 15 August 2017 at 08:31, Cornelia Huck <cohuck@redhat.com> wrote:
> The following changes since commit 83c3a1f61673ef554facf4d6d29ed56c5a219f9d:
>
>   xlnx-qspi: add a property for mmio-execution (2017-08-14 14:17:18 +0100)
>
> are available in the git repository at:
>
>   git://github.com/cohuck/qemu tags/s390x-20170815
>
> for you to fetch changes up to 88b3739acdec0b8ccdbb65425b0d31235e2c7ca3:
>
>   pc-bios/s390-ccw: Use rm command during make clean (2017-08-15 09:06:01 +0200)
>
> ----------------------------------------------------------------
> Regression fix for 'make clean' on s390x.
>
> ----------------------------------------------------------------
>
> Eric Farman (1):
>   pc-bios/s390-ccw: Use rm command during make clean
>
>  pc-bios/s390-ccw/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

-- PMM