diff --git a/.travis.yml b/.travis.yml index 74f686caf..78167f860 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,8 +35,6 @@ env: global: - SMPFLAGS=-j4 matrix: - - OS=el DIST=6 - - OS=el DIST=6 ARCH=i386 DOCKER_REPO=knnniggett/packpack - OS=el DIST=7 - OS=fedora DIST=26 DOCKER_REPO=knnniggett/packpack - OS=fedora DIST=27 DOCKER_REPO=knnniggett/packpack diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh index 7f576077c..91e671f2e 100755 --- a/utils/packpack/startpackpack.sh +++ b/utils/packpack/startpackpack.sh @@ -19,20 +19,7 @@ checksanity () { exit 1 fi done - - if [ "${OS}" == "el" ] && [ "${DIST}" == "6" ]; then - type repoquery 2>&1 > /dev/null - - if [ $? -ne 0 ]; then - echo - echo "ERROR: The script cannot find the required command \"reqoquery\"." - echo "This command is required in order to build ZoneMinder on el6." - echo "Please install the \"yum-utils\" package then try again." - echo - exit 1 - fi - fi - + # Verify OS & DIST environment variables have been set before calling this script if [ -z "${OS}" ] || [ -z "${DIST}" ]; then echo "ERROR: both OS and DIST environment variables must be set" @@ -336,16 +323,8 @@ if [ "${TRAVIS_EVENT_TYPE}" == "cron" ] || [ "${TRAVIS}" != "true" ]; then rm -rf web/api/app/Plugin/Crud mkdir web/api/app/Plugin/Crud - # We use zmrepo to build el6 only. All other redhat distros use rpm fusion - if [ "${OS}" == "el" ] && [ "${DIST}" == "6" ]; then - baseurl="https://${DEPLOYHOST}/el/${DIST}/x86_64/" - reporpm="zmrepo" - # Let repoquery determine the full url and filename to the latest zmrepo package - dlurl="$(repoquery --archlist=noarch --repofrompath=zmpackpack,${baseurl} --repoid=zmpackpack --qf="%{location}" ${reporpm} 2>&1)" - else - reporpm="rpmfusion-free-release" - dlurl="https://download1.rpmfusion.org/free/${OS}/${reporpm}-${DIST}.noarch.rpm" - fi + reporpm="rpmfusion-free-release" + dlurl="https://download1.rpmfusion.org/free/${OS}/${reporpm}-${DIST}.noarch.rpm" # Give our downloaded repo rpm a common name so redhat_package.mk can find it if [ -n "$dlurl" ] && [ $? -eq 0 ]; then