diff --git a/extras/scripts/patch_build.sh b/extras/scripts/patch_build.sh
index c9b6af48..2bb6f9d6 100755
--- a/extras/scripts/patch_build.sh
+++ b/extras/scripts/patch_build.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
+#
+# Copyright (c) 2018-2020 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 
-pushd `dirname $0` > /dev/null
-SCRIPTPATH=`pwd`
-popd > /dev/null
-
+SCRIPTPATH=$(dirname $(readlink -f $0))
 CGCSPATCH_DIR=$SCRIPTPATH/../../cgcs-patch
 
 # Source release-info
diff --git a/extras/scripts/setup_patch_repo.sh b/extras/scripts/setup_patch_repo.sh
new file mode 100755
index 00000000..a2c59c6f
--- /dev/null
+++ b/extras/scripts/setup_patch_repo.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# Copyright (c) 2018-2020 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+SCRIPTPATH=$(dirname $(readlink -f $0))
+CGCSPATCH_DIR=$SCRIPTPATH/../../cgcs-patch
+
+# Source release-info
+. $SCRIPTPATH/../../../utilities/utilities/build-info/release-info.inc
+export PLATFORM_RELEASE
+
+# Set environment variables for python
+export PYTHONPATH=$CGCSPATCH_DIR/cgcs-patch
+export PYTHONDONTWRITEBYTECODE=true
+
+# Run the setup_patch_repo tool
+exec $CGCSPATCH_DIR/bin/setup_patch_repo "$@"
+