Date: Mon, 13 May 2019 10:05:27 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501547 - in head/sysutils/py-google-compute-engine: . files Message-ID: <201905131005.x4DA5Rq2073717@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon May 13 10:05:26 2019 New Revision: 501547 URL: https://svnweb.freebsd.org/changeset/ports/501547 Log: sysutils/py-google-compute-engine: fix daemons in python 2.7 case PR: 237845 Reviewed by: koobs Approved by: implicit (portmgr, python, jfi blanket) MFH: 2019Q2 Modified: head/sysutils/py-google-compute-engine/Makefile (contents, props changed) head/sysutils/py-google-compute-engine/files/google_accounts_daemon.in head/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in head/sysutils/py-google-compute-engine/files/google_instance_setup.in head/sysutils/py-google-compute-engine/files/google_network_daemon.in head/sysutils/py-google-compute-engine/files/google_startup.in Modified: head/sysutils/py-google-compute-engine/Makefile ============================================================================== --- head/sysutils/py-google-compute-engine/Makefile Mon May 13 09:55:23 2019 (r501546) +++ head/sysutils/py-google-compute-engine/Makefile Mon May 13 10:05:26 2019 (r501547) @@ -2,7 +2,7 @@ PORTNAME= google-compute-engine DISTVERSION= 2.8.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -25,24 +25,22 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}distro>0:sysutils USES= python shebangfix USE_PYTHON= autoplist concurrent distutils -WRKSRC_SUBDIR= packages/python-google-compute-engine +WRKSRC_SUBDIR= packages/python-google-compute-engine NO_ARCH= yes -SHEBANG_FILES= ../google-compute-engine/src/usr/bin/google_set_multiqueue \ - ../google-compute-engine/src/usr/bin/google_optimize_local_ssd +SHEBANG_FILES= ../google-compute-engine/src/usr/bin/google_optimize_local_ssd \ + ../google-compute-engine/src/usr/bin/google_set_multiqueue USE_GITHUB= yes GH_ACCOUNT= GoogleCloudPlatform GH_PROJECT= compute-image-packages GH_TAGNAME= 20190416 -USE_RC_SUBR= google_instance_setup \ - google_accounts_daemon \ - google_clock_skew_daemon \ - google_network_daemon \ - google_startup +USE_RC_SUBR= google_accounts_daemon google_clock_skew_daemon \ + google_instance_setup google_network_daemon google_startup -SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" +SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" \ + PYTHON_VER="${PYTHON_VER}" REINPLACE_ARGS= -i '' post-install: Modified: head/sysutils/py-google-compute-engine/files/google_accounts_daemon.in ============================================================================== --- head/sysutils/py-google-compute-engine/files/google_accounts_daemon.in Mon May 13 09:55:23 2019 (r501546) +++ head/sysutils/py-google-compute-engine/files/google_accounts_daemon.in Mon May 13 10:05:26 2019 (r501547) @@ -24,7 +24,7 @@ load_rc_config "${name}" : ${google_accounts_daemon_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/${name} +command=%%PREFIX%%/bin/${name}-%%PYTHON_VER%% pidfile=/var/run/${name}.pid start_cmd="google_accounts_daemon_start" Modified: head/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in ============================================================================== --- head/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in Mon May 13 09:55:23 2019 (r501546) +++ head/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in Mon May 13 10:05:26 2019 (r501547) @@ -21,7 +21,7 @@ load_rc_config "${name}" : ${google_clock_skew_daemon_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/${name} +command=%%PREFIX%%/bin/${name}-%%PYTHON_VER%% pidfile=/var/run/${name}.pid start_cmd="google_clock_skew_daemon_start" Modified: head/sysutils/py-google-compute-engine/files/google_instance_setup.in ============================================================================== --- head/sysutils/py-google-compute-engine/files/google_instance_setup.in Mon May 13 09:55:23 2019 (r501546) +++ head/sysutils/py-google-compute-engine/files/google_instance_setup.in Mon May 13 10:05:26 2019 (r501547) @@ -21,7 +21,7 @@ load_rc_config "${name}" : ${google_instance_setup_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/${name} +command=%%PREFIX%%/bin/${name}-%%PYTHON_VER%% pidfile=/var/run/${name}.pid run_rc_command "$1" Modified: head/sysutils/py-google-compute-engine/files/google_network_daemon.in ============================================================================== --- head/sysutils/py-google-compute-engine/files/google_network_daemon.in Mon May 13 09:55:23 2019 (r501546) +++ head/sysutils/py-google-compute-engine/files/google_network_daemon.in Mon May 13 10:05:26 2019 (r501547) @@ -21,7 +21,7 @@ load_rc_config "${name}" : ${google_network_daemon_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/${name} +command=%%PREFIX%%/bin/${name}-%%PYTHON_VER%% pidfile=/var/run/${name}.pid start_cmd="google_network_daemon_start" Modified: head/sysutils/py-google-compute-engine/files/google_startup.in ============================================================================== --- head/sysutils/py-google-compute-engine/files/google_startup.in Mon May 13 09:55:23 2019 (r501546) +++ head/sysutils/py-google-compute-engine/files/google_startup.in Mon May 13 10:05:26 2019 (r501547) @@ -24,7 +24,7 @@ load_rc_config "${name}" : ${google_startup_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/google_metadata_script_runner +command=%%PREFIX%%/bin/google_metadata_script_runner-%%PYTHON_VER%% command_startup_args="--script-type startup" command_shutdown_args="--script-type shutdown" pidfile=/var/run/${name}.pid
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905131005.x4DA5Rq2073717>