| Message ID | 20170814204450.24118-2-farman@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 14 Aug 2017 22:44:50 +0200 Eric Farman <farman@linux.vnet.ibm.com> wrote: > This reverts what I think was an accidental change that replaced > the "rm -f" command with an undefined variable RM, 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> > --- > 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 Thanks, applied with a tweaked commit message: pc-bios/s390-ccw: Use rm command during make clean 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: (...)
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
This reverts what I think was an accidental change that replaced the "rm -f" command with an undefined variable RM, 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> --- pc-bios/s390-ccw/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)