| From b2e5e93ae8af6a34bca536cdc4b453ab1e707b8b Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com> |
| Date: Mon, 20 Jan 2020 14:06:41 +0100 |
| Subject: samples/bpf: Don't try to remove user's homedir on clean |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Toke Høiland-Jørgensen <toke@redhat.com> |
| |
| commit b2e5e93ae8af6a34bca536cdc4b453ab1e707b8b upstream. |
| |
| The 'clean' rule in the samples/bpf Makefile tries to remove backup |
| files (ending in ~). However, if no such files exist, it will instead try |
| to remove the user's home directory. While the attempt is mostly harmless, |
| it does lead to a somewhat scary warning like this: |
| |
| rm: cannot remove '~': Is a directory |
| |
| Fix this by using find instead of shell expansion to locate any actual |
| backup files that need to be removed. |
| |
| Fixes: b62a796c109c ("samples/bpf: allow make to be run from samples/bpf/ directory") |
| Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> |
| Signed-off-by: Alexei Starovoitov <ast@kernel.org> |
| Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> |
| Link: https://lore.kernel.org/bpf/157952560126.1683545.7273054725976032511.stgit@toke.dk |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| samples/bpf/Makefile | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/samples/bpf/Makefile |
| +++ b/samples/bpf/Makefile |
| @@ -221,7 +221,7 @@ all: |
| |
| clean: |
| $(MAKE) -C ../../ M=$(CURDIR) clean |
| - @rm -f *~ |
| + @find $(CURDIR) -type f -name '*~' -delete |
| |
| $(LIBBPF): FORCE |
| # Fix up variables inherited from Kbuild that tools/ build system won't like |
