6ddde32e | 2017-03-22 15:57:13 | François Andriot |
RPM packaging: update build script |
||
M redhat/Makefile.r14 M redhat/build/get_latest_tarball_filename.sh M redhat/build/get_specfile.sh |
||
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index f23bb39..a9497c6 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -747,7 +747,9 @@ $(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 0e1d6eb..7901d09 100755 --- a/redhat/build/get_latest_tarball_filename.sh +++ b/redhat/build/get_latest_tarball_filename.sh @@ -13,13 +13,13 @@ 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 fcc0b64..b7336ff 100755 --- a/redhat/build/get_specfile.sh +++ b/redhat/build/get_specfile.sh @@ -24,7 +24,7 @@ "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 |