diff options
| author | François Andriot <[email protected]> | 2017-07-21 22:08:02 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2017-07-21 22:08:02 +0200 |
| commit | c547d05240fa95ce14ab4e8665adfc81c0ec369a (patch) | |
| tree | d319e7088d5167445e694f884735f88a89b6f820 | |
| parent | a5f69c65c26585261d8e7462f093dc1e94a0ffd8 (diff) | |
| download | tde-packaging-c547d05240fa95ce14ab4e8665adfc81c0ec369a.tar.gz tde-packaging-c547d05240fa95ce14ab4e8665adfc81c0ec369a.zip | |
RPM packaging: update build scripts
| -rw-r--r-- | redhat/Makefile.r14 | 2 | ||||
| -rwxr-xr-x | redhat/build/install_rpm_package.sh | 6 | ||||
| -rwxr-xr-x | redhat/build/update_repository.sh | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 1e3d6c9a6..7c490106f 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -269,7 +269,7 @@ endif torsocks: # Do NOT build on RHEL 6, RHEL 7, Fedora > 20, Mageia -ifeq ($(wildcard /boot/vmlinuz*.el6* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc2* /boot/mageia.dat/boot/mageia.dat),) +ifeq ($(wildcard /boot/vmlinuz*.el6* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc2* /boot/mageia.dat /etc/SuSE-release),) $(call buildpkg,3rdparty/torsocks) endif diff --git a/redhat/build/install_rpm_package.sh b/redhat/build/install_rpm_package.sh index 7adb128a5..5deece1bd 100755 --- a/redhat/build/install_rpm_package.sh +++ b/redhat/build/install_rpm_package.sh @@ -8,10 +8,10 @@ done PKGNAME="${1}" -if [ -x /usr/bin/dnf ]; then - PKGINST="sudo dnf install -y --refresh --nogpgcheck" -elif [ -x /usr/sbin/urpmi ]; then +if [ -x /usr/sbin/urpmi ]; then PKGINST='sudo urpmi --auto --no-verify-rpm' +elif [ -x /usr/bin/dnf ]; then + PKGINST="sudo dnf install -y --refresh --nogpgcheck" elif [ -x /usr/bin/zypper ]; then PKGINST="sudo zypper install -y" elif [ -x /usr/bin/yum ]; then diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh index fafb66e05..fc1073bfa 100755 --- a/redhat/build/update_repository.sh +++ b/redhat/build/update_repository.sh @@ -15,10 +15,10 @@ RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION}) [ -d "${RPMDIR}/noarch" ] || mkdir -p "${RPMDIR}/noarch" [ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}" -if [ -x /usr/bin/dnf ]; then - REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf clean expire-cache --disablerepo="*" --enablerepo="rpmbuild*")' -elif [ -x /usr/sbin/urpmi ]; then +if [ -x /usr/sbin/urpmi ]; then REPOUPDATE='(cd ${RPMDIR}; genhdlist2 --clean --allow-empty noarch & genhdlist2 --clean --allow-empty ${ARCH} & wait; sudo urpmi.update rpmbuild.${ARCH} rpmbuild.noarch)' +elif [ -x /usr/bin/dnf ]; then + REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf clean expire-cache --disablerepo="*" --enablerepo="rpmbuild*")' 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)' elif [ -x /usr/bin/yum ]; then |