1 From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
2 Date: Wed, 24 Feb 2016 20:02:25 +0100
3 Subject: [PATCH] Allow customizing java and fuel-mirror URLs
6 build/f_isoroot/f_odlpluginbuild/config.mk | 2 +-
7 build/f_isoroot/f_repobuild/Makefile | 3 ++-
8 2 files changed, 3 insertions(+), 2 deletions(-)
10 diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
11 index a5e8a96..e64a05e 100644
12 --- a/build/f_isoroot/f_odlpluginbuild/config.mk
13 +++ b/build/f_isoroot/f_odlpluginbuild/config.mk
14 @@ -12,6 +12,6 @@ ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a
15 ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
18 -export JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb
19 +export JAVA8_URL:=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb
20 export ODL_TARBALL_LOCATION=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz
21 export ODL_VERSION_NUMBER=0.4.1
22 diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
23 index e95dbf2..709ca6b 100644
24 --- a/build/f_isoroot/f_repobuild/Makefile
25 +++ b/build/f_isoroot/f_repobuild/Makefile
26 @@ -12,6 +12,7 @@ SHELL := /bin/bash
28 TMP_ROOT_DIR := $(shell echo "$(MIRROR_UBUNTU_ROOT)" | cut -d "/" -f2)
29 # Enable use of exact repo commit if defined, else use Fuel main branch
30 +FUEL_MIRROR_REPO:=https://github.com/openstack/fuel-mirror
31 FUEL_MIRROR_COMMIT?=$(FUEL_MAIN_TAG)
33 include ../../config.mk
34 @@ -26,7 +27,7 @@ nailgun:
35 sudo apt-get install -y git libxml2-dev libxslt-dev python-dev python-pip libz-dev libyaml-dev createrepo python-yaml
37 sudo mkdir -p /var/www/nailgun
38 - git clone https://github.com/openstack/fuel-mirror
39 + git clone $(FUEL_MIRROR_REPO)
40 cd fuel-mirror && git checkout -q $(FUEL_MIRROR_COMMIT)
41 sudo pip install -U -r ./fuel-mirror/requirements.txt
42 sudo pip install ./fuel-mirror