36 Commits

Author SHA1 Message Date
Gabriel Ganne
714968b038 package only the vpp binaries (rpm)
The first install regexp of the vpp.spec file was too permissive and
included dpdk binaries.

Should fix rpm packaging error: Installed (but unpackaged) file(s) found:
/usr/bin/dpdk-pdump
/usr/bin/dpdk-pmdinfo
/usr/bin/dpdk-procinfo
/usr/bin/testpmd

Change-Id: Ic905307cf07b9eeadf8125aaa3e1922dcc6269b3
Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
2017-01-27 01:00:44 +00:00
Damjan Marion
2ce7f9834a Add dpdk development packaging
Change-Id: I6aa2a6709241d99ce734c29e47487eb456907351
Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-01-20 15:02:12 +00:00
Gabriel Ganne
f3854e9cd7 fix rpm warnings for defattr directory of lua/*
eg.
Processing files: vpp-api-lua-17.04-rc0~119_g3bd11d78.x86_64
warning: %defattr doesn't define directory mode so file mode defined in %defattr is used for directory: ...

Change-Id: Ifd205b6effce6160cf6f7bdbd959e484099ff619
Signed-off-by: Gabriel Ganne <gabriel.ganne@qosmos.com>
2017-01-17 10:10:10 +01:00
Padraig Connolly
69915cba2d vppctl: new bash completion for vppctl commands
Bash completion for vppctl
*vppctl_completion uses generated list vppctl-cmd-list to provide bash completion
*List of commands generated using grep, then moved by vpp packaging
*Once vpp package installed restart bash to use

Change-Id: I3b25e55a432c395af421231cf7c37c2e243fee61
Signed-off-by: Padraig Connolly <padraig.connolly@intel.com>
2017-01-13 20:18:18 +00:00
Thomas F Herbert
a48ad28256 Remove unnecessary build macro to fix slow builds.
JIRA: VPP-588

Change-Id: I05bcba3158edb4aee12ead82a30c611fddd29352
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2017-01-11 17:13:18 -05:00
Damjan Marion
6bbf83a01b Revert "vppctl: bash completion for vppctl commands"
This patch is causing build failures

This reverts commit d995c757f05f78aa759b0a65c0a7e38088e690a9.

Change-Id: I0c8d5a4208135d77aaa3a6a470d26140f7b74733
Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-01-10 09:40:45 +00:00
Padraig Connolly
d995c757f0 vppctl: bash completion for vppctl commands
Added bash completion that will include all commands from build time
*Script takes list of commands generated by doxygen-siphon-list
*Configured doxygen-siphon makefile to generate just cli commands
*List of cli commands put in /usr/share/vpp
*Stopped siphon using doxygen bootstrap, uses main bootstrap instead
*Added rpm/deb check for installation of packages, separate from bootstrap
*NOTE: Once you have installed the vpp .deb/.rpm package you will have to
 restart bash

Change-Id: Ie503e80d5177481f6e7dbe59378f2e0d76f29152
Signed-off-by: Padraig Connolly <padraig.connolly@intel.com>
2017-01-09 15:20:49 +00:00
Damjan Marion
0be5ec304d Do not require external vppapigen when not cross-compiling
Change-Id: I80b8348ed4efd53d292c37a1ff69c13ee4741986
Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-01-03 15:14:49 +00:00
Damjan Marion
cb034b9b37 Move java,lua api and remaining plugins to src/
Change-Id: I1c3b87e886603678368428ae56a6bd3327cbc90d
Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-01-01 18:11:43 +01:00
Damjan Marion
7cd468a3d7 Reorganize source tree to use single autotools instance
Change-Id: I7b51f88292e057c6443b12224486f2d0c9f8ae23
Signed-off-by: Damjan Marion <damarion@cisco.com>
2016-12-28 12:25:14 +01:00
Gabriel Ganne
11fa895bb9 fix sample-plugin rpm packaging
Change-Id: I0f4d029fe16d1d272c8bbd5c380ba70a646ddb20
Signed-off-by: Gabriel Ganne <gabriel.ganne@qosmos.com>
2016-12-21 10:12:49 +00:00
Damjan Marion
a1bd0230d2 Remove RPATH from binaries before creating .deb and .rpm packages
Change-Id: I684d4eabac03e049524204864c985e14eea8d92e
Signed-off-by: Damjan Marion <damarion@cisco.com>
2016-12-20 13:43:21 +00:00
Gabriel Ganne
5929085918 python api rpm packaging - json files are not executables
Change-Id: If8231aad2b95cf9e06cd8c95978e6a3128cdf084
Signed-off-by: Gabriel Ganne <gabriel.ganne@qosmos.com>
2016-12-09 20:13:28 +00:00
Gabriel Ganne
32905661d1 vpp-python-api packaging - use easy_install to install the python api
adds python-setuptools as dependency

Change-Id: I186f5d4353ee7667377fb6b0486d16a1571bdf09
Signed-off-by: Gabriel Ganne <gabriel.ganne@qosmos.com>
2016-12-08 20:05:48 +00:00
Ole Troan
f14e3bf7b2 API: Packaging of JSON files.
Change-Id: If041b6faf1a091d4758b514f0a8cd800ee0e6a89
Signed-off-by: Ole Troan <ot@cisco.com>
Signed-off-by: Ole Troan <otroan@ot-vpp.cisco.com>
Signed-off-by: Ole Troan <ot@cisco.com>
2016-12-02 09:11:11 +00:00
Padraig Connolly
999bbc4a20 remove reference to Intel with dpdk docs
*Changed configure files to say DPDK instead of Intel DPDK
*Changed rpm and deb config files to say DPDK instead of Intel DPDK
*Changed vnet Makefile to say DPDK instead of Intel DPDK

Change-Id: Ic6e3eacf2341af873d4bd2e036d5afa857ca6355
Signed-off-by: Padraig Connolly <padraig.connolly@intel.com>
2016-11-17 21:02:29 +00:00
Thomas F Herbert
20a29c7b4d VPP-498: Prepare vpp RPM packaging for use by downstream distros.
Change spec to add new macros to get rid of relative dir reference and
use vpp version. Store version string in .version to store metadata in
dist archive. New script to create dist archive.
Add dist and wipedist targets to Makefile for builds of source RPMs.

Change-Id: I7cf0164f0cb094ec70f3dc323ed7fa2ee82bd902
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2016-11-04 22:22:53 +00:00
Ed Warnicke
e7637e7017 Fix vpp-plugins rpms
vpp by default looks in /usr/lib/vpp_plugins
rpmbuild has ${_libdir} as /usr/lib64

Thus vpp doesn't see the plugins.

Change-Id: Iecbc491940678728305c181b04bb0914ad174bf1
Signed-off-by: Ed Warnicke <eaw@cisco.com>
(cherry picked from commit 2dfd08242d66fb79c9a861c6a0c7fee45ef6bc60)
2016-11-03 16:42:26 +00:00
Thomas F Herbert
3977a21495 Fix description of devel package.
Change-Id: Ia289299691daa2ed47f0129d2695678e1d390ab8
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2016-10-26 20:15:03 +00:00
Miroslav Miklus
8e08e74ce0 VPP-474 Revert "FIX sysctl configuration directory"
This reverts commit 822af5c95d080a58cda504228df4b5f3896e72b6.
Reason for revert is a bug in procps upstart script.

Change-Id: Ie9e501c9b52e65d8d0f31ce6600823021e89fb6f
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
2016-10-11 18:36:51 +00:00
Peter Ginchev
dfa9c5bb9a Rebind kernel drivers on VPP uninstall
Change-Id: Icb0ce47134146c3a212b234f088c682982480128
Signed-off-by: Peter Ginchev <pginchev@cisco.com>
2016-10-11 19:56:16 +03:00
Padraig
b21b6768ff platform: rewrote vppctl script to include history
Added more ability to search history to vppctl shell
*Up and down keys give history
*Script now written in Python 2.7.6
*Contains all original functionality
*Added Python dependency for deb/rpms

Change-Id: I5088f7b018fce92b9b5411df0bffc34709810dec
Signed-off-by: Padraig Connolly <padraig.connolly@intel.com>
2016-10-10 19:48:38 +00:00
John DeNisco
f53f482f35 Remove RPM package dependency on vpp-devel
Change-Id: Ie6e1b3c8c2e0cf64f06aafe13a693686fd4b486a
Signed-off-by: John DeNisco <jdenisco@cisco.com>
2016-09-30 13:33:31 +00:00
John DeNisco
99492de719 Fix RPM packaging dependencies
Change-Id: Ife1523e11b7225ea0fd41c06c3b802bb171e91f4
Signed-off-by: John DeNisco <jdenisco@cisco.com>
2016-09-27 22:27:49 +00:00
Miroslav Miklus
822af5c95d FIX sysctl configuration directory
man sysctl.d:
...
Packages should install their configuration files in /usr/lib/. Files in
/etc/ are reserved for the local administrator, who may use this logic to
override the configuration files installed by vendor packages. All configuration
files are sorted by their filename in lexicographic order, regardless of which
of the directories they reside in. If multiple files specify the same option,
the entry in the file with the lexicographically latest name will take
precedence. It is recommended to prefix all filenames with a two-digit number
and a dash, to simplify the ordering of the files.

If the administrator wants to disable a configuration file supplied by
the vendor, the recommended way is to place a symlink to /dev/null in the
configuration directory in /etc/, with the same filename as the vendor
configuration file.
...

Change-Id: I24b8b7fddf64ec287282ae195e07c9592c494ebe
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
2016-09-27 18:15:42 +00:00
Ole Troan
57c3d66c55 Python API: Preparation for RPM/DEB packaging.
Recheck.

Repackage the Python API binding to include all
necessary modules in a single Python package.

Change-Id: I5e35141d413bfb1aad650217e1ca07d85646c349
Signed-off-by: Ole Troan <ot@cisco.com>
2016-09-23 13:18:46 +00:00
Ed Warnicke
f5a1436dc9 Provide vpp-plugins rpm packaging
Change-Id: Ifbd99818ead5f38c5f8ad3ecdb36b24a9fa59798
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-09-12 20:40:37 +00:00
Ed Warnicke
f5a0e73e53 VPP-390: include *.so symlinks in vpp-lib
Currently, vpp-lib rpm includes symlinks for

*.so.0 -> *.so.0.0.0

but not

*.so -> *.so.0.0.0

This causes linker issues in cases where vpp-lib and vpp-devel rpms
are installed and sources are built that rely on libraries in vpp-lib.

Example:

libtool: link: gcc -shared -fPIC -DPIC jvpp/.libs/libjvpp_nsh_la-jvpp_nsh.o -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra -lpthread -lm -lrt -ljvpp_common -L/usr/lib64 -O2 -Wl,-soname -Wl,libjvpp_nsh.so.0 -o .libs/libjvpp_nsh.so.0.0.0
/usr/bin/ld: cannot find -lvlibmemoryclient
/usr/bin/ld: cannot find -lvlibapi
/usr/bin/ld: cannot find -lsvm
/usr/bin/ld: cannot find -lvppinfra
collect2: error: ld returned 1 exit status

Change-Id: Ic8eebc696f973ea348be0b43e7cfb289efbe44fe
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-09-07 18:42:03 +00:00
Ed Warnicke
406ab9d365 VPP-374: getting jvppgen.py into rpm vpp-devel package
Change-Id: Ia2643f33170da92fde0f8228c8d8393f23e98d11
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-09-02 05:04:51 +00:00
Sachin
693b7026a8 Enhanced RPM build process to make rpm for any given platform
- Currently default rpm.spec only look for  "install-vpp-native"

Change-Id: Iaa78c46ae62d2747bda6ffc1189cb8ac6d578bd8
Signed-off-by: Sachin <sachin.saxena@nxp.com>
2016-06-18 15:28:08 +05:30
Ed Warnicke
b10427e060 VPP-127 Removed spurious use of sudo
Change-Id: I1eb18fc6379db30fb802e3b929931788f54e7dc2
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-06-09 01:38:02 +00:00
Ed Warnicke
ec6290a8a5 VPP-127: Make rpm/deb provide vpp group to access vpp-api
Change-Id: I80b7f55034d64ad8360e29c669002948317c64ba
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-06-08 18:12:37 -05:00
Ed Warnicke
40c6639428 VPP-124: Fix rpms to work out of the box.
Currently, for vpp we are not building any rpms for dpdk or igb_uio.
This is because uio_pci_generic as shipped with centos works with vpp.
However, our vpp rpms do not install kernel module uio_pci_generic at
start up and the /etc/vpp/startup.conf does not configure vpp to use
uio_pci_generic.

vpp rpms should do both, so that when the vpp rpm is installed and
vpp started, it just works out of the box.

This patch fixes the rpms to do so.

Change-Id: Ib934b51f9271cded466d235aa4044bef75c35960
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2016-06-08 14:41:40 -05:00
Dave Barach
0e5e3c3b62 Fix rpm packaging bit-rot
Change-Id: Ia710b0773984891ee18c6c0558cc09b984043e38
Signed-off-by: Dave Barach <dave@barachs.net>
2016-01-25 08:28:40 -05:00
Damjan Marion
08ff7e00bf Rename vpe binary name to avoid collision with latex
Change-Id: I34a46b9ebbc0e36486fbef528b34ea1c3be2e8be
Signed-off-by: Damjan Marion <damarion@cisco.com>
2016-01-20 16:33:01 +01:00
Ed Warnicke
cb9cadad57 Initial commit of vpp code.
Change-Id: Ib246f1fbfce93274020ee93ce461e3d8bd8b9f17
Signed-off-by: Ed Warnicke <eaw@cisco.com>
2015-12-08 15:47:27 -07:00