From 5c45aeeee3d13aaa81c261779d2f62b1e7e5f6e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 11 Apr 2023 17:22:38 +0200 Subject: [PATCH] RPM: update tde/packaging repository path in build scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/build/get_latest_tarball_filename.sh | 2 +- redhat/build/get_specfile.sh | 2 +- redhat/docker/run.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh index c3f971c0b..c3f35cf43 100755 --- a/redhat/build/get_latest_tarball_filename.sh +++ b/redhat/build/get_latest_tarball_filename.sh @@ -5,7 +5,7 @@ TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/ -[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/master/tde-packaging +[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/master/tde/packaging [ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/redhat/ EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)" diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh index 4f5dec5b2..ce8042e31 100755 --- a/redhat/build/get_specfile.sh +++ b/redhat/build/get_specfile.sh @@ -5,7 +5,7 @@ TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 -[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR="${HOME}/tde/${TDE_BRANCH:-master}/tde-packaging" +[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR="${HOME}/tde/${TDE_BRANCH:-master}/tde/packaging" [ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR="${TDE_PACKAGING_DIR}/redhat" # Special case for QT3 diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index 974e21ead..322383e2d 100755 --- a/redhat/docker/run.sh +++ b/redhat/docker/run.sh @@ -31,7 +31,7 @@ ${DOCKER} run -ti --rm \ -e TMPPATH=/tmp \ -e TDE_VERSION=${TDE_VERSION} \ -e TDE_BRANCH=${TDE_BRANCH} \ - -w /home/trinity/tde/${TDE_BRANCH}/tde-packaging/redhat \ + -w /home/trinity/tde/${TDE_BRANCH}/tde/packaging/redhat \ -v ${HOME}/.gnupg:/home/trinity/.gnupg \ -v ${HOME}/tde/master:/home/trinity/tde/master \ -v ${HOME}/tde/r14.0.x:/home/trinity/tde/r14.0.x \