starlingx/root
Code Issues Proposed changes

build-iso: prevent use of host yum.conf when processing kickstart rpms

Browse Source 
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>
This commit is contained in:
Scott Little 2018-03-19 16:14:38 -04:00
parent 224b0f8de9
commit 97e076b8ab
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build-tools/build-iso
View File

@ -37,6 +37,8 @@ usage () {
} }
MY_YUM_CONF="" MY_YUM_CONF=""
STD_REPO_ID="local-std"
RT_REPO_ID="local-rt"
NPROCS=$(nproc) NPROCS=$(nproc)
@ -458,10 +460,11 @@ function final_touches {
} }
function extract_pkg_from_local_repo { function extract_pkg_from_local_repo {
local repodir=$1 local yum_conf=$1
local pkgname=$2 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 if [ -z "${pkgfile}" ]; then
echo "Could not find package $pkgname in $repodir" echo "Could not find package $pkgname in $repodir"
exit 1 exit 1
@ -488,9 +491,9 @@ function extract_installer_files {
\cd kickstart.work \cd kickstart.work
extract_pkg_from_local_repo ${CGCS_REPO_DIR} platform-kickstarts extract_pkg_from_local_repo ${MY_YUM_CONF} ${STD_REPO_ID} platform-kickstarts
extract_pkg_from_local_repo ${CGCS_REPO_DIR} platform-kickstarts-pxeboot extract_pkg_from_local_repo ${MY_YUM_CONF} ${STD_REPO_ID} 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-extracfgs
\cp --preserve=all www/pages/feed/rel-*/*.cfg pxeboot/*.cfg ../kickstarts/ && \cp --preserve=all www/pages/feed/rel-*/*.cfg pxeboot/*.cfg ../kickstarts/ &&
\cp --preserve=all extra_cfgs/*.cfg ../extra_cfgs/ \cp --preserve=all extra_cfgs/*.cfg ../extra_cfgs/
@ -546,9 +549,9 @@ EOM
\mkdir $WORKDIR \mkdir $WORKDIR
\cd $WORKDIR \cd $WORKDIR
extract_pkg_from_local_repo ${CGCS_REPO_DIR} pxe-network-installer extract_pkg_from_local_repo ${MY_YUM_CONF} ${STD_REPO_ID} pxe-network-installer
extract_pkg_from_local_repo ${CGCS_REPO_DIR} grub2-efi-x64-pxeboot extract_pkg_from_local_repo ${MY_YUM_CONF} ${STD_REPO_ID} 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} grub2-efi-x64-modules
\mkdir -p $OUTPUT_DIST_DIR/isolinux/pxeboot/EFI/centos/x86_64-efi \mkdir -p $OUTPUT_DIST_DIR/isolinux/pxeboot/EFI/centos/x86_64-efi