RPM: update build script to TDE version 14.0.12

Signed-off-by: François Andriot <albator78@libertysurf.fr>
pull/158/head
François Andriot 3 years ago
parent e2ffb8a3f4
commit 61496744bf

@ -1,6 +1,6 @@
SHELL := /bin/bash SHELL := /bin/bash
PATH := $(PATH):$(shell pwd)/build 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_GIT_DIR := $(shell cd ../../tde; pwd)
TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd) TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd)
RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))" RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))"

@ -1,12 +1,12 @@
#!/bin/bash -ex #!/bin/bash -ex
# Usage: build_rpm_package.sh <TDE_PACKAGE> [TDE_VERSION] # Usage: build_rpm_package.sh <TDE_PACKAGE> [TDE_VERSION]
# Example: build_rpm_package.sh tdebase 14.0.11 # Example: build_rpm_package.sh tdebase 14.0.12
PKGNAME="${1%/}" PKGNAME="${1%/}"
PKGNAME="${PKGNAME##*/}" PKGNAME="${PKGNAME##*/}"
TDE_VERSION="${2:-${TDE_VERSION:-14.0.11}}" TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}"
PATH="$(cd $(dirname $0); pwd):${PATH}" PATH="$(cd $(dirname $0); pwd):${PATH}"
SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION})

@ -1,6 +1,6 @@
#!/bin/bash -x #!/bin/bash -x
TDE_VERSION="${1:-${TDE_VERSION:-14.0.11}}" TDE_VERSION="${1:-${TDE_VERSION:-14.0.12}}"
ARCH=$(rpm -E %_target_cpu) ARCH=$(rpm -E %_target_cpu)
RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION}) RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
# Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION> # Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION>
# 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="${1%/}"
PKGNAME="${PKGNAME##*/}" PKGNAME="${PKGNAME##*/}"
TDE_VERSION="${2:-${TDE_VERSION:-14.0.11}}" TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}"
TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}" TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}"
DIST="$4" DIST="$4"

@ -1,6 +1,6 @@
#!/bin/bash #!/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##*/}" PKGNAME="${1##*/}"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1

@ -2,7 +2,7 @@
PKGNAME="$1" PKGNAME="$1"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 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="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"
RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)" RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)"

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PKGNAME="$1" 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 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PKGNAME="${1##*/}" 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 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
[ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/ [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PKGNAME="${1##*/}" 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 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PKGNAME="${1##*/}" PKGNAME="${1##*/}"
TDE_VERSION="${2:-${TDE_VERSION:-14.0.11}}" TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}"
DIST="$3" DIST="$3"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PKGNAME="${1##*/}" 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 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PKGNAME="${1##*/}" 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 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PKGNAME="${1##*/}" 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})" BUILT="$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION})"
TARBALL="$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})" TARBALL="$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})"

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
PKGNAME="${1##*/}" 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}) INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION})
TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION}) TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
WORKERS=$(getconf _NPROCESSORS_ONLN) WORKERS=$(getconf _NPROCESSORS_ONLN)
TDE_VERSION="${2:-${TDE_VERSION:-14.0.11}}" TDE_VERSION="${2:-${TDE_VERSION:-14.0.12}}"
LOCKFILE="/tmp/lock.${0##*/}" LOCKFILE="/tmp/lock.${0##*/}"
while [ -e "${LOCKFILE}" ]; do while [ -e "${LOCKFILE}" ]; do

@ -4,7 +4,7 @@ DISTRIB="$1"
TDE_VERSION="$2" TDE_VERSION="$2"
ARCH="$3" ARCH="$3"
[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.11" [ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.12"
[ -z "${ARCH}" ] && ARCH="x86_64" [ -z "${ARCH}" ] && ARCH="x86_64"
[ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker

@ -4,7 +4,7 @@ DISTRIB="$1"
TDE_VERSION="$2" TDE_VERSION="$2"
ARCH="$3" ARCH="$3"
[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.11" [ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.12"
[ -z "${ARCH}" ] && ARCH="x86_64" [ -z "${ARCH}" ] && ARCH="x86_64"
IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"

@ -4,7 +4,7 @@ DISTRIB="$1"
TDE_VERSION="$2" TDE_VERSION="$2"
ARCH="$3" ARCH="$3"
[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.11" [ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.12"
[ -z "${ARCH}" ] && ARCH="x86_64" [ -z "${ARCH}" ] && ARCH="x86_64"
IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"

@ -4,7 +4,7 @@ DISTRIB="$1"
TDE_VERSION="$2" TDE_VERSION="$2"
ARCH="$3" ARCH="$3"
[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.11" [ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.12"
[ -z "${ARCH}" ] && ARCH="x86_64" [ -z "${ARCH}" ] && ARCH="x86_64"
IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"

@ -4,7 +4,7 @@ DISTRIB="$1"
TDE_VERSION="$2" TDE_VERSION="$2"
ARCH="$3" ARCH="$3"
[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.11" [ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.12"
[ -z "${ARCH}" ] && ARCH="x86_64" [ -z "${ARCH}" ] && ARCH="x86_64"
[ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker

Loading…
Cancel
Save