From 221f558101ae0a421e621947d62c2199c6cfa5ff Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Fri, 31 Mar 2017 13:05:52 +0200
Subject: Bump hc2vpp version to 1.17.04-RC1

Also updates honeycomb dependencies and vpp package dependencies

Change-Id: I4527d86b4ebf6e8e8a92c8d62c5a14640802b3e7
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 packaging/deb/common/prepare.sh       | 8 ++++----
 packaging/deb/common/vpp_dependencies | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'packaging/deb/common')

diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh
index 69d535389..ba2ccb633 100755
--- a/packaging/deb/common/prepare.sh
+++ b/packaging/deb/common/prepare.sh
@@ -14,9 +14,9 @@ BUILD_DEPENDENCIES=$($5)
 
 # Copy and unpack the archive with vpp-integration distribution
 ARCHIVE_DIR=${SOURCE_DIR}/../../../vpp-integration/minimal-distribution/target/
-ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz
+ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-RC1-hc.tar.gz
 cp ${ARCHIVE} ${SOURCE_DIR}
-ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz
+ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-RC1-hc.tar.gz
 tar -xf ${ARCHIVE} -C ${SOURCE_DIR}/
 
 # Create packaging root
@@ -24,7 +24,7 @@ rm -rf ${BUILD_DIR}
 mkdir ${BUILD_DIR}
 
 # Copy contents of tar.gz
-mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${BUILD_DIR}/
+mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-RC1/ ${BUILD_DIR}/
 cp -r $2 ${BUILD_DIR}
 
 # OS service definition
@@ -41,7 +41,7 @@ EOT
 
 # Install instructions
 cat <<EOT >> ${BUILD_DIR}/debian/install
-vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/
+vpp-integration-distribution-${VERSION}-RC1/* /opt/honeycomb/
 $3 $4
 EOT
 
diff --git a/packaging/deb/common/vpp_dependencies b/packaging/deb/common/vpp_dependencies
index 8c1c21617..799376608 100755
--- a/packaging/deb/common/vpp_dependencies
+++ b/packaging/deb/common/vpp_dependencies
@@ -1,6 +1,6 @@
 #!/bin/bash
 # defines vpp and vpp-plugins dependencies for debian packages
 # using range
-echo "vpp (>= 17.04), vpp (<< 17.07), vpp-plugins (>= 17.04), vpp-plugins (<< 17.07)"
+echo "vpp (>= 17.04-rc1), vpp (<< 17.05), vpp-plugins (>= 17.04-rc1), vpp-plugins (<< 17.05)"
 # or specific vpp version
 #echo "vpp (= 17.04-rc1), vpp-plugins (= 17.04-rc1)"
-- 
cgit 1.2.3-korg