Code Review / armband.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Rebase: Sync after Build system uplift to Fuel 9.0
[armband.git] / patches / opnfv-fuel / 0002-Allow-customizing-java-and-fuel-mirror-URLs.patch
diff --git a/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch b/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch
index 6666835..719ec93 100644 (file)
--- a/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch
+++ b/patches/opnfv-fuel/0002-Allow-customizing-java-and-fuel-mirror-URLs.patch
@@ -3,23 +3,22 @@ Date: Wed, 24 Feb 2016 20:02:25 +0100
 Subject: [PATCH] Allow customizing java and fuel-mirror URLs
 
 ---
- build/f_isoroot/f_odlpluginbuild/Makefile | 2 +-
- build/f_isoroot/f_repobuild/Makefile      | 3 ++-
+ 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/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
-index f2a47b7..b0bc9c7 100644
---- a/build/f_isoroot/f_odlpluginbuild/Makefile
-+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
-@@ -12,7 +12,7 @@ ODL_BRANCH=brahmaputra-release
+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
- 
- .PHONY: all
- all: .odlbuild
+ 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