summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-15 19:59:14 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-15 19:59:30 +0200
commit6c43c2fba0023cb4951a28eafcdce8f885ce4b3f (patch)
tree7194819dacaaea3f02c5b31653d5915ce745ea29 /patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch
parenteef24004b97a14d938d7577a604c15245d1e5cd4 (diff)
Upstream: remote-libvirt + custom tags.
Change-Id: I3702648583983ac7afcfef7a9556fcd33e984457 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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.patch41
1 files changed, 0 insertions, 41 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
deleted file mode 100644
index 65d0359f..00000000
--- a/patches/opnfv-fuel/0017-Allow-customizing-java-and-fuel-mirror-URLs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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,5 +12,5 @@ ODL_CHANGE=ec9474c1178e7451ec75f6e306ac84424a84a28a
-
- 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/groups/public/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz
- export ODL_VERSION_NUMBER=0.4.2
-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