starlingx/tools
Code Issues Proposed changes

Add definiton of $CREATEREPO

Browse Source 
The CREATEREPO variable was not getting set causing the script
to fail, additionally, use the variable consistently instead
of calling createrepo directly.

Closes-Bug: 1846387
Change-Id: If42d5ca14aa9d7ace1d0d6d9daf846a9e51ab559
Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
Saul Wold 2019-10-02 13:38:15 -07:00
parent 3ae3e677d8
commit c6bdb70f24
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
toCOPY/generate-cgcs-tis-repo
View File

@ -34,6 +34,11 @@ TIS_CACHE_DIR="${TIS_REPO_DIR}/dependancy-cache"
TIS_CACHE_ORIGIN="${TIS_REPO_DIR}/origin"
ORIGIN="/import/mirrors/CentOS/${SRC_BUILD_ENVIRONMENT}/CentOS/pike"
CREATEREPO=$(which createrepo_c)
if [ $? -ne 0 ]; then
CREATEREPO="createrepo"
fi
# Create directories
for d in "$DEST_RPM" "$DEST_SRPM" "$TIS_CACHE_DIR"; do
if [ ! -d "$d" ]; then
@ -63,7 +68,7 @@ for f in $(find "$RT_PKG_DIR" "$STD_PKG_DIR" -name '*.rpm' \
done
# Make a repo out of it
( cd "$DEST_RPM_ROOT_NEW"; createrepo $PWD; exit $? )
( cd "$DEST_RPM_ROOT_NEW"; $CREATEREPO $PWD; exit $? )
# copy standard and rt build of src.rpm packages
for f in $(find "$STD_PKG_DIR" "$RT_PKG_DIR" -name '*.src.rpm'); do
@ -74,7 +79,7 @@ for f in $(find "$STD_PKG_DIR" "$RT_PKG_DIR" -name '*.src.rpm'); do
done
# Make a repo out of it
( cd "$DEST_SRPM_ROOT_NEW"; createrepo $PWD; exit $? )
( cd "$DEST_SRPM_ROOT_NEW"; $CREATEREPO $PWD; exit $? )
date > "${DEST_SRPM_ROOT_NEW}/last_updated"
date > "${DEST_RPM_ROOT_NEW}/last_updated"
@ -138,9 +143,9 @@ for d in $(find -L . -type d -name repodata); do
rm -rf repodata
fi
if [ -f "comps.xml" ]; then
createrepo -g comps.xml "$PWD"
$CREATEREPO -g comps.xml "$PWD"
else
createrepo "$PWD"
$CREATEREPO "$PWD"
fi
popd
done