From 9b230154333f3e9608bb600905144f655f2b13ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 7 Feb 2021 14:27:55 +0100 Subject: RPM: update default TDE version to 14.0.9 --- redhat/build/build_rpm_package.sh | 4 ++-- redhat/build/configure_repository.sh | 2 +- redhat/build/gather_rpm_sources.sh | 4 ++-- redhat/build/get_installed_package_version.sh | 2 +- redhat/build/get_latest_built_package_filename.sh | 2 +- redhat/build/get_latest_built_package_version.sh | 2 +- redhat/build/get_latest_tarball_filename.sh | 2 +- redhat/build/get_latest_tarball_version.sh | 2 +- redhat/build/get_source_files.sh | 2 +- redhat/build/get_spec_version.sh | 2 +- redhat/build/get_specfile.sh | 2 +- redhat/build/is_latest_package_built.sh | 2 +- redhat/build/is_latest_package_installed.sh | 2 +- redhat/build/update_repository.sh | 2 +- redhat/docker/build.sh | 2 +- redhat/docker/pull.sh | 2 +- redhat/docker/push.sh | 2 +- redhat/docker/remove.sh | 2 +- redhat/docker/run.sh | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index 5f4d659a2..cb24fa6f2 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -1,12 +1,12 @@ #!/bin/bash -ex # Usage: build_rpm_package.sh [TDE_VERSION] -# Example: build_rpm_package.sh tdebase 14.0.7 +# Example: build_rpm_package.sh tdebase 14.0.9 PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}" PATH="$(cd $(dirname $0); pwd):${PATH}" SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh index 7723a1651..6168948af 100755 --- a/redhat/build/configure_repository.sh +++ b/redhat/build/configure_repository.sh @@ -1,6 +1,6 @@ #!/bin/bash -x -TDE_VERSION="${1:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${1:-${TDE_VERSION:-14.0.9}}" ARCH=$(rpm -E %_target_cpu) RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION}) diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh index 6159a2bf0..4b4cf0c77 100755 --- a/redhat/build/gather_rpm_sources.sh +++ b/redhat/build/gather_rpm_sources.sh @@ -1,11 +1,11 @@ #!/bin/bash # Usage: gather_rpm_sources.sh -# Example: gather_rpm_sources.sh tdebase 14.0.7 /tmp/tdebase +# Example: gather_rpm_sources.sh tdebase 14.0.9 /tmp/tdebase PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}" TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}" DIST="$4" diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh index 83db3ab12..0bd5c6b22 100755 --- a/redhat/build/get_installed_package_version.sh +++ b/redhat/build/get_installed_package_version.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Sample package name: trinity-tdelibs-14.0.7-0_pre727+6be06b3d.mga3.opt +# Sample package name: trinity-tdelibs-14.0.9-0_pre727+6be06b3d.mga3.opt PKGNAME="${1##*/}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh index c25897907..412017a92 100755 --- a/redhat/build/get_latest_built_package_filename.sh +++ b/redhat/build/get_latest_built_package_filename.sh @@ -2,7 +2,7 @@ PKGNAME="$1" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}" RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})" RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)" diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh index 869efc93b..c25c48a88 100755 --- a/redhat/build/get_latest_built_package_version.sh +++ b/redhat/build/get_latest_built_package_version.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="$1" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh index 1d129843f..1f9193ee0 100755 --- a/redhat/build/get_latest_tarball_filename.sh +++ b/redhat/build/get_latest_tarball_filename.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/ diff --git a/redhat/build/get_latest_tarball_version.sh b/redhat/build/get_latest_tarball_version.sh index dd3448765..30d1f9da4 100755 --- a/redhat/build/get_latest_tarball_version.sh +++ b/redhat/build/get_latest_tarball_version.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh index 8b2a74c1a..6b39789e6 100755 --- a/redhat/build/get_source_files.sh +++ b/redhat/build/get_source_files.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}" DIST="$3" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh index d92060c5c..b136a6b2d 100755 --- a/redhat/build/get_spec_version.sh +++ b/redhat/build/get_spec_version.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh index 62eb01144..a38256188 100755 --- a/redhat/build/get_specfile.sh +++ b/redhat/build/get_specfile.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh index 2acb98a6a..27b8b8dd4 100755 --- a/redhat/build/is_latest_package_built.sh +++ b/redhat/build/is_latest_package_built.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}" BUILT="$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION})" TARBALL="$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})" diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh index 811cbafa0..567be234a 100755 --- a/redhat/build/is_latest_package_installed.sh +++ b/redhat/build/is_latest_package_installed.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}" INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION}) TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION}) diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh index d6b711656..70fb800ab 100755 --- a/redhat/build/update_repository.sh +++ b/redhat/build/update_repository.sh @@ -1,7 +1,7 @@ #!/bin/bash WORKERS=$(getconf _NPROCESSORS_ONLN) -TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.9}}" LOCKFILE="/tmp/lock.${0##*/}" while [ -e "${LOCKFILE}" ]; do diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index 21f1385e5..53df6d1c5 100755 --- a/redhat/docker/build.sh +++ b/redhat/docker/build.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.9" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh index 62639c40e..478a14664 100755 --- a/redhat/docker/pull.sh +++ b/redhat/docker/pull.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.9" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh index 3f2da2fcd..76a12557f 100755 --- a/redhat/docker/push.sh +++ b/redhat/docker/push.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.9" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh index 192f34385..6eb8a8589 100755 --- a/redhat/docker/remove.sh +++ b/redhat/docker/remove.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.9" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index 32bc6af59..16da72fa2 100755 --- a/redhat/docker/run.sh +++ b/redhat/docker/run.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.9" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker -- cgit v1.2.3