From c3cf35e1ee7df72ddfcfa74fcb6996d8c33ceaa2 Mon Sep 17 00:00:00 2001 From: David Sullivan Date: Thu, 16 Aug 2018 17:07:05 -0400 Subject: [PATCH] patch_build.sh fails with path errors The patch_build script fails as the paths for release-info.inc and patch_build are incorrect. With commit d566e09 (Story 2002801) the patch scripts were relocated from stx-utils to stx-update. Various paths in the scripts were not updated to reflect their new locations. This change corrects those paths. Change-Id: I6ebe57476f01d6ae68312bf98e8a706047d4a695 Signed-off-by: David Sullivan Story: 2003449 Task: 24652 --- extras/scripts/make_patch.sh | 2 +- extras/scripts/modify_patch.sh | 2 +- extras/scripts/patch_build.sh | 4 ++-- extras/scripts/query_patch.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extras/scripts/make_patch.sh b/extras/scripts/make_patch.sh index e944ec82..aeca8726 100755 --- a/extras/scripts/make_patch.sh +++ b/extras/scripts/make_patch.sh @@ -4,7 +4,7 @@ pushd `dirname $0` > /dev/null SCRIPTPATH=`pwd` popd > /dev/null -CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch +CGCSPATCH_DIR=$SCRIPTPATH/../../cgcs-patch # Set environment variables for python export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch diff --git a/extras/scripts/modify_patch.sh b/extras/scripts/modify_patch.sh index 2155ee68..a36c7f85 100755 --- a/extras/scripts/modify_patch.sh +++ b/extras/scripts/modify_patch.sh @@ -4,7 +4,7 @@ pushd `dirname $0` > /dev/null SCRIPTPATH=`pwd` popd > /dev/null -CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch +CGCSPATCH_DIR=$SCRIPTPATH/../../cgcs-patch # Set environment variables for python export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch diff --git a/extras/scripts/patch_build.sh b/extras/scripts/patch_build.sh index 6dc9e9aa..c644a680 100755 --- a/extras/scripts/patch_build.sh +++ b/extras/scripts/patch_build.sh @@ -4,10 +4,10 @@ pushd `dirname $0` > /dev/null SCRIPTPATH=`pwd` popd > /dev/null -CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch +CGCSPATCH_DIR=$SCRIPTPATH/../../cgcs-patch # Source release-info -. $SCRIPTPATH/../../middleware/recipes-common/build-info/release-info.inc +. $SCRIPTPATH/../../../stx-integ/utilities/build-info/release-info.inc export PLATFORM_RELEASE # Set environment variables for python diff --git a/extras/scripts/query_patch.sh b/extras/scripts/query_patch.sh index dbee355c..60200740 100755 --- a/extras/scripts/query_patch.sh +++ b/extras/scripts/query_patch.sh @@ -4,7 +4,7 @@ pushd `dirname $0` > /dev/null SCRIPTPATH=`pwd` popd > /dev/null -CGCSPATCH_DIR=$SCRIPTPATH/../../stx-update/cgcs-patch +CGCSPATCH_DIR=$SCRIPTPATH/../../cgcs-patch # Set environment variables for python export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch