[dpdk-dev,07/10] mk: install binding tool in sbin directory

Message ID 1449028676-19232-8-git-send-email-thomas.monjalon@6wind.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Thomas Monjalon Dec. 2, 2015, 3:57 a.m. UTC
  sbin/dpdk_nic_bind is a symbolic link to tools/dpdk_nic_bind.py
where some python objects may be generated.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 mk/rte.sdkinstall.mk | 4 ++++
 1 file changed, 4 insertions(+)
  

Comments

Panu Matilainen Dec. 2, 2015, 9:58 a.m. UTC | #1
On 12/02/2015 05:57 AM, Thomas Monjalon wrote:
> sbin/dpdk_nic_bind is a symbolic link to tools/dpdk_nic_bind.py
> where some python objects may be generated.
>
> Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
> ---
>   mk/rte.sdkinstall.mk | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
> index 46253ff..d6df30c 100644
> --- a/mk/rte.sdkinstall.mk
> +++ b/mk/rte.sdkinstall.mk
> @@ -38,6 +38,7 @@ prefix      ?=     /usr/local
>   exec_prefix ?=      $(prefix)
>   kerneldir   ?= $(exec_prefix)/kmod
>   bindir      ?= $(exec_prefix)/bin
> +sbindir     ?= $(exec_prefix)/sbin
>   libdir      ?= $(exec_prefix)/lib
>   includedir  ?=      $(prefix)/include/dpdk
>   datarootdir ?=      $(prefix)/share
> @@ -106,6 +107,9 @@ install-runtime:
>   		--keep-newer-files --warning=no-ignore-newer
>   	$(Q)$(call rte_mkdir,      $(DESTDIR)$(datadir))
>   	$(Q)cp -a $(RTE_SDK)/tools $(DESTDIR)$(datadir)
> +	$(Q)$(call rte_mkdir,      $(DESTDIR)$(sbindir))
> +	$(Q)$(call rte_symlink,    $(DESTDIR)$(datadir)/dpdk_nic_bind.py, \
> +	                           $(DESTDIR)$(sbindir)/dpdk_nic_bind)
>
>   install-kmod:
>   ifneq '$(wildcard $O/kmod/*)' ''
>

This symlink is broken, it expects dpdk_nic_bind.py to reside in 
$(datadir) root when it actually is in $(datadir)/tools/

Other than that, getting rid of the .py suffix is a nice touch.

	- Panu -
  

Patch

diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
index 46253ff..d6df30c 100644
--- a/mk/rte.sdkinstall.mk
+++ b/mk/rte.sdkinstall.mk
@@ -38,6 +38,7 @@  prefix      ?=     /usr/local
 exec_prefix ?=      $(prefix)
 kerneldir   ?= $(exec_prefix)/kmod
 bindir      ?= $(exec_prefix)/bin
+sbindir     ?= $(exec_prefix)/sbin
 libdir      ?= $(exec_prefix)/lib
 includedir  ?=      $(prefix)/include/dpdk
 datarootdir ?=      $(prefix)/share
@@ -106,6 +107,9 @@  install-runtime:
 		--keep-newer-files --warning=no-ignore-newer
 	$(Q)$(call rte_mkdir,      $(DESTDIR)$(datadir))
 	$(Q)cp -a $(RTE_SDK)/tools $(DESTDIR)$(datadir)
+	$(Q)$(call rte_mkdir,      $(DESTDIR)$(sbindir))
+	$(Q)$(call rte_symlink,    $(DESTDIR)$(datadir)/dpdk_nic_bind.py, \
+	                           $(DESTDIR)$(sbindir)/dpdk_nic_bind)
 
 install-kmod:
 ifneq '$(wildcard $O/kmod/*)' ''