patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch

   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
   4
   5 ---
   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(-)
   9
  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,5 +12,5 @@ ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a
  15
  16  export USE_JAVA8=true
  17 -export JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb
  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 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
  20  export ODL_VERSION_NUMBER=0.4.2
  21 diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
  22 index e95dbf2..709ca6b 100644
  23 --- a/build/f_isoroot/f_repobuild/Makefile
  24 +++ b/build/f_isoroot/f_repobuild/Makefile
  25 @@ -12,6 +12,7 @@ SHELL := /bin/bash
  26  TOP := $(shell pwd)
  27  TMP_ROOT_DIR := $(shell echo "$(MIRROR_UBUNTU_ROOT)" | cut -d "/" -f2)
  28  # Enable use of exact repo commit if defined, else use Fuel main branch
  29 +FUEL_MIRROR_REPO:=https://github.com/openstack/fuel-mirror
  30  FUEL_MIRROR_COMMIT?=$(FUEL_MAIN_TAG)
  31
  32  include ../../config.mk
  33 @@ -26,7 +27,7 @@ nailgun:
  34         sudo apt-get install -y git libxml2-dev libxslt-dev python-dev  python-pip libz-dev libyaml-dev createrepo python-yaml
  35         rm -Rf nailgun
  36         sudo mkdir -p /var/www/nailgun
  37 -       git clone https://github.com/openstack/fuel-mirror
  38 +       git clone $(FUEL_MIRROR_REPO)
  39         cd fuel-mirror && git checkout -q $(FUEL_MIRROR_COMMIT)
  40         sudo pip install -U -r ./fuel-mirror/requirements.txt
  41         sudo pip install ./fuel-mirror