Attachment 191713 Details for Bug 226830 – Fix salt bootstrap

[patch] Fix salt bootstrap

salt.diff (text/plain), 1.50 KB, created by Renato Botelho on 2018-03-21 17:43:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Renato Botelho

Created: 2018-03-21 17:43:01 UTC

Size: 1.50 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 465198)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	salt
> PORTVERSION=	2017.7.4
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>Index: files/patch-salt_cloud_deploy_bootstrap-salt.sh
>===================================================================
>--- files/patch-salt_cloud_deploy_bootstrap-salt.sh	(nonexistent)
>+++ files/patch-salt_cloud_deploy_bootstrap-salt.sh	(working copy)
>@@ -0,0 +1,14 @@
>+--- salt/cloud/deploy/bootstrap-salt.sh.orig	2018-03-21 17:37:20 UTC
>++++ salt/cloud/deploy/bootstrap-salt.sh
>+@@ -4885,9 +4885,9 @@ install_freebsd_9_stable_deps() {
>+         __configure_freebsd_pkg_details || return 1
>+     fi
>+ 
>+-    # Now install swig
>++    # Now install swig30
>+     # shellcheck disable=SC2086
>+-    /usr/local/sbin/pkg install ${FROM_FREEBSD} -y swig || return 1
>++    /usr/local/sbin/pkg install ${FROM_FREEBSD} -y swig30 || return 1
>+ 
>+     # YAML module is used for generating custom master/minion configs
>+     # shellcheck disable=SC2086
>
>Property changes on: files/patch-salt_cloud_deploy_bootstrap-salt.sh
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 226830: 191713