summaryrefslogtreecommitdiffstats
path: root/redhat/build
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/build')
-rwxr-xr-xredhat/build/build_rpm_package.sh4
-rwxr-xr-xredhat/build/configure_repository.sh2
-rwxr-xr-xredhat/build/gather_rpm_sources.sh4
-rwxr-xr-xredhat/build/get_installed_package_version.sh2
-rwxr-xr-xredhat/build/get_latest_built_package_filename.sh2
-rwxr-xr-xredhat/build/get_latest_built_package_version.sh2
-rwxr-xr-xredhat/build/get_latest_tarball_filename.sh2
-rwxr-xr-xredhat/build/get_latest_tarball_version.sh2
-rwxr-xr-xredhat/build/get_source_files.sh2
-rwxr-xr-xredhat/build/get_spec_version.sh2
-rwxr-xr-xredhat/build/get_specfile.sh2
-rwxr-xr-xredhat/build/is_latest_package_built.sh2
-rwxr-xr-xredhat/build/is_latest_package_installed.sh2
-rwxr-xr-xredhat/build/update_repository.sh5
14 files changed, 18 insertions, 17 deletions
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 6e214e641..f725cae71 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_PACKAGE> [TDE_VERSION]
-# Example: build_rpm_package.sh tdebase 14.1.0
+# Example: build_rpm_package.sh tdebase 14.1.1
PKGNAME="${1%/}"
PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}"
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 cc9a33e54..654fa4197 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.1.0}}"
+TDE_VERSION="${1:-${TDE_VERSION:-14.1.1}}"
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 df6cadc9d..e054e7806 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 <TDE_PACKAGE> <TDE_VERSION> <DESTINATION>
-# Example: gather_rpm_sources.sh tdebase 14.1.0 /tmp/tdebase
+# Example: gather_rpm_sources.sh tdebase 14.1.1 /tmp/tdebase
PKGNAME="${1%/}"
PKGNAME="${PKGNAME##*/}"
-TDE_VERSION="${2:-${TDE_VERSION:-14.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}"
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 b89f9bb7f..a22073044 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.1.0-0_pre727+6be06b3d.mga3.opt
+# Sample package name: trinity-tdelibs-14.1.1-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 3f7dca3b1..1fa92bd88 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.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}"
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 62954bd01..d4302f447 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.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}"
[ -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 e2558d585..ed163c5f5 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.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}"
[ -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 bf6db3b9e..2d0b2aadb 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.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}"
[ -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 529aa49ed..8d9878476 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.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}"
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 529b11593..b0ac66bf6 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.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}"
[ -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 ce8042e31..d1f340480 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.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}"
[ -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 336a83cc3..7cc93bfa4 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.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}"
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 fe2d948b9..4357767e8 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.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}"
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 c00078f1e..31248abd2 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.1.0}}"
+TDE_VERSION="${2:-${TDE_VERSION:-14.1.1}}"
LOCKFILE="/tmp/lock.${0##*/}"
while [ -e "${LOCKFILE}" ]; do
@@ -20,7 +20,8 @@ if [ -x /usr/sbin/urpmi ]; then
elif [ -x /usr/bin/dnf ]; then
REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf --repo="rpmbuild*" clean expire-cache)'
elif [ -x /usr/bin/zypper ]; then
- REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
+ #REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
+ REPOUPDATE='(rsync -av ${RPMDIR}/ /tmp/rpm${dist}/ && cd /tmp/rpm${dist}; umask 0000; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; rsync -av /tmp/rpm${dist}/ ${RPMDIR}/; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
elif [ -x /usr/bin/yum ]; then
if [ "$(rpm -E %dist)" = ".el5" ]; then
REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'