Although attempts to build code containing merge conflict markers
USUALLY results in compile errors, this patch adds an explicit check
for the conflict end marker.
If for some unknown reason it's necessary to check in the text
'>>>>>>>', construct it by concatenation: ">>>"">>>>"
or '>>>' + '>>>>' depending on the language involved.
Type: improvement
Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: Iaad2aa8b87a71137a3bb9a09f7f4159909bf79ab
Add tooling for feature metadata configuration files.
The main tool is in src/scripts/fts.py
make checkfeaturelist to validate against schema.
make featurelist to dump all feature lists to stdout.
Example feature definition:
name: IP in IP tunnelling
maintainer: Ole Troan <ot@cisco.com>
features:
- IPv4/IPv6 over IPv4/IPv6 encapsulation:
- Fragmentation and Reassembly
- Configurable MTU
- Inner to outer Traffic Class / TOS copy
- Configurable Traffic Class / TOS
- ICMPv4 / ICMPv6 proxying
- 6RD (RFC5969):
- Border Relay
description: "Implements IP{v4,v6} over IP{v4,v6} tunnelling as
described in RFC2473. This module also implement the border relay of
6RD (RFC5969)."
state: production
properties: [API, CLI, STATS, MULTITHREAD]
missing:
- Tunnel PMTUD
- Tracking of FIB state for tunnel state
- IPv6 extension headers (Tunnel encapsulation limit option)
JSON schema is embedded in fts.py
Example markdown: https://github.com/otroan/scratch/blob/master/features.md
Change-Id: I903b4ee6b316a9378c259e86dc937092e5d4b7da
Type: make
Signed-off-by: Ole Troan <ot@cisco.com>
The license issue is resolved, so we can package the .json
files. Added to the vpp-dev package in .tar.xz form, which saves a lot
of space.
Updated the perfmon error log entry: tell folks where to find the
compressed tarball, and how to extract it.
Change-Id: I3ed351fbf154cc3ba22d5f9c666acff77a2a14cf
Signed-off-by: Dave Barach <dave@barachs.net>
It is packaging responsibility to put libs in the right place.
Use of lib64 resulted in huge amount of files with hardcoded lib64.
This patch simplifies things...
Change-Id: Iab0dea0583e480907732c5d2379eb951a00fa9e6
Signed-off-by: Damjan Marion <damarion@cisco.com>
Net of rewriting vppapigen in python-ply, there's no need to compile
vppinfra.
Install a copy of vppapigen in .../build-root/tools/bin, so
the sample plugin build will work. Rationalize suffix-rules.mk.
Add clang, clang++ links to .../build-root/ccache-bin.
Change-Id: Ib4017848b7767b6054238ea544ee5319667c3659
Signed-off-by: Dave Barach <dave@barachs.net>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I1a5afd49c37e1faf59311e16389b3b5deff015a3
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I25a69cf3c9a93754e0cbfc0c1bc62f10883d3027
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I5ad0e36fa40095cc107a31b32dd2bbf936636dc4
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I9a154daa661fc5f2f1e7c2eeb77a4bb08d4e34be
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I54f8d49f541102163964a41403ab993a51534e7e
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I818bb7f1778cd92716feeaeb9fc1af59c62bdbc2
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: Ib098170bbcdbbb01c25ef197d9181cfd826d2854
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I6331016b17b0811bf0ea1be03c5782428514a01a
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: If582dc7c5e37bd3cda7ba4858e98fc504e2b7b1e
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I23c6b5cb9bab6e295ff145531eabc2d51df49a94
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I09c8551e47dc78567e591ace1e552d3c534e5aab
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I3ec322a71764d6d3e8aaeeabd4464fd6bde2880e
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I5837921208bfdfe604c187c103e78b0924d802b9
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I3e429f3884953908209e5f2d4e7a254dc7ccb720
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I5645ebfaa32599797e4edf83b2281270ea4a8376
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I0e19f085153ca00ddb46e016cff742b42eca15a0
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I49396105470609422f28a49211012fcd9f252587
Signed-off-by: Jan Gelety <jgelety@cisco.com>
This reverts commit 9757325c52c223d85abfad834b071077365d4808.
Change-Id: I3bee0fe7d48be723334f2bd9fffd3240658b9e71
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
- Move Coverity scripts from build-root/scripts to extras/scripts
- Update coverity-build with new path and add some comments
Change-Id: I1be8069fb574aaacbac9b7f2c9c80b9aad1790ec
Signed-off-by: Chris Luke <chrisy@flirble.org>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I66357690f41e23dd1b924cc50a951a6c3696e071
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I916427584df514088f2d8cbcc3483c397ca4d6f5
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I4bf32bc12c7417f7c19b23287a2b2899eb8fb02d
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I1a312a4a3085930c0019ec6832cb9f482174eea3
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: Ia8078ae23e0e6fb701e141fd0701fb82987743d7
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I815b3ef67f1664f72f68984087413f4c4985f694
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I43cc99ea3ad6266b4792a7721968de89b7328306
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I8293091fda82de587cba0b3bd2f8490d74c001a5
Signed-off-by: Jan Gelety <jgelety@cisco.com>
- update of CSIT operational branch to be used for VPP-patch test
Change-Id: I5abf9026318a7a8b4cd56c0044b7f0061ff41f58
Signed-off-by: Jan Gelety <jgelety@cisco.com>
