aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlberto Compagno <acompagn+fdio@cisco.com>2019-08-22 18:14:20 +0200
committerAlberto Compagno <acompagn+fdio@cisco.com>2019-08-22 18:28:41 +0200
commit33eca8c68b581038f225fac7f75b398298341935 (patch)
tree52cb758712bf69dbfa08bf3e55547564e4d8fb10
parent7d14523ac8e0708e8877cce7f3a21a340740dd47 (diff)
[HICN-267] Fixed dependencies on hicn-apps and hicn-light packages
Change-Id: If6615a0b263287b6c1660b636b5b6770da1a3b24 Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
-rw-r--r--README.md2
-rw-r--r--apps/cmake/Modules/Packaging.cmake10
-rw-r--r--hicn-light/cmake/Modules/Packaging.cmake6
-rw-r--r--hicn-plugin/README.md2
4 files changed, 15 insertions, 5 deletions
diff --git a/README.md b/README.md
index a4afc2435..159ab22a4 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ local namespace (local face management).
https://packagecloud.io/fdio/release
## Release note
-The current master branch provides the 19.01 release which is compatible with the 19.01 VPP stable.
+The current master branch provides the 19.08 release which is compatible with the 19.08 VPP stable.
No other VPP releases are supported nor maintained. At every new VPP release distribution hicn
master branch is updated to work with the latest stable release. All previous stable releases
are discontinued and not maintained. The user who is interested in a specific release can always
diff --git a/apps/cmake/Modules/Packaging.cmake b/apps/cmake/Modules/Packaging.cmake
index 5850af707..6a6e34777 100644
--- a/apps/cmake/Modules/Packaging.cmake
+++ b/apps/cmake/Modules/Packaging.cmake
@@ -15,4 +15,14 @@ set(${HICN_APPS}_DESCRIPTION
"Hicn apps provide the higet application, \
useful for testing and debugging within a hicn network."
CACHE STRING "Description for deb/rpm package."
+)
+
+set(${HICN_APPS}_DEB_DEPENDENCIES
+ "lib${LIBTRANSPORT} (>= stable_version)"
+ CACHE STRING "Dependencies for deb/rpm package."
+)
+
+set(${HICN_APPS}_RPM_DEPENDENCIES
+ "lib${LIBTRANSPORT} >= stable_version"
+ CACHE STRING "Dependencies for deb/rpm package."
) \ No newline at end of file
diff --git a/hicn-light/cmake/Modules/Packaging.cmake b/hicn-light/cmake/Modules/Packaging.cmake
index 599238cb6..006261b03 100644
--- a/hicn-light/cmake/Modules/Packaging.cmake
+++ b/hicn-light/cmake/Modules/Packaging.cmake
@@ -15,17 +15,17 @@
# Packages section
######################
-set(${LIBHICN_LIGHT}_DESCRIPTION
+set(${HICN_LIGHT}_DESCRIPTION
"hicn-light is a socket based forwarder"
CACHE STRING "Description for deb/rpm package."
)
-set(${LIBHICN_LIGHT}_DEB_DEPENDENCIES
+set(${HICN_LIGHT}_DEB_DEPENDENCIES
"lib${LIBHICN} (>= stable_version), libparc (>= 1.0)"
CACHE STRING "Dependencies for deb/rpm package."
)
-set(${LIBHICN_LIGHT}_RPM_DEPENDENCIES
+set(${HICN_LIGHT}_RPM_DEPENDENCIES
"lib${LIBHICN} >= stable_version, libparc >= 1.0"
CACHE STRING "Dependencies for deb/rpm package."
) \ No newline at end of file
diff --git a/hicn-plugin/README.md b/hicn-plugin/README.md
index 8a9acae1c..5da8d6a5b 100644
--- a/hicn-plugin/README.md
+++ b/hicn-plugin/README.md
@@ -209,7 +209,7 @@ hicn face app {add intfc <sw_if> {prod prefix <hicn_prefix> cs_size <size_in_pac
`hicn face ip`: manipulates ip application faces in the forwarder.
```
-hicn face ip {[add local <src_address>] remote <dst_address> intfc <sw_if>} | {del id <face_id>}
+hicn face ip {add [local <src_address>] remote <dst_address> intfc <sw_if>} | {del id <face_id>}
<src_address> :the IPv4 or IPv6 local IP address to bind to (not mandatory, if not specified the local address is one of the address assigned to sw_if)
<dst_address> :the IPv4 or IPv6 address of the remote system
<sw_if> :software interface on thop of which we create the face