diff options
Diffstat (limited to 'build/f_isoroot/f_odlpluginbuild')
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/Makefile | 10 | ||||
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/config.mk | 9 |
2 files changed, 2 insertions, 17 deletions
diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile index c5978ded0..e2cbf7d46 100644 --- a/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/build/f_isoroot/f_odlpluginbuild/Makefile @@ -28,16 +28,6 @@ release:.odlbuild cp gitinfo_odlplugin.txt $(BUILD_BASE) .odlbuild: rm -rf fuel-plugin-opendaylight - sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev - sudo gem install fpm - #Temporary fpb needs to be build from sources - git clone -b $(FPB_BRANCH) $(FPB_REPO) - cd fuel-plugins; \ - if [ -n $(FPB_CHANGE) ]; then \ - git checkout $(FPB_CHANGE); \ - python setup.py sdist; \ - sudo pip install ./dist/fuel-plugin-builder-*.tar.gz; \ - fi git clone -b $(ODL_BRANCH) $(ODL_REPO) cd fuel-plugin-opendaylight; \ if [ -n $(ODL_CHANGE) ]; then \ diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk index 876998cd9..8ad823dfb 100644 --- a/build/f_isoroot/f_odlpluginbuild/config.mk +++ b/build/f_isoroot/f_odlpluginbuild/config.mk @@ -8,14 +8,9 @@ ############################################################################## ODL_BRANCH ?= master -ODL_CHANGE ?= 1c8443ffc64af120337740551307378d1c21535d +ODL_CHANGE ?= 5d80efce6d0b1d242489ec2897cf20f51dd5fcb1 ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git -FPB_BRANCH ?= master -FPB_CHANGE ?= 82191ca16b40021e445e854fad37c65cd8e70b0c -FPB_REPO ?= https://github.com/openstack/fuel-plugins - -export USE_JAVA8?=true -export JAVA8_URL?=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz export ODL_VERSION_NUMBER?=0.4.2 +export ODL_BORON_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.tar.gz |