Date: Thu, 9 Feb 2017 17:00:13 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r433745 - branches/2017Q1/sysutils/py-salt Message-ID: <201702091700.v19H0DeC058286@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Thu Feb 9 17:00:13 2017 New Revision: 433745 URL: https://svnweb.freebsd.org/changeset/ports/433745 Log: MFH: r433727 sysutils/py-salt: Restore install arguments post r427901 to fix syspaths.py Without PYDISTUTILS_INSTALL_TARGET setting the install arguments, salt will be built with an invalid syspaths.py, particularly if installed somewhere other than /usr/local. As of 2016.11.0, the arguments caused an error, which was traced back to https://github.com/saltstack/salt/pull/31097/files. The removed code was deprecated, but included instructions on how to make the arguments continue to work: simply move them earlier in the command (ie., "python setup.py <args> install" instead of "python setup.py install <args>"). PR: 215885 Submitted by: Erick Turnquist <jhujhiti@adjectivism.org> Approved by: Christer Edwards (maintainer) Approved by: ports-secteam (feld) Modified: branches/2017Q1/sysutils/py-salt/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/sysutils/py-salt/Makefile ============================================================================== --- branches/2017Q1/sysutils/py-salt/Makefile Thu Feb 9 16:44:48 2017 (r433744) +++ branches/2017Q1/sysutils/py-salt/Makefile Thu Feb 9 17:00:13 2017 (r433745) @@ -3,6 +3,7 @@ PORTNAME= salt PORTVERSION= 2016.11.1 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -45,6 +46,21 @@ CPE_PRODUCT= salt USE_PYTHON= autoplist distutils NO_ARCH= yes +# we must pass these options before the target name, and python.mk has no +# early-arguments variable, so we have to manipulate the target +PYDISTUTILS_INSTALL_TARGET=\ + --salt-root-dir=/ \ + --salt-config-dir=${ETCDIR} \ + --salt-cache-dir=/var/cache/salt \ + --salt-sock-dir=/var/run/salt \ + --salt-srv-root-dir=${ETCDIR} \ + --salt-base-file-roots-dir=${ETCDIR}/states \ + --salt-base-pillar-roots-dir=${ETCDIR}/pillar \ + --salt-base-master-roots-dir=${ETCDIR}/salt-master \ + --salt-logs-dir=/var/log/salt \ + --salt-pidfile-dir=/var/run \ + install + USE_RC_SUBR= salt_api \ salt_master \ salt_minion \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702091700.v19H0DeC058286>