diff options
Diffstat (limited to 'redhat/buildenv.sh')
| -rw-r--r-- | redhat/buildenv.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh index 91a78b746..02f4e19f8 100644 --- a/redhat/buildenv.sh +++ b/redhat/buildenv.sh @@ -3,8 +3,8 @@ # This file can be sourced in your .bashrc TDE_BASEDIR=~/tde -TDE_VERSION=14.0.0 -TDE_GITBASESRC=${TDE_BASEDIR}/tde_r14 +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5" +TDE_GITBASESRC=${TDE_BASEDIR}/tde_master TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging/redhat TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION} @@ -19,7 +19,7 @@ export DIST="$( "${TDE_GITBASEPKG}/build/rpmdist.sh" --dist )" alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}' # Build a single tarball (execute from GIT directory) -alias tdp4='TARGET=14.0.0 SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball' +alias tdp4='TARGET=${TDE_VERSION} SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball' # Rebuild all tarballs if [ -x /usr/bin/pigz ]; then @@ -28,7 +28,7 @@ else export TDE_COMPRESS=gzip fi alias tdep3='(rm -rf ~/tde/tde-tarballs/3.5.13.2; cd ~/tde/tde_v3.5.13-sru; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)' -alias tdep4='(rm -rf ${TDE_TARBALLS}; cd ${TDE_GITBASESRC}; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)' +alias tdep4='(cd ${TDE_GITBASESRC}; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)' # Build a single package alias cdp='cd ~/tde/tde-packaging/redhat' @@ -38,17 +38,17 @@ grp3() { } grp4() { - build_rpm_package.sh "${1}" "14.0.0" + build_rpm_package.sh "${1}" "${TDE_VERSION}" } # Check if tarballs are more recent than installed packages checknew() { - find ~/tde/tde-tarballs/14.0.0 -name "trinity-*.tar.gz" | while read f; do + find ~/tde/tde-tarballs/${TDE_VERSION} -name "trinity-*.tar.gz" | while read f; do TAR="${f##*/}" NAME="${TAR%-*}" if rpm -q "${NAME}" &>/dev/null; then - set $(rpm -q --qf "%{name} 14.0.0 %{release}" ${NAME} ) + set $(rpm -q --qf "%{name} ${TDE_VERSION} %{release}" ${NAME} ) B="$1-$2~${3#*_}" A=${TAR%.tar.gz} B=${B%.opt} @@ -83,10 +83,10 @@ do_optimizegraphics() { done < submodules } -alias rr='rpm -qa --qf "%{name} %{buildhost}\n" | grep "\.vtf" | awk "{print \$1}"' +alias rr='rpm -qa --qf "%{name}|%{buildhost}|%{packager}\n" | grep -e "\(\.vtf\|andriot\)"|cut -d"|" -f1 | sort' # Update main repository -alias tdu='(export GIT_ASKPASS=/bin/true; cd ~/tde/tde_r14; ./scripts/switch_all_submodules_to_head_and_clean)' +alias tdu='(export GIT_ASKPASS=/bin/true; cd ~/tde/tde_master; ./scripts/switch_all_submodules_to_head_and_clean)' # Build local repository metadata (Mageia) alias cru='(cdrpm; genhdlist2 --allow-empty-media noarch; genhdlist2 $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)' |