diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-01-20 13:45:36 +0100 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2016-01-20 16:33:01 +0100 |
| commit | 08ff7e00bf0e7cf93a732e98a026a76a4349fd41 (patch) | |
| tree | e442365a036132c30d8d8ff1d8431686eea9c495 /build-root | |
| parent | 13056f93d95182790224c592b4ab78cf5082ebf7 (diff) | |
Rename vpe binary name to avoid collision with latex
Change-Id: I34a46b9ebbc0e36486fbef528b34ea1c3be2e8be
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'build-root')
| -rw-r--r-- | build-root/deb/debian/control | 8 | ||||
| -rw-r--r-- | build-root/deb/debian/vpp-bin.README.Debian | 2 | ||||
| -rw-r--r-- | build-root/deb/debian/vpp.upstart | 2 | ||||
| -rw-r--r-- | build-root/rpm/vpp.service | 2 | ||||
| -rw-r--r-- | build-root/rpm/vpp.spec | 10 |
5 files changed, 12 insertions, 12 deletions
diff --git a/build-root/deb/debian/control b/build-root/deb/debian/control index 0278286a..a90cea76 100644 --- a/build-root/deb/debian/control +++ b/build-root/deb/debian/control @@ -9,10 +9,10 @@ Package: vpp Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Vector Packet Processing--executables - This package provides VPP executables: vpe, vpe_api_test, vpe_json_test - vpe - the vector packet engine - vpe_api_test - vector packet engine API test tool - vpe_json_test - vector packet engine JSON test tool + This package provides VPP executables: vpp, vpp_api_test, vpp_json_test + vpp - the vector packet engine + vpp_api_test - vector packet engine API test tool + vpp_json_test - vector packet engine JSON test tool Package: vpp-dbg Architecture: any diff --git a/build-root/deb/debian/vpp-bin.README.Debian b/build-root/deb/debian/vpp-bin.README.Debian index 25ecd38e..19228969 100644 --- a/build-root/deb/debian/vpp-bin.README.Debian +++ b/build-root/deb/debian/vpp-bin.README.Debian @@ -1,6 +1,6 @@ To run vpp with the debug shell: -sudo vpe unix interactive +sudo vpp unix interactive which will result in a prompt that looks like: diff --git a/build-root/deb/debian/vpp.upstart b/build-root/deb/debian/vpp.upstart index ec731d89..c0ff09e2 100644 --- a/build-root/deb/debian/vpp.upstart +++ b/build-root/deb/debian/vpp.upstart @@ -13,7 +13,7 @@ end script script - exec vpe $(cat /etc/vpp/startup.conf | sed -e 's/#.*//') + exec vpp -c /etc/vpp/startup.conf end script post-stop script diff --git a/build-root/rpm/vpp.service b/build-root/rpm/vpp.service index dd8ee36b..fc66b15c 100644 --- a/build-root/rpm/vpp.service +++ b/build-root/rpm/vpp.service @@ -3,7 +3,7 @@ Description=Vector Packet Processing Process After=syslog.target network.target auditd.service [Service] -ExecStart=/bin/sh -c '/usr/bin/vpe $(cat /etc/vpp/startup.conf | sed -e "s/#.*//")' +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf Type=simple Restart=on-failure RestartSec=5s diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec index ddcdeb9f..fbadf07c 100644 --- a/build-root/rpm/vpp.spec +++ b/build-root/rpm/vpp.spec @@ -14,10 +14,10 @@ Release: %{_release} Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils %description -This package provides VPP executables: vpe, vpe_api_test, vpe_json_test -vpe - the vector packet engine -vpe_api_test - vector packet engine API test tool -vpe_json_test - vector packet engine JSON test tool +This package provides VPP executables: vpp, vpp_api_test, vpp_json_test +vpp - the vector packet engine +vpp_api_test - vector packet engine API test tool +vpp_json_test - vector packet engine JSON test tool %package lib Summary: VPP libraries @@ -111,7 +111,7 @@ sysctl --system %files %defattr(-,bin,bin) %{_unitdir}/vpp.service -/usr/bin/vpe* +/usr/bin/vpp* /usr/bin/svm* %config /etc/sysctl.d/80-vpp.conf %config /etc/vpp/startup.conf |