starlingx/tools
Code Issues Proposed changes

rename cgcs-centos-repo to centos-repo

Browse Source 
Story: 2006387
Task: 36912
Depends-On: https://review.opendev.org/749974
Depends-On: https://review.opendev.org/750041
Change-Id: I745a822e88aca68c207a92f14fb5370d6e3d0050
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little
2020-09-04 11:57:40 -04:00
parent 9a188af410
commit b827624e16
10 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
toCOPY/finishSetup.sh
View File

@@ -27,7 +27,7 @@ mkdir -p /localdisk/loadbuild/mock-cache
sudo chmod 775 /localdisk/loadbuild/mock-cache
sudo chown root:mock /localdisk/loadbuild/mock-cache
### may need to add these later. once it works will try on clean localdisk setup
# [builder@bavery-WS-DESK cgcs-root]$ history | grep mkdir
# [builder@bavery-WS-DESK root]$ history | grep mkdir
# 55 mkdir -p $MY_WORKSPACE/results
# 66 mkdir -p $MY_WORKSPACE/std/results/$MY_BUILD_ENVIRONMENT-std
# 78 mkdir -p $MY_WORKSPACE/rt/rpmbuild/RPMS

21
toCOPY/generate-cgcs-centos-repo.sh → toCOPY/generate-centos-repo.sh
View File

@@ -5,9 +5,9 @@
# Copyright (C) 2019 Intel Corporation
#
GENERATE_CGCS_CENTOS_REPO_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
GENERATE_CENTOS_REPO_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
source $GENERATE_CGCS_CENTOS_REPO_DIR/lst_utils.sh
source $GENERATE_CENTOS_REPO_DIR/lst_utils.sh
mirror_dir=""
layer_dirs=""
@@ -76,8 +76,7 @@ if [ -z "$MY_REPO" ]; then
exit -1
fi
TEMP=$(getopt -o h --long help,config-dir:,distro:,layer:,layer-dir:,layer-inc-url:,layer-pkg-url:,layer-wheels-inc-url:,mirror-dir: -n 'generate-cgcs-centos-repo' -- "$@")
TEMP=$(getopt -o h --long help,config-dir:,distro:,layer:,layer-dir:,layer-inc-url:,layer-pkg-url:,layer-wheels-inc-url:,mirror-dir: -n 'generate-centos-repo' -- "$@")
if [ $? -ne 0 ]; then
echo "getopt error"
usage
@@ -123,12 +122,12 @@ echo
echo "layer_wheels_inc_urls=${layer_wheels_inc_urls[@]}"
echo
dest_dir=$MY_REPO/cgcs-centos-repo
dest_dir=$MY_REPO/centos-repo
timestamp="$(date +%F_%H%M)"
mock_cfg_file=$MY_REPO/build-tools/repo_files/mock.cfg.proto
comps_xml_file=$MY_REPO/build-tools/repo_files/comps.xml
mock_cfg_dest_file=$MY_REPO/cgcs-centos-repo/mock.cfg.proto
comps_xml_dest_file=$MY_REPO/cgcs-centos-repo/Binary/comps.xml
mock_cfg_dest_file=$MY_REPO/centos-repo/mock.cfg.proto
comps_xml_dest_file=$MY_REPO/centos-repo/Binary/comps.xml
TMP_LST_DIR=$(mktemp -d /tmp/tmp_lst_dir_XXXXXX)
mkdir -p $TMP_LST_DIR
@@ -443,13 +442,13 @@ cp "$mock_cfg_file" "$mock_cfg_dest_file"
cat ${lst_file_dir}/${other_lst_file} | grep -v "#" | while IFS=":" read targettype item extrafields; do
if [ "${targettype}" == "folder" ]; then
echo "Creating folder ${item}"
mkdir -p $MY_REPO/cgcs-centos-repo/Binary/${item}
mkdir -p $MY_REPO/centos-repo/Binary/${item}
fi
if [ "${targettype}" == "file" ]; then
mkdir -p $MY_REPO/cgcs-centos-repo/Binary/$(dirname ${item})
echo "Creating symlink for $MY_REPO/cgcs-centos-repo/Binary/${item}"
ln -sf ${mirror_dir}/Binary/${item} $MY_REPO/cgcs-centos-repo/Binary/${item}
mkdir -p $MY_REPO/centos-repo/Binary/$(dirname ${item})
echo "Creating symlink for $MY_REPO/centos-repo/Binary/${item}"
ln -sf ${mirror_dir}/Binary/${item} $MY_REPO/centos-repo/Binary/${item}
fi
done

2
toCOPY/generate-local-repo.sh
View File

@@ -12,7 +12,7 @@ export PATH="${MY_REPO}/build-tools:${PATH}"
EXPORTS="$MY_WORKSPACE/export/mirrors/"
DISTRO="CentOS"
HEAD_FILE="${MY_REPO_ROOT_DIR}/.repo/projects/cgcs-root.git/HEAD"
HEAD_FILE="${MY_REPO_ROOT_DIR}/.repo/projects/root.git/HEAD"
STAT="$(stat -c %Y ${HEAD_FILE})"
TIMESTAMP=$(date -d @$(stat -c %Y ${HEAD_FILE}) +%Y-%m-%dT%H:%M:%S)
STD_PKG_DIR="${MY_WORKSPACE}/std/rpmbuild/RPMS"