From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 25 Apr 2016 20:16:06 +0000 (+0200)
Subject: Makefile: Finalize RPM repo switch.
X-Git-Tag: colorado.1.rc1~519
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5bd40a77a6542d90c36be58d1c2ceece3e85f65f;p=armband.git

Makefile: Finalize RPM repo switch.

We previously added support for needed RPMs missing from Fuel repos,
by introducing an additional "armband" repository, then ammending
OPNFV ks.cfg{,.orig}; it's time to remove RPM mirror override
LATEST_MIRROR_ID_URL.

Since LATEST_MIRROR_ID_URL is common for mos CentOS and Ubuntu repos,
fill in MIRROR_MOS_UBUNTU instead.

Change-Id: I6eb88da6ef2e174b571619a7d12cc134f6508492
---

diff --git a/Makefile b/Makefile
index f954a611..6c20530b 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ build:
 			CENTOS_MAJOR=7 \
 			EXTRA_RPM_REPOS="armband,http://linux.enea.com/mos-repos/centos/mos8.0-centos7-fuel/armband/x86_64,10" \
 			MIRROR_UBUNTU_URL=http://archive.ubuntu.com/ubuntu/ \
-			LATEST_MIRROR_ID_URL=http://linux.enea.com/ \
+			MIRROR_MOS_UBUNTU=linux.enea.com \
 			JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_arm64.deb \
 			$(EXTRA_PARAMS) \
 			iso 2>&1 | tee ${root}/build.log