RPM: update build scripts

pull/14/head
François Andriot 6 years ago
parent fea0292e6b
commit fbc6de5850

@ -1,4 +1,4 @@
#!/bin/bash -x
#!/bin/bash
# Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION>
# Example: gather_rpm_sources.sh tdebase 14.0.0 /tmp/tdebase
@ -30,7 +30,7 @@ cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TARGETDIR}"
### Check for patches
PATCHDIR="${HOME}/tde/tde-patches/${TDE_VERSION}/$1"
PATCHDIR="${HOME}/tde/patches/${TDE_VERSION}/$1"
if [ -d "${PATCHDIR}" ]; then
cat "${PATCHDIR}/"*".patch" >>"${TARGETDIR}/one.patch"
sed -i "${TARGETDIR}/"*".spec" \

@ -10,32 +10,32 @@ TDE_VERSION="${2:-14.0.0}"
EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)"
RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -n | tail -n 1)
RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -V | tail -n 1)
[ -r "${RET}" ] && echo "${RET}" && exit 0
RET=$(find "${TARBALLS_DIR}" "${EXTRA_DIR}" -follow -name "${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -n | tail -n 1)
RET=$(find "${TARBALLS_DIR}" "${EXTRA_DIR}" -follow -name "${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -V | tail -n 1)
[ -r "${RET}" ] && echo "${RET}" && exit 0
RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-[0-9]*.tar.gz" | sort -n | tail -n 1)
RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-[0-9]*.tar.gz" | sort -V | tail -n 1)
[ -r "${RET}" ] && echo "${RET}" && exit 0
RET=$(find "${EXTRA_DIR}" -follow -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | tail -n 1)
RET=$(find "${EXTRA_DIR}" -follow -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -V | tail -n 1)
[ -r "${RET}" ] && echo "${RET}" && exit 0
# Now look in the 'tde-packaging' directory
RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -V | tail -n 1)
[ -r "${RET}" ] && echo "${RET}" && exit 0
# Retry without 'trinity-*', and allow any TAR extension.
RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -V | tail -n 1)
[ -r "${RET}" ] && echo "${RET}" && exit 0
# Retry without 'trinity-*', and allow any TAR extension.
RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -n | tail -n 1)
RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -V | tail -n 1)
[ -r "${RET}" ] && echo "${RET}" && exit 0
# Retry by removing numbers in package name, e.g "imlib1" => "imlib"
RET=$(find "${DIST_PACKAGING_DIR}" -name "$(tr -d "[0-9]" <<< ${PKGNAME})-[0-9]*.tar*" | sort -n | tail -n 1)
RET=$(find "${DIST_PACKAGING_DIR}" -name "$(tr -d "[0-9]" <<< ${PKGNAME})-[0-9]*.tar*" | sort -V | tail -n 1)
[ -r "${RET}" ] && echo "${RET}" && exit 0

@ -25,10 +25,12 @@ for filename in \
"trinity-${PKGNAME}.spec" \
; do
SPECFILE="$(find "${DIST_PACKAGING_DIR}" -follow -name "${filename}")"
if [ -r "${SPECFILE}" ]; then
echo "${SPECFILE}"
exit 0
fi
[ -r "${SPECFILE}" ] && break || continue
done
exit 1
if [ -r "${SPECFILE}" ]; then
echo "${SPECFILE}"
exit 0
else
exit 1
fi

@ -2,13 +2,14 @@
# This file can be sourced in your .bashrc
TDE_BASEDIR=~/tde
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
TDE_BASEDIR="${HOME}/tde"
[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5"
TDE_GITBASESRC=${TDE_BASEDIR}/tde.master
TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging.master/redhat
TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION}
TDE_GITBASESRC=${TDE_BASEDIR}/${BRANCH}/tde
[ -d "${TDE_PACKAGING_DIR}" ] || export TDE_PACKAGING_DIR="${TDE_BASEDIR}/${BRANCH}/tde-packaging"
TDE_GITBASEPKG="${TDE_PACKAGING_DIR}/redhat"
TDE_TARBALLS="${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION}"
[ -d "${TDE_PACKAGING_DIR}" ] || export TDE_PACKAGING_DIR=~/tde/tde-packaging.master
export PATH="${PATH}:${TDE_GITBASEPKG}/build"
@ -16,7 +17,7 @@ export PATH="${PATH}:${TDE_GITBASEPKG}/build"
export DIST="$( "${TDE_GITBASEPKG}/build/rpmdist.sh" --dist )"
# Go to the RPMS folder
alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}'
alias cdrpm='cd ${HOME}/rpmbuild/RPMS/RPMS${DIST}'
# Build a single tarball (execute from GIT directory)
alias tdp4='TARGET=${TDE_VERSION} SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball'
@ -31,7 +32,7 @@ alias tdep3='(rm -rf ~/tde/tde-tarballs/3.5.13.2; cd ~/tde/tde_v3.5.13-sru; expo
alias tdep4='(cd ${TDE_GITBASESRC}; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
# Build a single package
alias cdp='cd ~/tde/tde-packaging/redhat'
alias cdp='cd $HOME/tde/tde-packaging/redhat'
grp3() {
build_rpm_package.sh "${1}" "3.5.13.2"

Loading…
Cancel
Save