starlingx
/
utils
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2018-07-04 19:54:06 +00:00 committed by Gerrit Code Review
parent 5c16aec176 6cd1a25b05
commit d844efb0cb
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extras/scripts/make_patch.sh
View File

@ -4,8 +4,7 @@ pushd `dirname $0` > /dev/null
SCRIPTPATH=`pwd` SCRIPTPATH=`pwd`
popd > /dev/null popd > /dev/null
# CGCSPATCH_DIR=$MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/patching/recipes-common/cgcs-patch CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch
CGCSPATCH_DIR=$SCRIPTPATH/../../middleware/patching/recipes-common/cgcs-patch
# Set environment variables for python # Set environment variables for python
export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch

3
extras/scripts/modify_patch.sh
View File

@ -4,8 +4,7 @@ pushd `dirname $0` > /dev/null
SCRIPTPATH=`pwd` SCRIPTPATH=`pwd`
popd > /dev/null popd > /dev/null
# CGCSPATCH_DIR=$MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/patching/recipes-common/cgcs-patch CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch
CGCSPATCH_DIR=$SCRIPTPATH/../../middleware/patching/recipes-common/cgcs-patch
# Set environment variables for python # Set environment variables for python
export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch

8
extras/scripts/patch_build.sh
View File

@ -1,9 +1,13 @@
#!/bin/bash #!/bin/bash
CGCSPATCH_DIR=$MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/patching/recipes-common/cgcs-patch pushd `dirname $0` > /dev/null
SCRIPTPATH=`pwd`
popd > /dev/null
CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch
# Source release-info # Source release-info
. $MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc . $SCRIPTPATH/../../middleware/recipes-common/build-info/release-info.inc
export PLATFORM_RELEASE export PLATFORM_RELEASE
# Set environment variables for python # Set environment variables for python

3
extras/scripts/query_patch.sh
View File

@ -4,8 +4,7 @@ pushd `dirname $0` > /dev/null
SCRIPTPATH=`pwd` SCRIPTPATH=`pwd`
popd > /dev/null popd > /dev/null
# CGCSPATCH_DIR=$MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/patching/recipes-common/cgcs-patch CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch
CGCSPATCH_DIR=$SCRIPTPATH/../../middleware/patching/recipes-common/cgcs-patch
# Set environment variables for python # Set environment variables for python
export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch

4
middleware/recipes-common/build-info/build-info-1.0/collect.sh
View File

@ -77,9 +77,9 @@ else
echo "WRS_GIT_BRANCH=\"$WRS_GIT_BRANCH\"" >> $destFile echo "WRS_GIT_BRANCH=\"$WRS_GIT_BRANCH\"" >> $destFile
fi fi
echo "CGCS_SRC_DIR=\"$REPO/addons/wr-cgcs/layers/cgcs\"" >> $destFile echo "CGCS_SRC_DIR=\"$REPO/stx\"" >> $destFile
if [ "${CGCS_GIT_BRANCH}x" == "x" ]; then if [ "${CGCS_GIT_BRANCH}x" == "x" ]; then
echo "CGCS_GIT_BRANCH=\""`cd $REPO/addons/wr-cgcs/layers/cgcs/; git status -s -b | grep '##' | awk ' { printf $2 } '`"\"" >> $destFile echo "CGCS_GIT_BRANCH=\""`cd $REPO/stx/; git status -s -b | grep '##' | awk ' { printf $2 } '`"\"" >> $destFile
else else
echo "CGCS_GIT_BRANCH=\"$CGCS_GIT_BRANCH\"" >> $destFile echo "CGCS_GIT_BRANCH=\"$CGCS_GIT_BRANCH\"" >> $destFile
fi fi

2
middleware/util/recipes-common/engtools/hostdata-collectors/README
View File

@ -2,7 +2,7 @@ The Engineering tools is meant to be installed as a patch. Therefore, the RPM is
of the build but is not included in the image. Assuming your development environment is fully set up, of the build but is not included in the image. Assuming your development environment is fully set up,
simply run patch-engtools.sh to generate the patch: simply run patch-engtools.sh to generate the patch:
In this directory ($MY_REPO/addons/wr-cgcs/layers/cgcs/middleware/util/recipes-common/engtools/hostdata-collectors), In this directory ($MY_REPO/stx/middleware/util/recipes-common/engtools/hostdata-collectors),
enter the command: enter the command:
>./patch-engtools.sh >./patch-engtools.sh

4
middleware/util/recipes-common/engtools/hostdata-collectors/patch-engtools.sh
View File

@ -14,7 +14,7 @@ if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
source ${MY_REPO}/addons/wr-cgcs/layers/cgcs/middleware/recipes-common/build-info/release-info.inc source ${MY_REPO}/stx/middleware/recipes-common/build-info/release-info.inc
#TiS_REL="16.10" #TiS_REL="16.10"
#PATCH_ID="ENGTOOLS-${TiS_REL}" #PATCH_ID="ENGTOOLS-${TiS_REL}"
PATCH_ID="ENGTOOLS-${PLATFORM_RELEASE}" PATCH_ID="ENGTOOLS-${PLATFORM_RELEASE}"
@ -23,7 +23,7 @@ PWD=$(pwd)
# Create CGCS Patch # Create CGCS Patch
cd ${MY_WORKSPACE} cd ${MY_WORKSPACE}
PATCH_BUILD=${MY_REPO}/addons/wr-cgcs/layers/cgcs/extras.ND/scripts/patch_build.sh PATCH_BUILD=${MY_REPO}/stx/extras/scripts/patch_build.sh
${PATCH_BUILD} --id ${PATCH_ID} --reboot-required=N \ ${PATCH_BUILD} --id ${PATCH_ID} --reboot-required=N \
--summary "System engineering data collection and analysis tools." \ --summary "System engineering data collection and analysis tools." \
--desc "System engineering data collection and analysis tools." \ --desc "System engineering data collection and analysis tools." \