ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build non-el6 rpms from rpm fusion rather than zmrepo

This commit is contained in:
Andy Bauer 2017-08-19 09:07:32 -05:00
parent 05b9b8bc51
commit 76b9a9dc01
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/packpack/redhat_package.mk
View File

@ -4,5 +4,5 @@
redhat_package: redhat_bootstrap package redhat_package: redhat_bootstrap package
redhat_bootstrap: redhat_bootstrap:
sudo yum install -y --nogpgcheck build/zmrepo.noarch.rpm sudo yum install -y --nogpgcheck build/external-repo.noarch.rpm

20
utils/packpack/startpackpack.sh
View File

@ -235,20 +235,24 @@ if [ "${TRAVIS_EVENT_TYPE}" == "cron" ] || [ "${TRAVIS}" != "true" ]; then
rm -rf web/api/app/Plugin/Crud rm -rf web/api/app/Plugin/Crud
mkdir web/api/app/Plugin/Crud mkdir web/api/app/Plugin/Crud
if [ "${OS}" == "el" ]; then # We use zmrepo to build el6 only. All other redhat distros use rpm fusion
zmrepodistro=${OS} if [ "${OS}" == "el" ] && [ "${DIST}" == "6" ]; then
baseurl="https://zmrepo.zoneminder.com/el/${DIST}/x86_64/"
reporpm="zmrepo"
else else
zmrepodistro="f" baseurl="http://download1.rpmfusion.org/free/${OS}/updates/${DIST}/x86_64/"
reporpm="rpmfusion-free-release"
fi fi
# Let repoquery determine the full url and filename of the zmrepo rpm we are interested in # Let repoquery determine the full url and filename of the external repo rpm we are interested in
result=`repoquery --repofrompath=zmpackpack,https://zmrepo.zoneminder.com/${zmrepodistro}/"${DIST}"/x86_64/ --repoid=zmpackpack --qf="%{location}" zmrepo 2> /dev/null` result=`repoquery --archlist=noarch --repofrompath=zmpackpack,${baseurl} --repoid=zmpackpack --qf="%{location}" ${reporpm} 2> /dev/null`
# Give our downloaded repo rpm a common name so redhat_package.mk can find it
if [ -n "$result" ] && [ $? -eq 0 ]; then if [ -n "$result" ] && [ $? -eq 0 ]; then
echo "Retrieving ZMREPO rpm..." echo "Retrieving ${reporpm} repo rpm..."
curl $result > build/zmrepo.noarch.rpm curl $result > build/external-repo.noarch.rpm
else else
echo "ERROR: Failed to retrieve zmrepo rpm..." echo "ERROR: Failed to retrieve ${reporpm} repo rpm..."
exit 1 exit 1
fi fi