diff options
Diffstat (limited to 'libccnx-common')
-rw-r--r-- | libccnx-common/ccnx/common/test/CMakeLists.txt | 4 | ||||
-rw-r--r-- | libccnx-common/scripts/build-package.sh | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/libccnx-common/ccnx/common/test/CMakeLists.txt b/libccnx-common/ccnx/common/test/CMakeLists.txt index 4cf70a14..b9638944 100644 --- a/libccnx-common/ccnx/common/test/CMakeLists.txt +++ b/libccnx-common/ccnx/common/test/CMakeLists.txt @@ -11,11 +11,7 @@ set(TestsExpectedToPass test_ccnx_InterestReturn test_ccnx_KeyLocator test_ccnx_KeystoreUtilities - test_ccnx_Link - test_ccnx_Manifest - test_ccnx_ManifestHashGroup test_ccnx_Name - test_ccnx_NameLabel test_ccnx_NameSegment test_ccnx_NameSegmentNumber test_ccnx_TimeStamp diff --git a/libccnx-common/scripts/build-package.sh b/libccnx-common/scripts/build-package.sh index 0b7792fa..8f159d03 100644 --- a/libccnx-common/scripts/build-package.sh +++ b/libccnx-common/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" != "trusty" ] && [ "$DISTRIBUTION_CODENAME" != "xenial" ] && [ "$DISTRIBUTION_CODENAME" != "bionic" ]; then echo "No valid distribution specified when calling 'update_qt_repo'. Exiting.." exit -1 fi @@ -68,18 +68,21 @@ 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}" + echo "deb ${REPO_VPP_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list + echo "deb ${REPO_CICN_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.master.list 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"} REPO_CICN_URL="${NEXUS_PROXY}/content/repositories/fd.io.${REPO}" + echo "deb ${REPO_VPP_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list + echo "deb ${REPO_CICN_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.master.list + elif [ "$DISTRIB_CODENAME" == "bionic" ]; then + curl -s https://packagecloud.io/install/repositories/fdio/release/script.deb.sh | sudo bash else echo "Distribution $DISTRIB_CODENAME is not supported" exit -1 fi - echo "deb ${REPO_VPP_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list - echo "deb ${REPO_CICN_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.master.list - elif [ "$DISTRIB_ID" == "CentOS" ]; then REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.centos7/" REPO=${REPO_NAME:-"master.centos7"} |