diff options
| author | François Andriot <albator78@libertysurf.fr> | 2017-03-22 21:57:13 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2017-03-22 21:57:13 +0100 |
| commit | 6ddde32ec4113ca2574a6d63f85b312db776a40c (patch) | |
| tree | 790db43d4d46fcbeea6689ec5568374de11545ee | |
| parent | aeb5bcbd06637b5e132a2796438fd6a612bf57cc (diff) | |
| download | tde-packaging-6ddde32ec4113ca2574a6d63f85b312db776a40c.tar.gz tde-packaging-6ddde32ec4113ca2574a6d63f85b312db776a40c.zip | |
RPM packaging: update build script
| -rw-r--r-- | redhat/Makefile.r14 | 2 | ||||
| -rwxr-xr-x | redhat/build/get_latest_tarball_filename.sh | 4 | ||||
| -rwxr-xr-x | redhat/build/get_specfile.sh | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index f23bb396a..a9497c65d 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -747,7 +747,9 @@ celestia: $(call buildpkg,extras/celestia) fileshareset: +ifeq ($(wildcard /boot/vmlinuz*.mga6*),) $(call buildpkg,extras/fileshareset) +endif hk_classes: $(call buildpkg,extras/hk_classes) diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh index 0e1d6ebdc..7901d0915 100755 --- a/redhat/build/get_latest_tarball_filename.sh +++ b/redhat/build/get_latest_tarball_filename.sh @@ -13,13 +13,13 @@ EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)" RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -n | tail -n 1) [ -r "${RET}" ] && echo "${RET}" && exit 0 -RET=$(find "${TARBALLS_DIR}" "${EXTRA_DIR}" -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 -n | 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) [ -r "${RET}" ] && echo "${RET}" && exit 0 -RET=$(find "${EXTRA_DIR}" -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | tail -n 1) +RET=$(find "${EXTRA_DIR}" -follow -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | tail -n 1) [ -r "${RET}" ] && echo "${RET}" && exit 0 # Now look in the 'tde-packaging' directory diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh index fcc0b64c5..b7336ffcc 100755 --- a/redhat/build/get_specfile.sh +++ b/redhat/build/get_specfile.sh @@ -24,7 +24,7 @@ for filename in \ "trinity-${PKGNAME}-14.0.0.spec" \ "trinity-${PKGNAME}.spec" \ ; do - SPECFILE="$(find "${DIST_PACKAGING_DIR}" -name "${filename}")" + SPECFILE="$(find "${DIST_PACKAGING_DIR}" -follow -name "${filename}")" if [ -r "${SPECFILE}" ]; then echo "${SPECFILE}" exit 0 |