summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-01-30 05:14:19 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-30 05:14:19 +0000
commita7664d66d61424d6e931daf14e0cc50b82db76a7 (patch)
treefac209dc517a163827059678e20f6029598c27f1
parent951cec74b7b8cef5db2f2bda7375653fedaedbf8 (diff)
parentfd39e2cc7643af69fb692df48895683c487d2b01 (diff)
Merge "add files for build onos/odl/open-contrail" into stable/brahmaputra
-rw-r--r--build/gen_ins_pkg_script.py5
-rwxr-xr-xbuild/make_packages.sh22
-rw-r--r--build/packages/make_odl.sh11
-rw-r--r--build/packages/make_onos.sh16
-rw-r--r--build/packages/make_opencon-trail.sh11
5 files changed, 62 insertions, 3 deletions
diff --git a/build/gen_ins_pkg_script.py b/build/gen_ins_pkg_script.py
index 132df25f..ec04c511 100644
--- a/build/gen_ins_pkg_script.py
+++ b/build/gen_ins_pkg_script.py
@@ -35,10 +35,9 @@ def get_packages_name_list(file_list, special_packages):
for i in value:
if i in special_packages:
continue
+ package_name_list.append(i)
- package_name_list.append(value)
-
- return list(set(package_name_list)
+ return package_name_list
def generate_download_script(root="", arch="", tmpl="", docker_tmpl="", default_packages="",
special_packages="", special_packages_script_dir="", special_packages_dir=""):
diff --git a/build/make_packages.sh b/build/make_packages.sh
new file mode 100755
index 00000000..b7cb5ca2
--- /dev/null
+++ b/build/make_packages.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -ex
+
+BUILD_PATH=$(cd "$(dirname "$0")"; pwd)
+WORK_PATH=$(cd "$(dirname "$0")"/..; pwd)
+
+if [[ -d $WORK_PATH/work/repo/packages ]]; then
+ rm -rf $WORK_PATH/work/repo/packages
+fi
+
+if [[ -d $WORK_PATH/work/repo/temp ]]; then
+ rm -rf $WORK_PATH/work/repo/temp
+fi
+
+mkdir -p $WORK_PATH/work/repo/packages
+mkdir -p $WORK_PATH/work/repo/temp
+
+for i in `ls $WORK_PATH/build/packages`; do
+ . $WORK_PATH/build/packages/$i $WORK_PATH/repo/packages
+done
+
+tar -zcvf $WORK_PATH/repo/packages.tar.gz $WORK_PATH/work/repo/packages
diff --git a/build/packages/make_odl.sh b/build/packages/make_odl.sh
new file mode 100644
index 00000000..7da5ba58
--- /dev/null
+++ b/build/packages/make_odl.sh
@@ -0,0 +1,11 @@
+
+WORK_PATH=$(cd "$(dirname "$0")"/..; pwd)
+
+source $WORK_PATH/build/build.conf
+
+for i in odl.tar.gz; do
+ curl --connect-timeout $TIMEOUT -o $WORK_PATH/work/repo/temp/$i $PACKAGE_URL/$i
+ tar -zxvf $WORK_PATH/work/repo/temp/$i -C $WORK_PATH/work/repo/packages
+done
+
+
diff --git a/build/packages/make_onos.sh b/build/packages/make_onos.sh
new file mode 100644
index 00000000..2b94c979
--- /dev/null
+++ b/build/packages/make_onos.sh
@@ -0,0 +1,16 @@
+
+WORK_PATH=$(cd "$(dirname "$0")"/..; pwd)
+
+source $WORK_PATH/build/build.conf
+
+mkdir -p $WORK_PATH/work/repo/packages/onos
+for i in repository.tar jdk-8u51-linux-x64.tar.gz; do
+ curl --connect-timeout $TIMEOUT -o $WORK_PATH/work/repo/packages/onos/$i $PACKAGE_URL/$i
+done
+
+git clone https://gerrit.opnfv.org/gerrit/onosfw $WORK_PATH/work/repo/temp/onosfw
+
+pushd .
+cd $WORK_PATH/work/repo/temp/onosfw/
+. autobuild.sh $WORK_PATH/work/repo/packages/onos
+popd
diff --git a/build/packages/make_opencon-trail.sh b/build/packages/make_opencon-trail.sh
new file mode 100644
index 00000000..0430c12a
--- /dev/null
+++ b/build/packages/make_opencon-trail.sh
@@ -0,0 +1,11 @@
+
+WORK_PATH=$(cd "$(dirname "$0")"/..; pwd)
+
+source $WORK_PATH/build/build.conf
+
+for i in open-contrail.tar.gz; do
+ curl --connect-timeout $TIMEOUT -o $WORK_PATH/work/repo/temp/$i $PACKAGE_URL/$i
+ tar -zxvf $WORK_PATH/work/repo/temp/$i -C $WORK_PATH/work/repo/packages
+done
+
+