From 97e076b8ab9d1c439f3327adeeae37d2d515d731 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 19 Mar 2018 16:14:38 -0400
Subject: [PATCH] build-iso: prevent use of host yum.conf when processing
 kickstart rpms

The build host's yum.conf should not be allowed to influence the
iso we compile.

Story: 2002835
Task: 24519
Change-Id: I202ddbbe64d2dafc198fc7055e360f1c4b047bcc
Signed-off-by: Scott Little <scott.little@windriver.com>
---
 build-tools/build-iso | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/build-tools/build-iso b/build-tools/build-iso
index e99f66f3..e1427b9b 100755
--- a/build-tools/build-iso
+++ b/build-tools/build-iso
@@ -37,6 +37,8 @@ usage () {
 }
 
 MY_YUM_CONF=""
+STD_REPO_ID="local-std"
+RT_REPO_ID="local-rt"
 
 NPROCS=$(nproc)
 
@@ -458,10 +460,11 @@ function final_touches {
 }
 
 function extract_pkg_from_local_repo {
-   local repodir=$1
-   local pkgname=$2
+   local yum_conf=$1
+   local repoid=$2
+   local pkgname=$3
 
-   local pkgfile=$(repoquery --repofrompath local,${repodir} --location -q ${pkgname})
+   local pkgfile=$(repoquery --config=${yum_conf} --repoid=${repoid} --location -q ${pkgname})
    if [ -z "${pkgfile}" ]; then
       echo "Could not find package $pkgname in $repodir"
       exit 1
@@ -488,9 +491,9 @@ function extract_installer_files {
 
    \cd kickstart.work
 
-   extract_pkg_from_local_repo ${CGCS_REPO_DIR} platform-kickstarts
-   extract_pkg_from_local_repo ${CGCS_REPO_DIR} platform-kickstarts-pxeboot
-   extract_pkg_from_local_repo ${CGCS_REPO_DIR} platform-kickstarts-extracfgs
+   extract_pkg_from_local_repo ${MY_YUM_CONF} ${STD_REPO_ID} platform-kickstarts
+   extract_pkg_from_local_repo ${MY_YUM_CONF} ${STD_REPO_ID} platform-kickstarts-pxeboot
+   extract_pkg_from_local_repo ${MY_YUM_CONF} ${STD_REPO_ID} platform-kickstarts-extracfgs
 
    \cp --preserve=all www/pages/feed/rel-*/*.cfg pxeboot/*.cfg ../kickstarts/ &&
    \cp --preserve=all extra_cfgs/*.cfg ../extra_cfgs/
@@ -546,9 +549,9 @@ EOM
    \mkdir $WORKDIR
    \cd $WORKDIR
 
-   extract_pkg_from_local_repo ${CGCS_REPO_DIR} pxe-network-installer
-   extract_pkg_from_local_repo ${CGCS_REPO_DIR} grub2-efi-x64-pxeboot
-   extract_pkg_from_local_repo ${CGCS_REPO_DIR} grub2-efi-x64-modules
+   extract_pkg_from_local_repo ${MY_YUM_CONF} ${STD_REPO_ID} pxe-network-installer
+   extract_pkg_from_local_repo ${MY_YUM_CONF} ${STD_REPO_ID} grub2-efi-x64-pxeboot
+   extract_pkg_from_local_repo ${MY_YUM_CONF} ${STD_REPO_ID} grub2-efi-x64-modules
 
    \mkdir -p $OUTPUT_DIST_DIR/isolinux/pxeboot/EFI/centos/x86_64-efi