From fc11dba19e92609e0631c567ac25756f0c3697df Mon Sep 17 00:00:00 2001
From: Thomas F Herbert <therbert@redhat.com>
Date: Sun, 11 Mar 2018 19:01:09 -0400
Subject: Update to Centos image 7.4-1711

Add qemu-ev version 2.9.0-16
Changes required for vpp 18.04:
Add selinux policy rpms at required version.
Add mbedtls

JIRA: CSIT-566
JIRA: CSIT-680
JIRA: CSIT-681
JIRA: CSIT-602
JIRA: CSIT-608
JIRA: CSIT-603

Update Centos image version 1.8:
Point to Vault repo specific to for 7.3-1611 for
consistent control of package versions and releases.

Fix for pypcap import problem.

JIRA: CSIT-991

This fix forces the downloads of the complete package for all the pip python
packages to be installed on Centos regardless of the Python metadata on
the host.

Change-Id: Id651dd113eec41db738ac1e10c92d1074e89b1de
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
---
 resources/tools/disk-image-builder/centos/build.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'resources/tools/disk-image-builder/centos/build.sh')

diff --git a/resources/tools/disk-image-builder/centos/build.sh b/resources/tools/disk-image-builder/centos/build.sh
index c01d8f634e..0276df8d4f 100755
--- a/resources/tools/disk-image-builder/centos/build.sh
+++ b/resources/tools/disk-image-builder/centos/build.sh
@@ -83,7 +83,7 @@ PACKER_DIR="${BUILD_DIR}/packer"
 RPM_CACHE_DIR="${BUILD_DIR}/cache/rpm"
 PIP_CACHE_DIR="${BUILD_DIR}/cache/pip"
 
-PACKER_TEMPLATE="centos-7.3-1611.json"
+PACKER_TEMPLATE="$1.json"
 LISTS_DIR="$(dirname $0)/lists"
 
 function syntax {
@@ -196,11 +196,17 @@ mkdir -p ${OUTPUT_DIR}/temp/rpm
 mkdir -p ${RPM_CACHE_DIR}
 
 RPM_FILE="${LIST}/rpm-packages.txt"
+REPO_FILE="${LIST}/Centos-Vault.repo"
 ###
 ### Copy rpm package list to cache dir because we are going to use yum on the image
 ###
 echo cp $RPM_FILE ${RPM_CACHE_DIR}
 cp $RPM_FILE ${RPM_CACHE_DIR}
+if [ -e $REPO_FILE ] ; then
+    echo cp $REPO_FILE ${RPM_CACHE_DIR}
+    cp $REPO_FILE ${RPM_CACHE_DIR}
+    ln ${RPM_CACHE_DIR}/Centos-Vault.repo ${OUTPUT_DIR}/temp/rpm/Centos-Vault.repo
+fi
 ln ${RPM_CACHE_DIR}/rpm-packages.txt ${OUTPUT_DIR}/temp/rpm/rpm-packages.txt
 
 ## PIP
-- 
cgit 1.2.3-korg