From 9e4a641da6c7029a5e0302fb03474fda48c4de36 Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Wed, 3 Aug 2016 16:05:16 +0200 Subject: doc: fix old dpdk-nic-bind.py references Backport of upstream fix http://dpdk.org/dev/patchwork/patch/15057/ Change-Id: Ia96157a7415da4c2817ef0b8d2b72ea6e2f86c79 Signed-off-by: Christian Ehrhardt --- debian/changelog | 2 + ...v-doc-fix-old-dpdk-nic-bind.py-references.patch | 126 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 129 insertions(+) create mode 100644 debian/patches/dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch diff --git a/debian/changelog b/debian/changelog index 77182e64..1c03ef79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ dpdk (16.07-1) UNRELEASED; urgency=medium d/p/fix-vhost-user-socket-permission.patch * Add lintian-overrides for: E: dpdk-dev: arch-dependent-file-in-usr-share These binaries are part of the sdk and meant to be shipped with the sdk. + * d/p/dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch to fix the + docs in regard to 16.07 changes renaming dpdk_nic_bind [ Anders Roxell ] * debian/control: add pciutils to the dpdk depends list, since lspci is used diff --git a/debian/patches/dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch b/debian/patches/dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch new file mode 100644 index 00000000..7dfd9dd6 --- /dev/null +++ b/debian/patches/dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch @@ -0,0 +1,126 @@ +Description: doc: fix old dpdk-nic-bind.py references + +dpdk-nic-bind.py script has been renamed to dpdk-devbind.py, +but some references to the old script have remained. +This commit completes the renaming. + +Fixes: a5d7a3f77ddc ("unify tools naming") + +Signed-off-by: Pablo de Lara + +Origin: Upstream, http://dpdk.org/dev/patchwork/patch/15057/ +Author: Christian Ehrhardt +Last-Update: 2016-08-03 + +diff --git a/doc/guides/howto/flow_bifurcation.rst b/doc/guides/howto/flow_bifurcation.rst +index a1c6262..0d7226a 100644 +--- a/doc/guides/howto/flow_bifurcation.rst ++++ b/doc/guides/howto/flow_bifurcation.rst +@@ -119,8 +119,8 @@ The typical procedure to achieve this is as follows: + .. code-block:: console + + modprobe vfio-pci +- dpdk_nic_bind.py -b vfio-pci 01:10.0 +- dpdk_nic_bind.py -b vfio-pci 01:10.1 ++ dpdk-devbind.py -b vfio-pci 01:10.0 ++ dpdk-devbind.py -b vfio-pci 01:10.1 + + #. Run a DPDK application on the VFs: + +@@ -279,8 +279,8 @@ The typical procedure to achieve this is as follows: + .. code-block:: console + + modprobe vfio-pci +- dpdk_nic_bind.py -b vfio-pci 01:10.0 +- dpdk_nic_bind.py -b vfio-pci 01:10.1 ++ dpdk-devbind.py -b vfio-pci 01:10.0 ++ dpdk-devbind.py -b vfio-pci 01:10.1 + + #. run DPDK application on VFs: + +diff --git a/doc/guides/howto/lm_bond_virtio_sriov.rst b/doc/guides/howto/lm_bond_virtio_sriov.rst +index 49666f1..9bc3450 100644 +--- a/doc/guides/howto/lm_bond_virtio_sriov.rst ++++ b/doc/guides/howto/lm_bond_virtio_sriov.rst +@@ -613,17 +613,17 @@ Set up DPDK in the Virtual Machine + cat /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages + + ifconfig -a +- /root/dpdk/tools/dpdk_nic_bind.py --status ++ /root/dpdk/tools/dpdk-devbind.py --status + + rmmod virtio-pci ixgbevf + + modprobe uio + insmod /root/dpdk/x86_64-default-linuxapp-gcc/kmod/igb_uio.ko + +- /root/dpdk/tools/dpdk_nic_bind.py -b igb_uio 0000:00:03.0 +- /root/dpdk/tools/dpdk_nic_bind.py -b igb_uio 0000:00:04.0 ++ /root/dpdk/tools/dpdk-devbind.py -b igb_uio 0000:00:03.0 ++ /root/dpdk/tools/dpdk-devbind.py -b igb_uio 0000:00:04.0 + +- /root/dpdk/tools/dpdk_nic_bind.py --status ++ /root/dpdk/tools/dpdk-devbind.py --status + + run_testpmd_bonding_in_vm.sh + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +diff --git a/doc/guides/howto/lm_virtio_vhost_user.rst b/doc/guides/howto/lm_virtio_vhost_user.rst +index fad1f2a..4937781 100644 +--- a/doc/guides/howto/lm_virtio_vhost_user.rst ++++ b/doc/guides/howto/lm_virtio_vhost_user.rst +@@ -91,14 +91,14 @@ For Fortville NIC. + .. code-block:: console + + cd /root/dpdk/tools +- ./dpdk_nic_bind.py -b igb_uio 0000:02:00.0 ++ ./dpdk-devbind.py -b igb_uio 0000:02:00.0 + + For Niantic NIC. + + .. code-block:: console + + cd /root/dpdk/tools +- ./dpdk_nic_bind.py -b igb_uio 0000:09:00.0 ++ ./dpdk-devbind.py -b igb_uio 0000:09:00.0 + + On host_server_1: Terminal 3 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@@ -172,14 +172,14 @@ For Fortville NIC. + .. code-block:: console + + cd /root/dpdk/tools +- ./dpdk_nic_bind.py -b igb_uio 0000:03:00.0 ++ ./dpdk-devbind.py -b igb_uio 0000:03:00.0 + + For Niantic NIC. + + .. code-block:: console + + cd /root/dpdk/tools +- ./dpdk_nic_bind.py -b igb_uio 0000:06:00.0 ++ ./dpdk-devbind.py -b igb_uio 0000:06:00.0 + + On host_server_2: Terminal 3 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +@@ -444,17 +444,17 @@ setup_dpdk_virtio_in_vm.sh + cat /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages + + ifconfig -a +- /root/dpdk/tools/dpdk_nic_bind.py --status ++ /root/dpdk/tools/dpdk-devbind.py --status + + rmmod virtio-pci + + modprobe uio + insmod /root/dpdk/x86_64-default-linuxapp-gcc/kmod/igb_uio.ko + +- /root/dpdk/tools/dpdk_nic_bind.py -b igb_uio 0000:00:03.0 +- /root/dpdk/tools/dpdk_nic_bind.py -b igb_uio 0000:00:04.0 ++ /root/dpdk/tools/dpdk-devbind.py -b igb_uio 0000:00:03.0 ++ /root/dpdk/tools/dpdk-devbind.py -b igb_uio 0000:00:04.0 + +- /root/dpdk/tools/dpdk_nic_bind.py --status ++ /root/dpdk/tools/dpdk-devbind.py --status + + run_testpmd_in_vm.sh + ~~~~~~~~~~~~~~~~~~~~ diff --git a/debian/patches/series b/debian/patches/series index 07c6188b..6840080d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ fix-vhost-user-socket-permission.patch fix-double-license-info.patch fix-unusual-interpreter.patch +dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch -- cgit 1.2.3-korg