Merge "Support PATCHES_BASE, GIT_BASE, STX_BASE in build_srpm.data"
This commit is contained in:
commit
111ab55bcf
@ -19,6 +19,7 @@ DEFAULT_SRPM_SCRIPT="$DIR/default_$SRPM_SCRIPT"
|
|||||||
SCRIPT_PATH="$DISTRO"
|
SCRIPT_PATH="$DISTRO"
|
||||||
DATA_PATH="$DISTRO"
|
DATA_PATH="$DISTRO"
|
||||||
FILES_PATH="$DISTRO/files"
|
FILES_PATH="$DISTRO/files"
|
||||||
|
PATCHES_PATH="$DISTRO/patches"
|
||||||
ORIG_SPECS_PATH="$DISTRO"
|
ORIG_SPECS_PATH="$DISTRO"
|
||||||
SRPM_LIST_PATH="$DISTRO/srpm_path"
|
SRPM_LIST_PATH="$DISTRO/srpm_path"
|
||||||
MIRROR_ROOT="$MY_REPO/cgcs-centos-repo"
|
MIRROR_ROOT="$MY_REPO/cgcs-centos-repo"
|
||||||
@ -222,8 +223,10 @@ 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 CGCS_BASE="$SRC_BASE/addons/wr-cgcs/layers/cgcs"
|
||||||
|
export STX_BASE="$CGCS_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 BUILD_BASE="$BUILD_ROOT"
|
export BUILD_BASE="$BUILD_ROOT"
|
||||||
BUILD_INPUTS="$BUILD_BASE/inputs"
|
BUILD_INPUTS="$BUILD_BASE/inputs"
|
||||||
@ -1194,8 +1197,9 @@ if [ "x$LOG_DIR" == "x" ]; then
|
|||||||
echo "failed to create temporary directory"
|
echo "failed to create temporary directory"
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
for g in $(find $SRC_BASE -type d -name .git | sort -V); do
|
for g in $(find "$SRC_BASE" -type d -name .git | sort -V); do
|
||||||
GIT_ROOT=$(dirname $g)
|
GIT_ROOT=$(dirname $g)
|
||||||
|
export GIT_BASE="$GIT_ROOT"
|
||||||
if [ $STOP_SCHEDULING -eq 1 ]; then
|
if [ $STOP_SCHEDULING -eq 1 ]; then
|
||||||
break;
|
break;
|
||||||
fi
|
fi
|
||||||
|
@ -18,7 +18,7 @@ DEFAULT_SRPM_SCRIPT="$DIR/default_$SRPM_SCRIPT"
|
|||||||
SCRIPT_PATH="$DISTRO"
|
SCRIPT_PATH="$DISTRO"
|
||||||
DATA_PATH="$DISTRO"
|
DATA_PATH="$DISTRO"
|
||||||
FILES_PATH="$DISTRO/files"
|
FILES_PATH="$DISTRO/files"
|
||||||
# ORIG_SPECS_PATH="$DISTRO/rpmbuild/SPECS"
|
PATCHES_PATH="$DISTRO/patches"
|
||||||
ORIG_SPECS_PATH="$DISTRO"
|
ORIG_SPECS_PATH="$DISTRO"
|
||||||
SRPM_LIST_PATH="$DISTRO/srpm_path"
|
SRPM_LIST_PATH="$DISTRO/srpm_path"
|
||||||
MIRROR_ROOT="$MY_REPO/cgcs-centos-repo"
|
MIRROR_ROOT="$MY_REPO/cgcs-centos-repo"
|
||||||
@ -209,8 +209,10 @@ 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 CGCS_BASE="$SRC_BASE/addons/wr-cgcs/layers/cgcs"
|
||||||
|
export STX_BASE="$CGCS_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 BUILD_BASE="$BUILD_ROOT"
|
export BUILD_BASE="$BUILD_ROOT"
|
||||||
BUILD_INPUTS="$BUILD_BASE/inputs"
|
BUILD_INPUTS="$BUILD_BASE/inputs"
|
||||||
@ -995,8 +997,9 @@ if [ $EDIT_FLAG -eq 0 ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for g in `find $SRC_BASE -type d -name .git | sort -V`; do
|
for g in `find "$SRC_BASE" -type d -name .git | sort -V`; do
|
||||||
GIT_ROOT=$(dirname $g)
|
GIT_ROOT=$(dirname $g)
|
||||||
|
export GIT_BASE="$GIT_ROOT"
|
||||||
for p in $(cat $GIT_ROOT/$PKG_DIRS_FILE 2>> /dev/null); do
|
for p in $(cat $GIT_ROOT/$PKG_DIRS_FILE 2>> /dev/null); do
|
||||||
src_dir="$GIT_ROOT/$p"
|
src_dir="$GIT_ROOT/$p"
|
||||||
if [ -d $src_dir ]; then
|
if [ -d $src_dir ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user