From: Arnaldo Carvalho de Melo <acme@redhat.com>
To: Jakub Kicinski <jakub.kicinski@netronome.com>
Cc: netdev@vger.kernel.org, oss-drivers@netronome.com,
daniel@iogearbox.net, alexei.starovoitov@gmail.com,
acme@kernel.org, Quentin Monnet <quentin.monnet@netronome.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Subject: Re: [PATCH net-next 2/2] tools: bpftool: create "uninstall", "doc-uninstall" make targets
Date: Wed, 13 Dec 2017 09:16:01 -0200 [thread overview]
Message-ID: <20171213111601.GC4026@redhat.com> (raw)
In-Reply-To: <20171207230018.7510-3-jakub.kicinski@netronome.com>
Em Thu, Dec 07, 2017 at 03:00:18PM -0800, Jakub Kicinski escreveu:
> From: Quentin Monnet <quentin.monnet@netronome.com>
>
> Create two targets to remove executable and documentation that would
> have been previously installed with `make install` and `make
> doc-install`.
>
> Also create a "QUIET_UNINST" helper in tools/scripts/Makefile.include.
>
> Do not attempt to remove directories /usr/local/sbin and
> /usr/share/bash-completions/completions, even if they are empty, as
> those specific directories probably already existed on the system before
> we installed the program, and we do not wish to break other makefiles
> that might assume their existence. Do remvoe /usr/local/share/man/man8
> if empty however, as this directory does not seem to exist by default.
>
> Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
> For addition to tools/scripts/Makefile.include:
>
> CC: Arnaldo Carvalho de Melo <acme@redhat.com>
> CC: Masahiro Yamada <yamada.masahiro@socionext.com>
>
> tools/bpf/bpftool/Documentation/Makefile | 8 +++++++-
> tools/bpf/bpftool/Makefile | 12 ++++++++++--
> tools/scripts/Makefile.include | 1 +
> 3 files changed, 18 insertions(+), 3 deletions(-)
>
> diff --git a/tools/bpf/bpftool/Documentation/Makefile b/tools/bpf/bpftool/Documentation/Makefile
> index 71c17fab4f2f..c462a928e03d 100644
> --- a/tools/bpf/bpftool/Documentation/Makefile
> +++ b/tools/bpf/bpftool/Documentation/Makefile
> @@ -3,6 +3,7 @@ include ../../../scripts/utilities.mak
>
> INSTALL ?= install
> RM ?= rm -f
> +RMDIR ?= rmdir --ignore-fail-on-non-empty
>
> ifeq ($(V),1)
> Q =
> @@ -34,5 +35,10 @@ install: man
> $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
> $(Q)$(INSTALL) -m 644 $(DOC_MAN8) $(DESTDIR)$(man8dir)
>
> -.PHONY: man man8 clean install
> +uninstall:
> + $(call QUIET_UNINST, Documentation-man)
> + $(Q)$(RM) $(addprefix $(DESTDIR)$(man8dir)/,$(_DOC_MAN8))
> + $(Q)$(RMDIR) $(DESTDIR)$(man8dir)
> +
> +.PHONY: man man8 clean install uninstall
> .DEFAULT_GOAL := man
> diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
> index 203ae2e14fbc..3f17ad317512 100644
> --- a/tools/bpf/bpftool/Makefile
> +++ b/tools/bpf/bpftool/Makefile
> @@ -70,6 +70,11 @@ install: $(OUTPUT)bpftool
> $(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(bash_compdir)
> $(Q)$(INSTALL) -m 0644 bash-completion/bpftool $(DESTDIR)$(bash_compdir)
>
> +uninstall:
> + $(call QUIET_UNINST, bpftool)
> + $(Q)$(RM) $(DESTDIR)$(prefix)/sbin/bpftool
> + $(Q)$(RM) $(DESTDIR)$(bash_compdir)/bpftool
> +
> doc:
> $(call descend,Documentation)
>
> @@ -79,8 +84,11 @@ install: $(OUTPUT)bpftool
> doc-install:
> $(call descend,Documentation,install)
>
> +doc-uninstall:
> + $(call descend,Documentation,uninstall)
> +
> FORCE:
>
> -.PHONY: all FORCE clean install
> -.PHONY: doc doc-clean doc-install
> +.PHONY: all FORCE clean install uninstall
> +.PHONY: doc doc-clean doc-install doc-uninstall
> .DEFAULT_GOAL := all
> diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include
> index 3fab179b1aba..fcb3ed0be5f8 100644
> --- a/tools/scripts/Makefile.include
> +++ b/tools/scripts/Makefile.include
> @@ -99,5 +99,6 @@ ifneq ($(silent),1)
>
> QUIET_CLEAN = @printf ' CLEAN %s\n' $1;
> QUIET_INSTALL = @printf ' INSTALL %s\n' $1;
> + QUIET_UNINST = @printf ' UNINST %s\n' $1;
> endif
> endif
> --
> 2.15.1
next prev parent reply other threads:[~2017-12-13 11:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-07 23:00 [PATCH net-next 0/2] tools: bpftool: clean up and extend Makefiles Jakub Kicinski
2017-12-07 23:00 ` [PATCH net-next 1/2] tools: bpftool: harmonise Makefile and Documentation/Makefile Jakub Kicinski
2017-12-07 23:00 ` [PATCH net-next 2/2] tools: bpftool: create "uninstall", "doc-uninstall" make targets Jakub Kicinski
2017-12-13 11:16 ` Arnaldo Carvalho de Melo [this message]
2017-12-08 19:46 ` [PATCH net-next 0/2] tools: bpftool: clean up and extend Makefiles Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171213111601.GC4026@redhat.com \
--to=acme@redhat.com \
--cc=acme@kernel.org \
--cc=alexei.starovoitov@gmail.com \
--cc=daniel@iogearbox.net \
--cc=jakub.kicinski@netronome.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
--cc=quentin.monnet@netronome.com \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.