Attachment 187112 Details for Bug 222943 – salt 2017.1 fix for Amazon Cloud v2

salt 2017.1 fix for Amazon Cloud v2

file_222943.txt (text/plain), 1.78 KB, created by Sven Ruediger on 2017-10-12 18:03:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sven Ruediger

Created: 2017-10-12 18:03:02 UTC

Size: 1.78 KB

patch

obsolete

>--- Makefile.orig       2017-10-12 07:07:22.917100000 +0200
>+++ Makefile    2017-10-12 19:59:06.257240000 +0200
>@@ -16,7 +16,6 @@
>
> RUN_DEPENDS=   ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
>                ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe \
>-               ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore \
>                ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud \
>                ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python \
>                ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \
>@@ -24,6 +23,7 @@
>                ${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado \
>                ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
>
>+
> USES=          cpe python:2.7+
> CPE_VENDOR=    saltstack
> CPE_PRODUCT=   salt
>@@ -55,9 +55,10 @@
>
> SUB_FILES=     pkg-message
>
>-OPTIONS_DEFINE=        RAET TCP ZEROMQ
>-OPTIONS_DEFAULT=ZEROMQ
>+OPTIONS_DEFINE= BOTO RAET TCP ZEROMQ
>+OPTIONS_DEFAULT= ZEROMQ
>
>+BOTO_DESC=     Install dependencies required for Amazon Cloud support
> RAET_DESC=     Install dependencies required for RAET transport
> TCP_DESC=      Install dependencies required for TCP transport
> ZEROMQ_DESC=   Install dependencies required for ZeroMQ transport
>@@ -66,6 +67,10 @@
>                        ${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo \
>                        ${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet
>
>+BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto \
>+               ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore\
>+               ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3\
>+
> TCP_RUN_DEPENDS=       ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto
>
> ZEROMQ_BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq

Actions: View

Attachments on bug 222943: 187092 | 187112