Date: Friday, October 24, 2014 @ 19:21:18 Author: dwallace Revision: 121358
upgpkg: salt 2014.7.0rc6-1 upgpkg: salt for testing Modified: salt/trunk/PKGBUILD ----------+ PKGBUILD | 74 ++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 17 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-10-24 16:49:17 UTC (rev 121357) +++ PKGBUILD 2014-10-24 17:21:18 UTC (rev 121358) @@ -3,35 +3,49 @@ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contibutor: Christer Edwards <christer.edwa...@gmail.com> -pkgname=salt -pkgver=2014.1.13 +pkgbase=salt +pkgname=(salt-zmq salt-raet) +pkgver=2014.7.0rc6 pkgrel=1 pkgdesc='Central system and configuration manager' arch=('any') url='http://saltstack.org/' license=('Apache') -depends=('python2' - 'python2-crypto' - 'python2-jinja' - 'python2-m2crypto' - 'python2-msgpack' - 'python2-psutil' - 'python2-pyzmq' - 'python2-systemd' - 'python2-requests' - 'python2-yaml' - 'apache-libcloud' - 'sshpass') +makedepends=('python2' + 'python2-jinja' + 'python2-msgpack' + 'python2-yaml' + 'python2-markupsafe' + 'python2-requests' + 'python2-libnacl' + 'python2-ioflo' + 'python2-raet' + 'python2-pyzmq' + 'python2-crypto' + 'python2-m2crypto') optdepends=('dmidecode: decode SMBIOS/DMI tables' 'python2-pygit2: gitfs support') backup=('etc/salt/master' 'etc/salt/minion') install=salt.install +conflicts=('salt') source=("http://pypi.python.org/packages/source/s/salt/salt-$pkgver.tar.gz") -md5sums=('b5088ddc04ddee7f8561aa77f4d36c6e') +md5sums=('75215fd0fd39a6f5889170eb32dfc6e8') -package() { - cd $pkgname-$pkgver +package_salt-zmq() { + cd $pkgbase-$pkgver + provides=('salt' 'salt-ssh') + replaces=('salt<=2014.1.13') + depends=('python2' + 'python2-jinja' + 'python2-msgpack' + 'python2-yaml' + 'python2-markupsafe' + 'python2-requests' + 'python2-pyzmq' + 'python2-crypto' + 'python2-m2crypto') + python2 setup.py clean python2 setup.py install --root="$pkgdir" --optimize=1 \ --salt-pidfile-dir="/run/salt" @@ -45,4 +59,30 @@ done } +package_salt-raet() { + cd $pkgbase-$pkgver + provides=('salt' 'salt-ssh') + depends=('python2' + 'python2-jinja' + 'python2-msgpack' + 'python2-yaml' + 'python2-markupsafe' + 'python2-requests' + 'python2-libnacl' + 'python2-ioflo' + 'python2-raet') + python2 setup.py clean + python2 setup.py install --root="$pkgdir" --optimize=1 \ + --salt-pidfile-dir="/run/salt" --salt-transport=raet + + # default config + install -Dm644 conf/master "$pkgdir/etc/salt/master" + install -Dm644 conf/minion "$pkgdir/etc/salt/minion" + + # systemd services + for _svc in salt-master.service salt-syndic.service salt-minion.service; do + install -Dm644 pkg/$_svc "$pkgdir/usr/lib/systemd/system/$_svc" + done +} + # vim:set ts=2 sw=2 et: