diff options
| author | François Andriot <albator78@libertysurf.fr> | 2018-11-29 21:39:49 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2018-11-29 21:43:16 +0100 |
| commit | 8d53102689c37ec7ba1528ed2098b1fcfafa2432 (patch) | |
| tree | e56658c08600060d44423b4641f2fbaed2538cdb | |
| parent | d84ac84ba0aa91b3eca32f536a4c48ce5fc97315 (diff) | |
| download | tde-packaging-8d53102689c37ec7ba1528ed2098b1fcfafa2432.tar.gz tde-packaging-8d53102689c37ec7ba1528ed2098b1fcfafa2432.zip | |
RPM: update build scripts
| -rwxr-xr-x | redhat/build/gather_rpm_sources.sh | 9 | ||||
| -rw-r--r-- | redhat/buildenv.sh | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh index 98b67cbdc..f6b7253dc 100755 --- a/redhat/build/gather_rpm_sources.sh +++ b/redhat/build/gather_rpm_sources.sh @@ -1,8 +1,7 @@ -#!/bin/bash - -# Usage: build_rpm_package.sh <TDE_PACKAGE> [TDE_VERSION] -# Example: build_rpm_package.sh tdebase 14.0.0 +#!/bin/bash -x +# Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION> +# Example: gather_rpm_sources.sh tdebase 14.0.0 /tmp/tdebase PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" @@ -31,7 +30,7 @@ cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TARGETDIR}" ### Check for patches -PATCHDIR="${SPECFILE%/*}/patches/${TDE_VERSION}" +PATCHDIR="${HOME}/tde/tde-patches/${TDE_VERSION}/$1" if [ -d "${PATCHDIR}" ]; then cat "${PATCHDIR}/"*".patch" >>"${TARGETDIR}/one.patch" sed -i "${TARGETDIR}/"*".spec" \ diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh index 02f4e19f8..029f29afa 100644 --- a/redhat/buildenv.sh +++ b/redhat/buildenv.sh @@ -4,11 +4,11 @@ TDE_BASEDIR=~/tde [ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5" -TDE_GITBASESRC=${TDE_BASEDIR}/tde_master -TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging/redhat +TDE_GITBASESRC=${TDE_BASEDIR}/tde.master +TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging.master/redhat TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION} -[ -d "${TDE_PACKAGING_DIR}" ] || export TDE_PACKAGING_DIR=~/tde/tde-packaging +[ -d "${TDE_PACKAGING_DIR}" ] || export TDE_PACKAGING_DIR=~/tde/tde-packaging.master export PATH="${PATH}:${TDE_GITBASEPKG}/build" |