patches/opnfv-fuel/0002-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/Makefile | 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/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
  11 index e8afd4a..589adb8 100644
  12 --- a/build/f_isoroot/f_odlpluginbuild/Makefile
  13 +++ b/build/f_isoroot/f_odlpluginbuild/Makefile
  14 @@ -12,7 +12,7 @@ ODL_BRANCH=brahmaputra-sr2
  15  ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
  16
  17  export USE_JAVA8=true
  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  .PHONY: all
  23 diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile
  24 index e95dbf2..709ca6b 100644
  25 --- a/build/f_isoroot/f_repobuild/Makefile
  26 +++ b/build/f_isoroot/f_repobuild/Makefile
  27 @@ -12,6 +12,7 @@ SHELL := /bin/bash
  28  TOP := $(shell pwd)
  29  TMP_ROOT_DIR := $(shell echo "$(MIRROR_UBUNTU_ROOT)" | cut -d "/" -f2)
  30  # Enable use of exact repo commit if defined, else use Fuel main branch
  31 +FUEL_MIRROR_REPO:=https://github.com/openstack/fuel-mirror
  32  FUEL_MIRROR_COMMIT?=$(FUEL_MAIN_TAG)
  33
  34  include ../../config.mk
  35 @@ -26,7 +27,7 @@ nailgun:
  36         sudo apt-get install -y git libxml2-dev libxslt-dev python-dev  python-pip libz-dev libyaml-dev createrepo python-yaml
  37         rm -Rf nailgun
  38         sudo mkdir -p /var/www/nailgun
  39 -       git clone https://github.com/openstack/fuel-mirror
  40 +       git clone $(FUEL_MIRROR_REPO)
  41         cd fuel-mirror && git checkout -q $(FUEL_MIRROR_COMMIT)
  42         sudo pip install -U -r ./fuel-mirror/requirements.txt
  43         sudo pip install ./fuel-mirror