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 --- repo/features/colorado/make_kvmfornfv.sh | 65 -------------------------------- 1 file changed, 65 deletions(-) delete mode 100644 repo/features/colorado/make_kvmfornfv.sh (limited to 'repo/features/colorado/make_kvmfornfv.sh') diff --git a/repo/features/colorado/make_kvmfornfv.sh b/repo/features/colorado/make_kvmfornfv.sh deleted file mode 100644 index 734083a6..00000000 --- a/repo/features/colorado/make_kvmfornfv.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -set -ex - -TEMP_DIR=/work/repo/temp -DST_DIR=/work/repo/packages/kvmfornfv/ -export KVMFORNFV=${kvmfornfv:-https://gerrit.opnfv.org/gerrit/p/kvmfornfv.git} - - -function prepare() -{ - sudo apt-get install -y bc libtool libglib2.0-dev autoconf automake make flex bison - mkdir -p $TEMP_DIR - mkdir -p $DST_DIR - - if [ "git ls-remote $KVMFORNFV" ]; - then - git clone $KVMFORNFV $TEMP_DIR/kvmfornfv - mkdir -p $TEMP_DIR/kvmfornfv/build/{boot,usr} - fi -} - -function make_kernel() -{ - cd $TEMP_DIR/kvmfornfv/kernel - cp arch/x86/configs/opnfv.config .config - make -j8 - make -j8 modules - make INSTALL_PATH=$TEMP_DIR/kvmfornfv/build/boot install - make INSTALL_MOD_PATH=$TEMP_DIR/kvmfornfv/build modules_install -} - -function make_qemu() -{ - mkdir -p $TEMP_DIR/kvmfornfv/qemu/build - cd $TEMP_DIR/kvmfornfv/qemu/build - ../configure --prefix=$TEMP_DIR/kvmfornfv/build/usr --enable-system --enable-kvm - make -j8 - make install -} - -function make_kvmfornfv() -{ - pushd . - - prepare - make_kernel - make_qemu - - tar -czf /kvmfornfv.tar.gz \ - -C $TEMP_DIR/kvmfornfv/build . - cd - - - popd -} - -make_kvmfornfv - -- cgit 1.2.3-korg