starlingx/root
Code Issues Proposed changes

Shorten "addons/wr-cgcs/layers/cgcs" to just "stx"

Browse Source 
Part of the project to remove cgcs references.
Replace and shorten the path the needlessly long and
complex "addons/wr-cgcs/layers/cgcs" path with just "stx".

This update just fixes up paths found in scripts, comments
and config files.

Depends-On: https://review.openstack.org/579954
Depends-On: https://review.openstack.org/579957
Depends-On: https://review.openstack.org/580170
Depends-On: https://review.openstack.org/579984
Change-Id: I04d653f740f17d8a9b2732f26d36907f635d8950
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little 2018-06-29 15:51:43 -04:00
parent 61eb09cded
commit d2d96619a2
14 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/cgcs-centos-repo /cgcs-centos-repo
/cgcs-tis-repo /cgcs-tis-repo
/cgcs-3rd-party-repo /cgcs-3rd-party-repo
/stx

4
build-tools/build-guest
View File

@ -83,12 +83,14 @@ function check_vars {
exit 1 exit 1
fi fi
STX_DIR=$INTERNAL_REPO_ROOT/stx
if [ "x$MY_BUILD_CFG" == "x" ];then if [ "x$MY_BUILD_CFG" == "x" ];then
printf " Error -- reqiure MY_BUILD_CFG to be defined.\n" printf " Error -- reqiure MY_BUILD_CFG to be defined.\n"
exit 1 exit 1
fi fi
RELEASE_INFO=$INTERNAL_REPO_ROOT/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc RELEASE_INFO=$STX_DIR/middleware/recipes-common/build-info/release-info.inc
export PLATFORM_RELEASE=$(source $RELEASE_INFO && echo $PLATFORM_RELEASE) export PLATFORM_RELEASE=$(source $RELEASE_INFO && echo $PLATFORM_RELEASE)
} }

8
build-tools/build-img
View File

@ -51,9 +51,11 @@ fi
# Step 2: Convert the ISO to IMG # Step 2: Convert the ISO to IMG
if [ $PART -ne 1 ]; then if [ $PART -ne 1 ]; then
INSTALL_ISO_TO_DISK_IMAGE=$MY_REPO/stx/extras.ND/scripts/install_iso_to_disk_image.sh
if [ ! -e "/dev/loop-control" -o ! -e "/dev/kvm" ]; then if [ ! -e "/dev/loop-control" -o ! -e "/dev/kvm" ]; then
CMD="cd $MY_WORKSPACE/export; \ CMD="cd $MY_WORKSPACE/export; \
$MY_REPO/addons/wr-cgcs/layers/cgcs/extras.ND/scripts/install_iso_to_disk_image.sh bootimage_auto.iso $DEST_IMG" $INSTALL_ISO_TO_DISK_IMAGE bootimage_auto.iso $DEST_IMG"
if [ "$HOSTNAME" == "yow-cgts3-centos7" ]; then if [ "$HOSTNAME" == "yow-cgts3-centos7" ]; then
echo "Attempting to run kvm_iso_to_img on yow-cgts3-lx" echo "Attempting to run kvm_iso_to_img on yow-cgts3-lx"
@ -77,7 +79,7 @@ if [ $PART -ne 1 ]; then
printf "No kvm and/or loop device on this machine. To complete the build \n" printf "No kvm and/or loop device on this machine. To complete the build \n"
printf "please copy '$MY_WORKSPACE/export/bootimage_auto.iso' to a machine \n" printf "please copy '$MY_WORKSPACE/export/bootimage_auto.iso' to a machine \n"
printf "that supports kvm and loop devices and run ... \n" printf "that supports kvm and loop devices and run ... \n"
printf " $MY_REPO/addons/wr-cgcs/layers/cgcs/extras.ND/scripts/install_iso_to_disk_image.sh bootimage_auto.iso $DEST_IMG\n" printf " $INSTALL_ISO_TO_DISK_IMAGE bootimage_auto.iso $DEST_IMG\n"
printf "****************************************************************** \n" printf "****************************************************************** \n"
exit 1 exit 1
fi fi
@ -86,7 +88,7 @@ if [ $PART -ne 1 ]; then
if [ ! -f "$MY_WORKSPACE/export/$DEST_IMG" ]; then if [ ! -f "$MY_WORKSPACE/export/$DEST_IMG" ]; then
( (
cd $MY_WORKSPACE/export cd $MY_WORKSPACE/export
$MY_REPO/addons/wr-cgcs/layers/cgcs/extras.ND/scripts/install_iso_to_disk_image.sh bootimage_auto.iso $DEST_IMG $INSTALL_ISO_TO_DISK_IMAGE bootimage_auto.iso $DEST_IMG
exit $? exit $?
) )
fi fi

8
build-tools/build-iso
View File

@ -129,6 +129,7 @@ function init_vars {
# Where all CentOS packages live # Where all CentOS packages live
# Where essential CentOS (minimal install) packages live # Where essential CentOS (minimal install) packages live
INTERNAL_REPO_ROOT= INTERNAL_REPO_ROOT=
STX_DIR=
# Where BSP files live # Where BSP files live
export BSP_FILES_PATH= export BSP_FILES_PATH=
@ -219,6 +220,8 @@ function check_vars {
exit 1 exit 1
fi fi
STX_DIR=$INTERNAL_REPO_ROOT/stx
printf "\nChecking that we can access $DISTRO_REPO_DIR\n" printf "\nChecking that we can access $DISTRO_REPO_DIR\n"
if [ ! -d "$DISTRO_REPO_DIR" ] ; then if [ ! -d "$DISTRO_REPO_DIR" ] ; then
printf " Error -- could not access $DISTRO_REPO_DIR\n" printf " Error -- could not access $DISTRO_REPO_DIR\n"
@ -249,11 +252,11 @@ function check_vars {
exit 1 exit 1
fi fi
RELEASE_INFO=$INTERNAL_REPO_ROOT/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc RELEASE_INFO=$STX_DIR/middleware/recipes-common/build-info/release-info.inc
export PLATFORM_RELEASE=$(source $RELEASE_INFO && echo $PLATFORM_RELEASE) export PLATFORM_RELEASE=$(source $RELEASE_INFO && echo $PLATFORM_RELEASE)
# Where BSP files live # Where BSP files live
export BSP_FILES_PATH="$INTERNAL_REPO_ROOT/addons/wr-cgcs/layers/cgcs/stx-metal/bsp-files" export BSP_FILES_PATH="$STX_DIR/stx-metal/bsp-files"
echo " Done" echo " Done"
echo "" echo ""
@ -461,7 +464,6 @@ function extract_pkg_from_local_repo {
function extract_installer_files { function extract_installer_files {
# Changes to copied files here must also be reflected in patch-iso # Changes to copied files here must also be reflected in patch-iso
CGCSDIR=$INTERNAL_REPO_ROOT/addons/wr-cgcs/layers/cgcs
PKGDIR=$OUTPUT_DIST_DIR/isolinux/Packages PKGDIR=$OUTPUT_DIST_DIR/isolinux/Packages
( (

5
build-tools/build-rpms-parallel
View File

@ -1486,6 +1486,7 @@ export BUILD_BASE="$BUILD_ROOT"
export CCACHE_DIR="$BUILD_ROOT/.ccache" export CCACHE_DIR="$BUILD_ROOT/.ccache"
export RESULT_DIR="$BUILD_BASE/results" export RESULT_DIR="$BUILD_BASE/results"
export SRC_BASE="$SRC_ROOT" export SRC_BASE="$SRC_ROOT"
export STX_BASE=$SRC_BASE/stx
if [ "x$MY_SRC_RPM_BUILD_DIR" != "x" ]; then if [ "x$MY_SRC_RPM_BUILD_DIR" != "x" ]; then
RPM_BUILD_ROOT=$MY_SRC_RPM_BUILD_DIR RPM_BUILD_ROOT=$MY_SRC_RPM_BUILD_DIR
@ -1493,9 +1494,9 @@ else
RPM_BUILD_ROOT=$BUILD_BASE/rpmbuild RPM_BUILD_ROOT=$BUILD_BASE/rpmbuild
fi fi
RELEASE_INFO_FILE=$SRC_BASE/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc RELEASE_INFO_FILE=$STX_BASE/middleware/recipes-common/build-info/release-info.inc
if [ -f $RELEASE_INFO_FILE ]; then if [ -f $RELEASE_INFO_FILE ]; then
source $MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc source $RELEASE_INFO_FILE
else else
echo "ERROR: failed to find RELEASE_INFO_FILE=$RELEASE_INFO_FILE" echo "ERROR: failed to find RELEASE_INFO_FILE=$RELEASE_INFO_FILE"
exit 1 exit 1

5
build-tools/build-rpms-serial
View File

@ -583,6 +583,7 @@ export BUILD_BASE="$BUILD_ROOT"
export CCACHE_DIR="$BUILD_ROOT/.ccache" export CCACHE_DIR="$BUILD_ROOT/.ccache"
export RESULT_DIR="$BUILD_BASE/results" export RESULT_DIR="$BUILD_BASE/results"
export SRC_BASE="$SRC_ROOT" export SRC_BASE="$SRC_ROOT"
export STX_BASE=$SRC_BASE/stx
if [ "x$MY_SRC_RPM_BUILD_DIR" != "x" ]; then if [ "x$MY_SRC_RPM_BUILD_DIR" != "x" ]; then
RPM_BUILD_ROOT=$MY_SRC_RPM_BUILD_DIR RPM_BUILD_ROOT=$MY_SRC_RPM_BUILD_DIR
@ -590,9 +591,9 @@ else
RPM_BUILD_ROOT=$BUILD_BASE/rpmbuild RPM_BUILD_ROOT=$BUILD_BASE/rpmbuild
fi fi
RELEASE_INFO_FILE=$SRC_BASE/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc RELEASE_INFO_FILE=$STX_BASE/middleware/recipes-common/build-info/release-info.inc
if [ -f $RELEASE_INFO_FILE ]; then if [ -f $RELEASE_INFO_FILE ]; then
source $MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc source $RELEASE_INFO_FILE
else else
echo "ERROR: failed to find RELEASE_INFO_FILE=$RELEASE_INFO_FILE" echo "ERROR: failed to find RELEASE_INFO_FILE=$RELEASE_INFO_FILE"
exit 1 exit 1

8
build-tools/build-srpms-parallel
View File

@ -222,8 +222,8 @@ fi
export CCACHE_DIR="$BUILD_ROOT/.ccache" export CCACHE_DIR="$BUILD_ROOT/.ccache"
export SRC_BASE="$SRC_ROOT" export SRC_BASE="$SRC_ROOT"
export CGCS_BASE="$SRC_BASE/addons/wr-cgcs/layers/cgcs" export STX_BASE="$SRC_BASE/stx"
export STX_BASE="$CGCS_BASE" export CGCS_BASE="$STX_BASE"
export SPECS_BASE="$ORIG_SPECS_PATH" export SPECS_BASE="$ORIG_SPECS_PATH"
export FILES_BASE="$FILES_PATH" export FILES_BASE="$FILES_PATH"
export PATCHES_BASE="$PATCHES_PATH" export PATCHES_BASE="$PATCHES_PATH"
@ -256,9 +256,9 @@ if [ ! -d $BUILD_BASE ]; then
exit 1 exit 1
fi fi
RELEASE_INFO_FILE=$SRC_BASE/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc RELEASE_INFO_FILE=$STX_BASE/middleware/recipes-common/build-info/release-info.inc
if [ -f $RELEASE_INFO_FILE ]; then if [ -f $RELEASE_INFO_FILE ]; then
source $MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc source $RELEASE_INFO_FILE
else else
echo "ERROR: failed to find RELEASE_INFO_FILE=$RELEASE_INFO_FILE" echo "ERROR: failed to find RELEASE_INFO_FILE=$RELEASE_INFO_FILE"
exit 1 exit 1

8
build-tools/build-srpms-serial
View File

@ -208,8 +208,8 @@ fi
export CCACHE_DIR="$BUILD_ROOT/.ccache" export CCACHE_DIR="$BUILD_ROOT/.ccache"
export SRC_BASE="$SRC_ROOT" export SRC_BASE="$SRC_ROOT"
export CGCS_BASE="$SRC_BASE/addons/wr-cgcs/layers/cgcs" export STX_BASE="$SRC_BASE/stx"
export STX_BASE="$CGCS_BASE" export CGCS_BASE="$STX_BASE"
export SPECS_BASE="$ORIG_SPECS_PATH" export SPECS_BASE="$ORIG_SPECS_PATH"
export FILES_BASE="$FILES_PATH" export FILES_BASE="$FILES_PATH"
export PATCHES_BASE="$PATCHES_PATH" export PATCHES_BASE="$PATCHES_PATH"
@ -241,9 +241,9 @@ if [ ! -d $BUILD_BASE ]; then
exit 1 exit 1
fi fi
RELEASE_INFO_FILE=$SRC_BASE/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc RELEASE_INFO_FILE=$STX_BASE/middleware/recipes-common/build-info/release-info.inc
if [ -f $RELEASE_INFO_FILE ]; then if [ -f $RELEASE_INFO_FILE ]; then
source $MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc source $RELEASE_INFO_FILE
else else
echo "ERROR: failed to find RELEASE_INFO_FILE=$RELEASE_INFO_FILE" echo "ERROR: failed to find RELEASE_INFO_FILE=$RELEASE_INFO_FILE"
exit 1 exit 1

2
build-tools/modify-build-cfg
View File

@ -116,7 +116,7 @@ done
# okay, now we have lines for each env var. Generate the correct values # okay, now we have lines for each env var. Generate the correct values
BUILD_DATE=`date "+%F %T %z"` BUILD_DATE=`date "+%F %T %z"`
CGCS_GIT_BRANCH=`cd $MY_REPO/addons/wr-cgcs/layers/cgcs/; git rev-parse --abbrev-ref HEAD` CGCS_GIT_BRANCH=`cd $MY_REPO/stx/; git rev-parse --abbrev-ref HEAD`
WRS_GIT_BRANCH=`cd $MY_REPO; git rev-parse --abbrev-ref HEAD` WRS_GIT_BRANCH=`cd $MY_REPO; git rev-parse --abbrev-ref HEAD`
REPO=$MY_REPO REPO=$MY_REPO

7
build-tools/patch-iso
View File

@ -8,14 +8,15 @@ if [ -z "${MY_REPO}" ]; then
exit 1 exit 1
fi fi
SETUP_PATCH_REPO=${MY_REPO}/addons/wr-cgcs/layers/cgcs/extras.ND/scripts/setup_patch_repo.sh STX_DIR=${MY_REPO}/stx
SETUP_PATCH_REPO=${STX_DIR}/extras.ND/scripts/setup_patch_repo.sh
if [ ! -x ${SETUP_PATCH_REPO} ]; then if [ ! -x ${SETUP_PATCH_REPO} ]; then
echo "Cannot find or execute ${SETUP_PATCH_REPO}" echo "Cannot find or execute ${SETUP_PATCH_REPO}"
exit 1 exit 1
fi fi
REPO_UPGRADES_DIR=${MY_REPO}/addons/wr-cgcs/layers/cgcs/common-bsp/files/upgrades REPO_UPGRADES_DIR=${STX_DIR}/common-bsp/files/upgrades
RELEASE_INFO=${MY_REPO}/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc RELEASE_INFO=${STX_DIR}/middleware/recipes-common/build-info/release-info.inc
PLATFORM_RELEASE=$(source $RELEASE_INFO && echo $PLATFORM_RELEASE) PLATFORM_RELEASE=$(source $RELEASE_INFO && echo $PLATFORM_RELEASE)
function usage() { function usage() {

2
build-tools/patch_rebase_1
View File

@ -18,7 +18,7 @@ usage () {
echo " PKG=lighttpd" echo " PKG=lighttpd"
echo " OLD_SRC_RPM=lighttpd-1.4.41-1.el7.src.rpm" echo " OLD_SRC_RPM=lighttpd-1.4.41-1.el7.src.rpm"
echo " NEW_SRC_RPM=lighttpd-1.4.41-2.el7.src.rpm" echo " NEW_SRC_RPM=lighttpd-1.4.41-2.el7.src.rpm"
echo " SRPM_PATH=$MY_REPO/addons/wr-cgcs/layers/cgcs/recipes-extended/lighttpd/centos/srpm_path" echo " SRPM_PATH=$MY_REPO/stx/stx-integ/extended/lighttpd/centos/srpm_path"
echo " echo \"\$PKG#\$SRPM_PATH##\$OLD_SRC_RPM#\$NEW_SRC_RPM\" > UPVERSION_DATA" echo " echo \"\$PKG#\$SRPM_PATH##\$OLD_SRC_RPM#\$NEW_SRC_RPM\" > UPVERSION_DATA"
echo "" echo ""
} }

2
build-tools/patch_rebase_2
View File

@ -18,7 +18,7 @@ usage () {
echo " PKG=lighttpd" echo " PKG=lighttpd"
echo " OLD_SRC_RPM=lighttpd-1.4.41-1.el7.src.rpm" echo " OLD_SRC_RPM=lighttpd-1.4.41-1.el7.src.rpm"
echo " NEW_SRC_RPM=lighttpd-1.4.41-2.el7.src.rpm" echo " NEW_SRC_RPM=lighttpd-1.4.41-2.el7.src.rpm"
echo " SRPM_PATH=$MY_REPO/addons/wr-cgcs/layers/cgcs/recipes-extended/lighttpd/centos/srpm_path" echo " SRPM_PATH=$MY_REPO/stx/stx-integ/extended/lighttpd/centos/srpm_path"
echo " echo \"\$PKG#\$SRPM_PATH##\$OLD_SRC_RPM#\$NEW_SRC_RPM\" > UPVERSION_DATA" echo " echo \"\$PKG#\$SRPM_PATH##\$OLD_SRC_RPM#\$NEW_SRC_RPM\" > UPVERSION_DATA"
echo "" echo ""
} }

2
build-tools/patch_rebase_3
View File

@ -18,7 +18,7 @@ usage () {
echo " PKG=lighttpd" echo " PKG=lighttpd"
echo " OLD_SRC_RPM=lighttpd-1.4.41-1.el7.src.rpm" echo " OLD_SRC_RPM=lighttpd-1.4.41-1.el7.src.rpm"
echo " NEW_SRC_RPM=lighttpd-1.4.41-2.el7.src.rpm" echo " NEW_SRC_RPM=lighttpd-1.4.41-2.el7.src.rpm"
echo " SRPM_PATH=$MY_REPO/addons/wr-cgcs/layers/cgcs/recipes-extended/lighttpd/centos/srpm_path" echo " SRPM_PATH=$MY_REPO/stx/stx-integ/extended/lighttpd/centos/srpm_path"
echo " echo \"\$PKG#\$SRPM_PATH##\$OLD_SRC_RPM#\$NEW_SRC_RPM\" > UPVERSION_DATA" echo " echo \"\$PKG#\$SRPM_PATH##\$OLD_SRC_RPM#\$NEW_SRC_RPM\" > UPVERSION_DATA"
echo "" echo ""
} }

2
build-tools/patch_rebase_4
View File

@ -18,7 +18,7 @@ usage () {
echo " PKG=lighttpd" echo " PKG=lighttpd"
echo " OLD_SRC_RPM=lighttpd-1.4.41-1.el7.src.rpm" echo " OLD_SRC_RPM=lighttpd-1.4.41-1.el7.src.rpm"
echo " NEW_SRC_RPM=lighttpd-1.4.41-2.el7.src.rpm" echo " NEW_SRC_RPM=lighttpd-1.4.41-2.el7.src.rpm"
echo " SRPM_PATH=$MY_REPO/addons/wr-cgcs/layers/cgcs/recipes-extended/lighttpd/centos/srpm_path" echo " SRPM_PATH=$MY_REPO/stx/stx-integ/extended/lighttpd/centos/srpm_path"
echo " echo \"\$PKG#\$SRPM_PATH##\$OLD_SRC_RPM#\$NEW_SRC_RPM\" > UPVERSION_DATA" echo " echo \"\$PKG#\$SRPM_PATH##\$OLD_SRC_RPM#\$NEW_SRC_RPM\" > UPVERSION_DATA"
echo "" echo ""
} }