[PATCH] tools/firmware: Fix typo in uninstall target

Hubert Jasudowicz posted 1 patch 3 years, 8 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/xen tags/patchew/4a2e7aa6edba3d4130a80a7cd7e230f03c91ce6b.1597778748.git.hubert.jasudowicz@cert.pl
Maintainers: Wei Liu <wl@xen.org>, Ian Jackson <ian.jackson@eu.citrix.com>
tools/firmware/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] tools/firmware: Fix typo in uninstall target
Posted by Hubert Jasudowicz 3 years, 8 months ago
When ipxe.bin is missing, make uninstall will fail due to
wrong switch (-r) passed to rm command. Replace it with -f.

Signed-off-by: Hubert Jasudowicz <hubert.jasudowicz@cert.pl>
---
 tools/firmware/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index 809a5fd025..1f27117794 100644
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -72,7 +72,7 @@ ifeq ($(CONFIG_OVMF),y)
 	rm -f $(INST_DIR)/ovmf.bin
 endif
 ifeq ($(CONFIG_IPXE),y)
-	rm -r $(INST_DIR)/ipxe.bin
+	rm -f $(INST_DIR)/ipxe.bin
 endif
 ifeq ($(CONFIG_PV_SHIM),y)
 	rm -f $(INST_DIR)/xen-shim
-- 
2.28.0


Re: [PATCH] tools/firmware: Fix typo in uninstall target
Posted by Bertrand Marquis 3 years, 8 months ago

> On 18 Aug 2020, at 20:29, Hubert Jasudowicz <hubert.jasudowicz@cert.pl> wrote:
> 
> When ipxe.bin is missing, make uninstall will fail due to
> wrong switch (-r) passed to rm command. Replace it with -f.
> 

Having a make uninstall is quite unusual.

But the modification looks right so ...

> Signed-off-by: Hubert Jasudowicz <hubert.jasudowicz@cert.pl>

Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

> ---
> tools/firmware/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
> index 809a5fd025..1f27117794 100644
> --- a/tools/firmware/Makefile
> +++ b/tools/firmware/Makefile
> @@ -72,7 +72,7 @@ ifeq ($(CONFIG_OVMF),y)
> 	rm -f $(INST_DIR)/ovmf.bin
> endif
> ifeq ($(CONFIG_IPXE),y)
> -	rm -r $(INST_DIR)/ipxe.bin
> +	rm -f $(INST_DIR)/ipxe.bin
> endif
> ifeq ($(CONFIG_PV_SHIM),y)
> 	rm -f $(INST_DIR)/xen-shim
> -- 
> 2.28.0
> 
>