From 61496744bfb6408f61f4c2bf3e285d8321c9dde3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 5 Apr 2022 17:56:28 +0200 Subject: [PATCH] RPM: update build script to TDE version 14.0.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/Makefile | 2 +- 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 +- 20 files changed, 22 insertions(+), 22 deletions(-) diff --git a/redhat/Makefile b/redhat/Makefile index 6e785a5d7..28ac10964 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -1,6 +1,6 @@ SHELL := /bin/bash PATH := $(PATH):$(shell pwd)/build -TDE_VERSION := $(shell echo $${TDE_VERSION:-14.0.11}) +TDE_VERSION := $(shell echo $${TDE_VERSION:-14.0.12}) TDE_GIT_DIR := $(shell cd ../../tde; pwd) TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd) RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))" diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index 6c2915adc..5de5c7881 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.11 +# Example: build_rpm_package.sh tdebase 14.0.12 PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.11}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}" 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 84876b2d9..025211ac2 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.11}}" +TDE_VERSION="${1:-${TDE_VERSION:-14.0.12}}" 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 c9a79b0c4..cba05b1f8 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.11 /tmp/tdebase +# Example: gather_rpm_sources.sh tdebase 14.0.12 /tmp/tdebase PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.11}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}" 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 8e77fe87a..bfe0b1649 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.11-0_pre727+6be06b3d.mga3.opt +# Sample package name: trinity-tdelibs-14.0.12-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 c6fa302a5..4d6de64fd 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.11}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}" 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 26e4e4865..8ac052c9e 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.11}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}" [ -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 52a1fe488..09b41b846 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.11}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}" [ -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 60ee03404..423d89c85 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.11}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}" [ -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 87f2e0ce1..d262fccf3 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.11}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}" 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 30c1a9707..06b360228 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.11}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}" [ -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 d538c8ade..3403a329e 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.11}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}" [ -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 b99e54a3e..750e1012d 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.11}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}" 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 51196475d..787962bcf 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.11}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}" 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 dad43e183..43d4db934 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.11}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}" LOCKFILE="/tmp/lock.${0##*/}" while [ -e "${LOCKFILE}" ]; do diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index a6c8953ee..1af425f47 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.11" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.12" [ -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 19fd15dbb..33581efc5 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.11" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.12" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh index 1bc867925..cc906b509 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.11" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.12" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh index 8ba7c6ebb..dc3b3ec77 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.11" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.12" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index e0d9d8815..85c10e1c6 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.11" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.12" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker