diff options
| -rwxr-xr-x | ci/utility/intel_cmt_cat_build_install_rpm.sh | 24 | ||||
| -rwxr-xr-x | ci/utility/package-list.sh | 2 |
2 files changed, 12 insertions, 14 deletions
diff --git a/ci/utility/intel_cmt_cat_build_install_rpm.sh b/ci/utility/intel_cmt_cat_build_install_rpm.sh index 36cdf379..a04d0a08 100755 --- a/ci/utility/intel_cmt_cat_build_install_rpm.sh +++ b/ci/utility/intel_cmt_cat_build_install_rpm.sh @@ -16,35 +16,31 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source $DIR/package-list.sh -VERSION="v1.0.1" +VERSION=$CMTCAT_VERSION bash $DIR/check_git_repo.sh $CMTCAT_DIR $CMTCAT_REPO if [[ $? != 0 ]] then rm -rf $CMTCAT_DIR - git clone --branch $CMTCAT_BRANCH $CMTCAT_REPO $CMTCAT_DIR -else + git clone --branch $CMTCAT_BRANCH $CMTCAT_REPO $CMTCAT_DIR + else cd $CMTCAT_DIR git reset HEAD --hard - git pull + git pull git checkout -f $CMTCAT_BRANCH fi - cd $CMTCAT_DIR -make -sudo make install - wget https://github.com/01org/intel-cmt-cat/archive/${VERSION}.tar.gz --directory-prefix=$CMTCAT_DIR - mv $CMTCAT_DIR/${VERSION}.tar.gz $RPM_WORKDIR/SOURCES/ - rpmbuild --define "_topdir $RPM_WORKDIR" -bb $CMTCAT_DIR/rpm/intel-cmt-cat.spec -rpm -q intel-cmt-cat +rpm -q intel-cmt-cat-devel if [ $? -eq 0 ] then - echo "*** intel-cmt-cat is already installed" + echo "*** intel-cmt-cat-devel is already installed" else - RPM_NAME=`ls -1 $RPM_DIR | grep -E "cmt-cat-[0-9]"` - sudo rpm -ivf $RPM_DIR/$RPM_NAME + RPM_NAME=`ls -1 $RPM_DIR | grep -E "cmt-cat-[0-9]"` + sudo rpm -ivf $RPM_DIR/$RPM_NAME + RPM_NAME=`ls -1 $RPM_DIR | grep -E "cmt-cat-devel-[0-9]"` + sudo rpm -ivf $RPM_DIR/$RPM_NAME fi diff --git a/ci/utility/package-list.sh b/ci/utility/package-list.sh index 10c32a46..4d5d4b6a 100755 --- a/ci/utility/package-list.sh +++ b/ci/utility/package-list.sh @@ -21,5 +21,7 @@ CMTCAT_DIR=$WORKSPACE/intel-cmt-cat CMTCAT_REPO=https://github.com/01org/intel-cmt-cat.git CMTCAT_BRANCH=master +CMTCAT_VERSION="v1.0.1" + COLLECTD_REPO=https://github.com/collectd/collectd.git COLLECTD_BRANCH=d83bdb92ce4dbda05dcb7112c4e9fea1a17a3e22 |