From 6f279a7362504418cfcc453e11b3a9c2d458a2ea Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Wed, 18 Jan 2017 16:47:25 +0800 Subject: Adjust make repo Demand: 1.Compass4nfv master code only support one OPNFV version now, no need to keep previous version's repo scripts 2.Currently java packages are in /var/www/package/onos directory which is unreasonable 3.repo.conf has a lot of download URL which can turn into pip requirements Modification: 1.Remove previous version's directory in compass4nfv/repo 2.Only leave java and odl in compass4nfv/repo/features. Other features can be added when they are ready 3.Seperate URLs in repo.conf into compass-core and openstack pip requirements. Therefore pip.tar.gz only contains pip packages for compass-core and pip-openstack.tar.gz only contains pip packages for openstack 3.Move java packages into /var/www/package/java directory 4.Add make pip wheel package function to support congress 5.Use ODL package distribution-karaf-0.5.0-Boron.tar.gz 6.Use python package netwoking-odl-3.2.0 Change-Id: Ifa818e7630ac4435e3bdb7756b83f80f50c24a76 Signed-off-by: Harry Huang --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 5765aa11..249e6e53 100755 --- a/build.sh +++ b/build.sh @@ -64,7 +64,7 @@ function download_git() function download_url() { rm -f $CACHE_DIR/$1.md5 - curl --connect-timeout 10 -o $CACHE_DIR/$1.md5 $2.md5 2>/dev/null + curl --connect-timeout 10 -o $CACHE_DIR/$1.md5 $2.md5 2>/dev/null || true if [[ -f $CACHE_DIR/$1 ]]; then local_md5=`md5sum $CACHE_DIR/$1 | cut -d ' ' -f 1` repo_md5=`cat $CACHE_DIR/$1.md5 | cut -d ' ' -f 1` -- cgit 1.2.3-korg