mk: don't install meson.build in usertools
Checks
Commit Message
In commit 7dd34c71de2a ("usertools: install with meson") meson.build was
added in usertools directory and so it's copied to $(datadir)/usertools
with "make install".
This patch avoids to copy meson.build when installing usertools with
"make install".
Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
---
mk/rte.sdkinstall.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Comments
On Tue, 2018-11-27 at 20:35 +0100, Timothy Redaelli wrote:
> In commit 7dd34c71de2a ("usertools: install with meson") meson.build
> was
> added in usertools directory and so it's copied to
> $(datadir)/usertools
> with "make install".
>
> This patch avoids to copy meson.build when installing usertools with
> "make install".
>
> Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
> ---
> mk/rte.sdkinstall.mk | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
> index 8296e6dbd..2d34b4e5a 100644
> --- a/mk/rte.sdkinstall.mk
> +++ b/mk/rte.sdkinstall.mk
> @@ -99,8 +99,9 @@ install-runtime:
> --exclude 'app/cmdline*' --exclude app/test \
> --exclude app/testacl --exclude app/testpipeline app
> | \
> tar -xf - -C $(DESTDIR)$(bindir) $(TAR_X_FLAGS)
> - $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir))
> - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/usertools $(DESTDIR)$(datadir)
> + $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)/usertools)
> + $(Q)tar -cf - -C $(RTE_SDK) --exclude meson.build
> usertools | \
> + tar -xf - -C $(DESTDIR)$(datadir)/usertools
> $(TAR_X_FLAGS)
> $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir))
> $(Q)$(call
> rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \
> $(DESTDIR)$(sbindir)/dpdk-
> devbind)
Acked-by: Luca Boccassi <bluca@debian.org>
Should probably add:
Fixes: 7dd34c71de2a ("usertools: install with meson")
Cc: stable@dpdk.org
28/11/2018 11:13, Luca Boccassi:
> On Tue, 2018-11-27 at 20:35 +0100, Timothy Redaelli wrote:
> > In commit 7dd34c71de2a ("usertools: install with meson") meson.build
> > was
> > added in usertools directory and so it's copied to
> > $(datadir)/usertools
> > with "make install".
> >
> > This patch avoids to copy meson.build when installing usertools with
> > "make install".
> >
> > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
> Acked-by: Luca Boccassi <bluca@debian.org>
>
> Should probably add:
>
> Fixes: 7dd34c71de2a ("usertools: install with meson")
> Cc: stable@dpdk.org
Applied, thanks
@@ -99,8 +99,9 @@ install-runtime:
--exclude 'app/cmdline*' --exclude app/test \
--exclude app/testacl --exclude app/testpipeline app | \
tar -xf - -C $(DESTDIR)$(bindir) $(TAR_X_FLAGS)
- $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir))
- $(Q)cp $(CP_FLAGS) $(RTE_SDK)/usertools $(DESTDIR)$(datadir)
+ $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)/usertools)
+ $(Q)tar -cf - -C $(RTE_SDK) --exclude meson.build usertools | \
+ tar -xf - -C $(DESTDIR)$(datadir)/usertools $(TAR_X_FLAGS)
$(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir))
$(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \
$(DESTDIR)$(sbindir)/dpdk-devbind)