Index: head/sysutils/py-google-compute-engine/Makefile =================================================================== --- head/sysutils/py-google-compute-engine/Makefile (revision 477576) +++ head/sysutils/py-google-compute-engine/Makefile (revision 477577) @@ -1,44 +1,45 @@ # $FreeBSD$ PORTNAME= google-compute-engine DISTVERSION= 2.8.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= helen.koike@collabora.com COMMENT= Guest Environment for Google Compute Engine LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ google_oslogin_control:sysutils/google-compute-engine-oslogin \ sudo:security/sudo -USES= python +USES= python shebangfix USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes +SHEBANG_FILES= scripts/set_multiqueue scripts/optimize_local_ssd USE_RC_SUBR= google_instance_setup \ google_accounts_daemon \ google_clock_skew_daemon \ google_network_daemon \ google_startup SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" REINPLACE_ARGS= -i '' post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d ${STAGEDIR}/etc ${INSTALL_DATA} ${FILESDIR}/instance_configs.cfg.distro.sample \ ${STAGEDIR}${PREFIX}/etc/instance_configs.cfg.distro.sample ${INSTALL_DATA} ${FILESDIR}/90-google.conf.sample \ ${STAGEDIR}${PREFIX}/etc/syslog.d/90-google.conf.sample ${INSTALL_DATA} ${FILESDIR}/google_set_hostname \ ${STAGEDIR}/etc/dhclient-exit-hooks .include Index: head/sysutils/py-google-compute-engine/files/patch-setup.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-setup.py (revision 477576) +++ head/sysutils/py-google-compute-engine/files/patch-setup.py (nonexistent) @@ -1,10 +0,0 @@ ---- setup.py.orig 2018-06-11 23:51:09 UTC -+++ setup.py -@@ -34,7 +34,6 @@ setuptools.setup( - long_description='Google Compute Engine guest environment.', - name='google-compute-engine', - packages=setuptools.find_packages(), -- scripts=glob.glob('scripts/*'), - url='https://github.com/GoogleCloudPlatform/compute-image-packages', - version='2.8.3', - # Entry points create scripts in /usr/bin that call a function. Property changes on: head/sysutils/py-google-compute-engine/files/patch-setup.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__config.py =================================================================== --- head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__config.py (revision 477576) +++ head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__config.py (nonexistent) @@ -1,16 +0,0 @@ ---- google_compute_engine/instance_setup/instance_config.py.orig 2018-06-11 23:51:09 UTC -+++ google_compute_engine/instance_setup/instance_config.py -@@ -74,11 +74,11 @@ class InstanceConfig(config_manager.Conf - }, - 'InstanceSetup': { - 'host_key_types': 'ecdsa,ed25519,rsa', -- 'optimize_local_ssd': 'true', -+ 'optimize_local_ssd': 'false', - 'network_enabled': 'true', - 'set_boto_config': 'true', - 'set_host_keys': 'true', -- 'set_multiqueue': 'true', -+ 'set_multiqueue': 'false', - }, - 'IpForwarding': { - 'ethernet_proto_id': '66', Property changes on: head/sysutils/py-google-compute-engine/files/patch-google__compute__engine_instance__setup_instance__config.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample =================================================================== --- head/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample (revision 477576) +++ head/sysutils/py-google-compute-engine/files/instance_configs.cfg.distro.sample (revision 477577) @@ -1,8 +1,12 @@ [Accounts] useradd_cmd = pw useradd {user} -m userdel_cmd = pw userdel {user} -r usermod_cmd = pw usermod {user} -G {groups} groupadd_cmd = pw groupadd {group} [MetadataScripts] default_shell = /bin/sh + +[InstanceSetup] +set_multiqueue = false +optimize_local_ssd = false