summaryrefslogtreecommitdiffstats
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2017-10-11Deps added to Makefile must also be in spec file.Thomas F Herbert1-1/+4
Deps are required for Fedora too. This patch should be in version 17.10 because it fixes breaking rpm builds in some circumstances. JIRA: VPP-1015 Change-Id: I10807069742cdd6b09a0f34d9d05e9cae4146ec3 Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2017-10-05drop python3 dependency (VPP-1010)Klement Sekera1-7/+1
Change-Id: I99c2c1d0d5b96f33efdb58dd3a2897a752e65349 Signed-off-by: Klement Sekera <ksekera@cisco.com>
2017-09-26Fix SUSE dependencies to contemplate both python and python3 scripts.Marco Varlese1-1/+1
Change-Id: Ib677955448833dfeb1291490340f5ea1e417213b Signed-off-by: Marco Varlese <marco.varlese@suse.com>
2017-09-25Fix Ubuntu java dependency regression.Dave Wallace1-0/+1
- introduced by e6f3b467 "Fix for ssl dependency on debian 9" Change-Id: If41e517b2a55d2028ade6671f407831cfcf205c4 Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
2017-09-22openSUSE build fixMarco Varlese1-1/+1
* Fixed package dependency * Fixed bash unary operation error Change-Id: I782dda8ffd807931241fa6034c110f5fedbeca8e Signed-off-by: Marco Varlese <marco.varlese@suse.com>
2017-09-21Fix for ssl dependency on debian 9Anton Ivanov1-2/+7
Change-Id: I32f46c5a6f0e43e7f3e38b05d9607d43faf41501 Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
2017-09-20Use openssl 1.0 compat RPM for Fedora 26 and newer.Thomas F Herbert1-1/+3
This is just a workaround until VPP is compatible with OpenSSL 1.1. JIRA: VPP-569 Change-Id: I8d2a113dc9400fd7e8e6850de5d91f40380455ce Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2017-09-19Add new C APIKlement Sekera1-2/+9
Change-Id: I717ce3cd7c867c155de149ec56623269d26d0ff7 Signed-off-by: Klement Sekera <ksekera@cisco.com>
2017-09-12Add option to build without multi-buffer crypto.Thomas F Herbert1-1/+2
JIRA VPP-498 This patch also allows RPMs to be built without multi- buffer crypto for some RPM based downstream distros that don't have sufficiently new nasm or don't have an USA export license for multi-buffer crypto. The default is to build WITH multi-buffer crypto for x86-64. This patch allows optional building without multi-buffer crypto. To build without multi-buffer crypto, set the AESNI environment variable to n. To build rpm packages without multi-buffer crypto, build the rpms with the option turned off. make build AESNI=n or.. make pkg-rpm --without aesni ---How to test this patch on a Centos build.--- Build as above and verify that nasm isn't executed during the build process. vpp may be installed and the dpdk plugin may be inspected to verify that the multi-buffer code isn't present. Change-Id: I8c5cfd4cdd9eb2b96772a687eaa54560806e001b Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2017-09-08add apr-devel to rpm dependency list for centos-7Gabriel Ganne1-0/+1
Error mesasge: ... rpmbuild -bb \ --define "_topdir /home/gannega/vpp" \ --define "_version 17.10" \ --define "_release rc0~269_g030ab48" \ vpp.spec error: Failed build dependencies: apr-devel is needed by vpp-17.10-rc0~269_g030ab48.x86_64 Change-Id: I7c09b65dcc9e57cae3da396c0165b8a4c85a8c2b Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
2017-08-31Add explicit check for Fedora.Thomas F Herbert1-1/+1
Change-Id: I0a5aece190ccc82f0f840e3bc75e1d27433f5b47 Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2017-08-31Do arithemtric comparison in Makefile without using bcDamjan Marion1-1/+1
Change-Id: I245f56814ba3911b832e7450d42c58f235bc6dc2 Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-08-31Revert "add bc to dependency list"Damjan Marion1-4/+3
Adding new dependency is not right solution to this problem. This reverts commit e58c93b2764eb306d286531a2b920c6de080cb77. Change-Id: I08f2af5cf9c26c4302b0dbaccebbb52f0614f80f Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-08-30add bc to dependency listGabriel Ganne1-3/+4
replace $(echo "..." | bc) by `echo ... | bc` as they do not seem to behave the same way. Change-Id: Ib8f13f0c8213aaae89d65559427e01bc40f4e8d1 Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
2017-08-29silence makefile warning on ubuntuGabriel Ganne1-1/+1
shell error on ubuntu when OS_VERSION_ID == 16.04: /bin/sh: 1: [: Illegal number: 16.04 Change-Id: I8db55f751ad7fb677a6565cbbce93a9bc08060b7 Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
2017-08-26Add Build Requirements from Makefile to spec file.Thomas F Herbert1-15/+10
JIRA: VPP-498 Changes to build to help with downstream distro builds for Fedora, Centos and RHEL distros. Add nasm, automake, libtool, byacc, bison and flex. Remove libconfuse and dependencies. Remove epel-release rpm and dependencies. Add conditionals to work around Python 2 packaging inconsistency in Fed 25. Add numactl to rpm requirements. Change-Id: Ia39f8b931dc87e42df56414d38662eb33c7a4ca7 Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2017-08-25Fixed the SUSE dependency on libnumaMarco Varlese1-1/+1
Change-Id: I0de13c7fac91c7fc2fcbc9e765ae37720a583aaf Signed-off-by: Marco Varlese <marco.varlese@suse.com>
2017-08-25dpdk: required changes for 17.08Sergio Gonzalez Monroy1-3/+3
DPDK 17.08 breaks ethdev and cryptodev APIs. Address those changes while keeping backwards compatibility for DPDK 17.02 and 17.05. Change-Id: Idd6ac264d0d047fe586c41d4c4ca74e8fc778a54 Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
2017-08-17make test: collect symlinks to failed testsKlement Sekera1-1/+1
Compress files in temporary directories of failed tests and symlink the directories under /tmp/vpp-failed-unittests location - preparation for jenkins archivation. Automatically cleanup the directory at start of test run. The compression is performed only when environment variable COMPRESS_FAILED_TEST_LOGS is set to one of "yes", "y", "1". This is set in verify target, but left unset by default, so when invoking make test by hand, files won't be compressed. Change-Id: I84c8f1c6aa79aa9c0b753357022b1f195f17a283 Signed-off-by: Klement Sekera <ksekera@cisco.com>
2017-08-08Create source rpm.Thomas F Herbert1-0/+3
Use actual file name for tarball. Includes required modifications in spec file for unpacking srpm. Spec file source references actual dist tarball name so it matches the revision and release while building from srpm. JIRA: VPP-498 Change-Id: I8b55a69f060b7864527b94d8c5b0a2ebccc306b1 Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2017-08-04Fix nasm deps for Fedora.Thomas F Herbert1-1/+5
Fedora 24 and 25 distro already includes nasm 2.12 but Centos does not as yet. Change-Id: I060ea8b7b7892ac8444d850398ed1c9100631fbc Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2017-08-02Added NASM package to support SW cryptoMarco Varlese1-1/+1
Change-Id: Idd6614b80e456eb40c760024b563ffd0e5c313ec Signed-off-by: Marco Varlese <marco.varlese@suse.com>
2017-07-20Enable build from dist tarball independent of git.Thomas F Herbert1-6/+11
This is necessary for downstream builds from source rpm. JIRA: VPP-498 Change-Id: I30ea51a19b153dc35ececbbca79b940fe4e3bc8a Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2017-07-17Fix unlinking of /dev/shm files.Dave Wallace1-2/+7
- api-segment prefix not used when unlinking shm files - unlink root region on exit if no clients referenced - stale reference to freed segment name - don't add fake client to /db unless CLIB_DEBUG > 2 - turn off the gmond plugin - clean up unused vars in vpp/api Change-Id: I66451fcfd6ee64a12466c2d6c209050e3cdb74b7 Signed-off-by: Dave Wallace <dwallacelf@gmail.com> Signed-off-by: Dave Barach <dave@barachs.net>
2017-06-30top-level Makefile improvementsDamjan Marion1-11/+36
- auto-execute startup.vpp file if exists - add DPDK_CONFIG=<string> to speficy custom config for autogenerated startup.conf, e.g. DPDK_CONFIG="no-pci" - add DISABLED_PLUGINS=<comma separated list> option e.g. make DISABLED_PLUGINS=dpdk,acl run or export DISABLED_PLUGINS=dpdk,acl make run Change-Id: Ib0891d27aeae16b69b67c4c3e893bb3dbde5e7e1 Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-06-24Rewrite vppctl in CDamjan Marion1-1/+1
- removes python dependency - removes vpp_api_test dependency - communicates over unix socket - properly detects terminal size and type - responds on terminal resize Change-Id: I46c0a49f9b5f9ef8a0a31faec4fc5d49aa3ee02e Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-06-02Add option to build sample plugin in top-level makefileDamjan Marion1-12/+23
Change-Id: Ibf15eeb5fef2a3761089e6386783a1606d2e2b79 Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-06-01Support to install dependencies on openSUSE distributionMarco Varlese1-1/+7
This patch allows to use the "make install-dep" on openSUSE. Change-Id: Ib0586ffebbf882032468e4f4c0df2d5d8e99d7c9 Signed-off-by: Marco Varlese <marco.varlese@suse.com>
2017-05-31Revert "dpdk: build sw cryptodev support with make verify"Peter Mikus1-7/+5
This reverts commit 0e2e10b77d63196bfb93ae5be1251bbc1a1b561a. Change-Id: I3c1737f391b6ed127f92416f06449216e79859bb Signed-off-by: Peter Mikus <pmikus@cisco.com>
2017-05-30dpdk: build sw cryptodev support with make verifySergio Gonzalez Monroy1-5/+7
Change-Id: Ica95b5d3d44563c93c89b2a3233171c3aa1f048d Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
2017-05-29Add Debian Jessie support in toplevel makefileDamjan Marion1-4/+11
Change-Id: I805800503f5330c14d2e654c02bf43e21e7ce917 Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-05-22Disable "make test" for CentOSDamjan Marion1-0/+2
Due to issues with python on centos we cannot reliably execute "make test". To be removed after problem is solved. Change-Id: I92d2b647c72a8ba58cf8a9d4b443357e61ef403f Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-05-20Remove specific versions of some packages.Thomas F Herbert1-4/+5
Add lcov for rhel. Correct fedora Development tools group and rpm-build. Change-Id: I0a19e239e6bc4f34f3aacfbb7e08e2abbdc061ed Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2017-05-19Add indent to DEB_DEPENDS missing in vagrant box.Dave Wallace1-1/+1
Change-Id: Icb9412ed09095443c20ae1fe2b71b646bbe580b0 Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
2017-05-09Generate test paths for lib and lib64 subdirectoriesIgor Mikhailov (imichail)1-2/+5
wildcard produces empty paths when 'make test' is run from a clean tree: install-<tag>-native directories don't exist yet. Change-Id: I3b3bbd86cf7eda18f2c698f85b834f82b1a19065 Signed-off-by: Igor Mikhailov (imichail) <imichail@cisco.com>
2017-05-09Fix remaining 32-bit compile issuesDamjan Marion1-4/+4
Change-Id: I9664214652229b663c3e3ba7406b4ede96bfb123 Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-05-06lcov is an EPEL rpm (at least for Centos)Igor Mikhailov (imichail)1-1/+6
Change-Id: I064a78df6a2cf734bb7c54f80682690c203a0a98 Signed-off-by: Igor Mikhailov (imichail) <imichail@cisco.com>
2017-05-04Fix RPM_DEPENDS for all rpm distros after 28ea251Igor Mikhailov (imichail)1-3/+1
Change-Id: I58ffdf75f361ff830c2b0c6400ccd012a4d16d3d Signed-off-by: Igor Mikhailov (imichail) <imichail@cisco.com>
2017-04-20Extend ebuild to specify "configure" subdir, enable verify for sample-pluginDamjan Marion1-0/+2
Change-Id: I2056e5d19bc3713e7a13e015dabf3b2431800973 Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-04-19disable extended BFD tests in verify jobKlement Sekera1-1/+1
Change-Id: I14484137fde8d6e77fc5905943657089347629fb Signed-off-by: Klement Sekera <ksekera@cisco.com>
2017-04-19Fix "make dist" to include version number, docouple it from rpm packagingDamjan Marion1-8/+20
Change-Id: If2f9976d668089026c97b897cf449bff09050631 Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-04-19make test: python interpreter customizationvagrant1-0/+1
Allow using custom python interpreter via 'PYTHON' env variable. E.g. env PYTHON=pypy make test. Get latest pip automatically to properly function in environments, where old pip is available and a proxy is required. This allows testing pypy in a centos vagrant-provided vm. Change-Id: I67a658fc927303468cc67f0ac192317ca2907625 Signed-off-by: Klement Sekera <ksekera@cisco.com> Signed-off-by: Damjan Marion <damarion@cisco.com>
2017-03-29Fix for dependency problem with Fedora 25Thomas F Herbert1-2/+10
Change-Id: I0e86f8eb6d62c6a109876b5bf35cc62ab617608e Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2017-03-27Check for missing deps on bootstrap target for Centos and Fedora.Thomas F Herbert1-0/+15
Change-Id: I823a066417fb6205d1e6b0fdf1de17b054f6d312 Signed-off-by: Thomas F Herbert <therbert@redhat.com>
2017-03-27Python-API: debian packaging now depends on python-all (for pybuild)Ole Troan1-1/+1
Change-Id: I6b1dd6bdf03fa506c4b114d15800d9fe03e36395 Signed-off-by: Ole Troan <ot@cisco.com>
2017-03-22make test: run all tests in test-cov targetKlement Sekera1-0/+1
Change-Id: I7040c1ecc8b6e5e883420c1c81aa8b70e56263e5 Signed-off-by: Klement Sekera <ksekera@cisco.com>
2017-03-22make test: support out-of-tree testsKlement Sekera1-2/+3
env EXTERN_TESTS="/path/to/extra/tests" make test causes to run the default test set and tests collected from test_*.py files under subtree specified in EXTERN_TESTS. Change-Id: I58c5471dd6010730278a5b47d4318737d920bc28 Signed-off-by: Klement Sekera <ksekera@cisco.com>
2017-03-16Add epel-rpm-macros for CentOS/RHEL install-depAlexander Popovsky (apopovsk)1-1/+1
%py2_install is required by vpp-api-python and is not available on bare CentOS/RHEL install, causing 'fg: no job control' error. Added 'epel-rpm-macros' to the list of EPEL dependencies Change-Id: I1e09d7d825d9d8db06e7385d2b8d5579c8ce748b Signed-off-by: Alexander Popovsky (apopovsk) <apopovsk@cisco.com>
2017-03-15Python API: Change from cPython to CFFI.Ole Troan1-2/+3
Change-Id: I03e52466fb3f909ae52b8fba601168f3eadbd972 Signed-off-by: Ole Troan <ot@cisco.com>
2017-03-14Nasm > 2.11.06 required for sw_crypto.Thomas F Herbert1-0/+1
Change-Id: I7583d3074478579a841c7827a12a4a8fc74d9d61 Signed-off-by: Thomas F Herbert <therbert@redhat.com>