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