From 0bbb7e9fcfea8b9b9191dea7b68d684e09c78ea5 Mon Sep 17 00:00:00 2001 From: lfbzhm Date: Wed, 13 Dec 2023 14:26:42 +0000 Subject: [PATCH 1/2] move the target 'clean' next to 'all' Signed-off-by: lfbzhm --- Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index caa4441789c..0e753b98576 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,18 @@ all: runc recvtty sd-helper seccompagent fs-idmap memfd-bind pidfd-kill remap-ro recvtty sd-helper seccompagent fs-idmap memfd-bind pidfd-kill remap-rootfs: $(GO_BUILD) -o contrib/cmd/$@/$@ ./contrib/cmd/$@ +.PHONY: clean +clean: + rm -f runc runc-* libcontainer/dmz/runc-dmz + rm -f contrib/cmd/recvtty/recvtty + rm -f contrib/cmd/sd-helper/sd-helper + rm -f contrib/cmd/seccompagent/seccompagent + rm -f contrib/cmd/fs-idmap/fs-idmap + rm -f contrib/cmd/memfd-bind/memfd-bind + rm -f contrib/cmd/pidfd-kill/pidfd-kill + sudo rm -rf release + rm -rf man/man8 + .PHONY: static static: static-bin verify-dmz-arch @@ -186,18 +198,6 @@ install-man: man install -d -m 755 $(DESTDIR)$(MANDIR)/man8 install -D -m 644 man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 -.PHONY: clean -clean: - rm -f runc runc-* libcontainer/dmz/runc-dmz - rm -f contrib/cmd/fs-idmap/fs-idmap - rm -f contrib/cmd/recvtty/recvtty - rm -f contrib/cmd/sd-helper/sd-helper - rm -f contrib/cmd/seccompagent/seccompagent - rm -f contrib/cmd/memfd-bind/memfd-bind - rm -f contrib/cmd/pidfd-kill/pidfd-kill - sudo rm -rf release - rm -rf man/man8 - .PHONY: cfmt cfmt: C_SRC=$(shell git ls-files '*.c' | grep -v '^vendor/') cfmt: From c811308582b99a8b07bf2d7f4a7e15ffaddbb1f1 Mon Sep 17 00:00:00 2001 From: lfbzhm Date: Wed, 13 Dec 2023 14:28:23 +0000 Subject: [PATCH 2/2] remove remap-rootfs bin when running make clean Signed-off-by: lfbzhm --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 0e753b98576..d9e41aa47bf 100644 --- a/Makefile +++ b/Makefile @@ -86,6 +86,7 @@ clean: rm -f contrib/cmd/fs-idmap/fs-idmap rm -f contrib/cmd/memfd-bind/memfd-bind rm -f contrib/cmd/pidfd-kill/pidfd-kill + rm -f contrib/cmd/remap-rootfs/remap-rootfs sudo rm -rf release rm -rf man/man8