From b95da59966d1c39b2be874222a265fbdc9c190ef Mon Sep 17 00:00:00 2001 From: Angelo Mantellini Date: Thu, 14 Feb 2019 11:15:08 +0100 Subject: [HICN-63] ccnx-common broken build because of tests Change-Id: I9ee68c28b121abaca7916b1edc8508e58c9fa299 Signed-off-by: Angelo Mantellini --- libccnx-portal/scripts/build-package.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'libccnx-portal/scripts/build-package.sh') diff --git a/libccnx-portal/scripts/build-package.sh b/libccnx-portal/scripts/build-package.sh index 300d0f4e..f97a1874 100644 --- a/libccnx-portal/scripts/build-package.sh +++ b/libccnx-portal/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"} -- cgit 1.2.3-korg