TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM packaging: update build scripts

Browse Source
pull/3/head
François Andriot 8 years ago
parent a5f69c65c2
commit c547d05240
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
redhat/Makefile.r14
Unescape View File

@ -269,7 +269,7 @@ endif
torsocks: torsocks:
# Do NOT build on RHEL 6, RHEL 7, Fedora > 20, Mageia # 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) $(call buildpkg,3rdparty/torsocks)
endif endif

6
redhat/build/install_rpm_package.sh
Unescape View File

@ -8,10 +8,10 @@ done
PKGNAME="${1}" PKGNAME="${1}"
if [ -x /usr/bin/dnf ]; then if [ -x /usr/sbin/urpmi ]; then
PKGINST="sudo dnf install -y --refresh --nogpgcheck"
elif [ -x /usr/sbin/urpmi ]; then
PKGINST='sudo urpmi --auto --no-verify-rpm' 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 elif [ -x /usr/bin/zypper ]; then
PKGINST="sudo zypper install -y" PKGINST="sudo zypper install -y"
elif [ -x /usr/bin/yum ]; then elif [ -x /usr/bin/yum ]; then

6
redhat/build/update_repository.sh
Unescape View File

@ -15,10 +15,10 @@ RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
[ -d "${RPMDIR}/noarch" ] || mkdir -p "${RPMDIR}/noarch" [ -d "${RPMDIR}/noarch" ] || mkdir -p "${RPMDIR}/noarch"
[ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}" [ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}"
if [ -x /usr/bin/dnf ]; then if [ -x /usr/sbin/urpmi ]; 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
REPOUPDATE='(cd ${RPMDIR}; genhdlist2 --clean --allow-empty noarch & genhdlist2 --clean --allow-empty ${ARCH} & wait; sudo urpmi.update rpmbuild.${ARCH} rpmbuild.noarch)' 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 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)' 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 elif [ -x /usr/bin/yum ]; then

Write Preview
Loading…
Cancel
Save