diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2019-01-24 10:05:46 +0100 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2019-01-24 09:10:37 +0000 |
| commit | 64381e32766fe0e2ad9585a252782bf247d09b01 (patch) | |
| tree | 9c8410cc37d7d62200a529d7e9da2e4cb2dc9373 | |
| parent | 06073f2b92695c1267f476cdf576b8768eed912d (diff) | |
[CICN-13] Add support for ubuntu18.04 packages.
Change-Id: Ie415ee7d9f998c51885720b5c24ae0a1961124f3
Signed-off-by: Mauro Sardara <msardara@cisco.com>
| -rw-r--r-- | libparc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libparc/scripts/build-package.sh | 8 | ||||
| -rw-r--r-- | longbow/scripts/build-package.sh | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libparc/CMakeLists.txt b/libparc/CMakeLists.txt index 02e21bcf..f40a340e 100644 --- a/libparc/CMakeLists.txt +++ b/libparc/CMakeLists.txt @@ -151,7 +151,7 @@ if(DEB_PACKAGE) set(CPACK_${TYPE}_HEADERS_FILE_NAME "${PACKAGE_NAME}-dev_${PACKAGE_VERSION}_${ARCHITECTURE}.deb") set(CPACK_${TYPE}_DOCUMENTATION_FILE_NAME "${PACKAGE_NAME}-doc_${PACKAGE_VERSION}_${ARCHITECTURE}.deb") -# set(CPACK_DEBIAN_LIBRARY_PACKAGE_SHLIBDEPS ON) + set(CPACK_DEBIAN_LIBRARY_PACKAGE_SHLIBDEPS ON) if(ENABLE_TEST) set(CPACK_${TYPE}_LIBRARY_PACKAGE_DEPENDS "longbow (>= 1.0)") diff --git a/libparc/scripts/build-package.sh b/libparc/scripts/build-package.sh index dd149713..2f651aa9 100644 --- a/libparc/scripts/build-package.sh +++ b/libparc/scripts/build-package.sh @@ -36,7 +36,7 @@ update_cmake_repo() { update_qt_repo() { DISTRIBUTION_CODENAME=$1 - if [ "$DISTRIBUTION_CODENAME" != "trusty" ] && [ "$DISTRIBUTION_CODENAME" != "xenial" ]; then + if [ "$DISTRIBUTION_CODENAME" != "bionic" ] && [ "$DISTRIBUTION_CODENAME" != "xenial" ]; then echo "No valid distribution specified when calling 'update_qt_repo'. Exiting.." exit -1 fi @@ -68,9 +68,9 @@ update_fdio_repo() { REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1701.ubuntu.xenial.main/" REPO=${REPO_NAME:-"master.ubuntu.xenial.main"} REPO_CICN_URL="${NEXUS_PROXY}/content/repositories/fd.io.${REPO}" - elif [ "$DISTRIB_CODENAME" == "trusty" ]; then - REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1701.ubuntu.trusty.main/" - REPO=${REPO_NAME:-"master.ubuntu.trusty.main"} + elif [ "$DISTRIB_CODENAME" == "bionic" ]; then + REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1701.ubuntu.bionic.main/" + REPO=${REPO_NAME:-"master.ubuntu.bionic.main"} REPO_CICN_URL="${NEXUS_PROXY}/content/repositories/fd.io.${REPO}" else echo "Distribution $DISTRIB_CODENAME is not supported" diff --git a/longbow/scripts/build-package.sh b/longbow/scripts/build-package.sh index 9bab45e5..ebf9afd1 100644 --- a/longbow/scripts/build-package.sh +++ b/longbow/scripts/build-package.sh @@ -36,7 +36,7 @@ update_cmake_repo() { update_qt_repo() { DISTRIBUTION_CODENAME=$1 - if [ "$DISTRIBUTION_CODENAME" != "trusty" ] && [ "$DISTRIBUTION_CODENAME" != "xenial" ]; then + if [ "$DISTRIBUTION_CODENAME" != "bionic" ] && [ "$DISTRIBUTION_CODENAME" != "xenial" ]; then echo "No valid distribution specified when calling 'update_qt_repo'. Exiting.." exit -1 fi @@ -68,9 +68,9 @@ update_fdio_repo() { REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1701.ubuntu.xenial.main/" REPO=${REPO_NAME:-"master.ubuntu.xenial.main"} REPO_CICN_URL="${NEXUS_PROXY}/content/repositories/fd.io.${REPO}" - elif [ "$DISTRIB_CODENAME" == "trusty" ]; then - REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1701.ubuntu.trusty.main/" - REPO=${REPO_NAME:-"master.ubuntu.trusty.main"} + elif [ "$DISTRIB_CODENAME" == "bionic" ]; then + REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1701.ubuntu.bionic.main/" + REPO=${REPO_NAME:-"master.ubuntu.bionic.main"} REPO_CICN_URL="${NEXUS_PROXY}/content/repositories/fd.io.${REPO}" else echo "Distribution $DISTRIB_CODENAME is not supported" |