diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-08 14:36:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-08 14:36:36 +0000 |
| commit | e452ec9d11db0a94f6c3221a3ab7682245fc893e (patch) | |
| tree | e5ae5cd6a034150bf1cb626fa220721047cff6c6 /patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch | |
| parent | 44026e0752ce42b3516679cc547703aa21be39e8 (diff) | |
| parent | e7e2d84bec0d404057bce203f9c90231360e88ee (diff) | |
Merge "Rebase: deploy related patch series."
Diffstat (limited to 'patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch')
| -rw-r--r-- | patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch b/patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch new file mode 100644 index 00000000..719ec935 --- /dev/null +++ b/patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch @@ -0,0 +1,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 a5e8a96..e64a05e 100644 +--- a/build/f_isoroot/f_odlpluginbuild/config.mk ++++ b/build/f_isoroot/f_odlpluginbuild/config.mk +@@ -12,6 +12,6 @@ ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a + 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 |