diff options
author | Michael Gmelin <grembo@FreeBSD.org> | 2019-09-19 00:21:10 +0000 |
---|---|---|
committer | Michael Gmelin <grembo@FreeBSD.org> | 2019-09-19 00:21:10 +0000 |
commit | c1e72908154f8d12c7136ce05ab5199ab898eee7 (patch) | |
tree | b05594c5c722f82a5dfe4ab59aae1e182e1f3a4f /sysutils/iocage/files/patch-setup.py | |
parent | sysutils/qdirstat: fix DOCS plist (diff) |
Fix `iocage upgrade' for 11.3-RELEASE and upcoming 12.1-RELEASE[0]
Also:
- Fix dependencies when upgrading <12 jails running on a 12-RELEASE jailhost
(depend on `merge' from devel/rcs57).
- Fix to unbreak updating multiple jails at once[1].
- Patch to `setup.py' to make `make check-plist' pass[2].
- Move `NO_ARCH' to make portlint happy
See:
[0]https://github.com/iocage/iocage/pull/1027 and
https://github.com/iocage/iocage/commit/f66d9f0724daa03dc08cebc3f30b04abc7e97f82
[1]https://github.com/iocage/iocage/commit/47d7c28ad2db76eaba797921555bbf68a476eb9b#diff-134cbca4d064a61a693d1199494d24df
[2]https://github.com/iocage/iocage/issues/1043
PR: 240177
Approved by: araujo (maintainer timeout)
Notes
Notes:
svn path=/head/; revision=512299
Diffstat (limited to 'sysutils/iocage/files/patch-setup.py')
-rw-r--r-- | sysutils/iocage/files/patch-setup.py | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/sysutils/iocage/files/patch-setup.py b/sysutils/iocage/files/patch-setup.py new file mode 100644 index 000000000000..aa06e3c7fd98 --- /dev/null +++ b/sysutils/iocage/files/patch-setup.py @@ -0,0 +1,50 @@ +See https://github.com/iocage/iocage/issues/1043 +--- setup.py.orig 2019-01-25 21:32:55 UTC ++++ setup.py +@@ -43,26 +43,26 @@ if sys.version_info < (3, 6): + + VERSION = '1.1' + +-setup( +- name='iocage_lib', +- version=VERSION, +- description='A jail manager that uses ZFS.', +- author='iocage Contributors', +- author_email='https://groups.google.com/forum/#!forum/iocage', +- url='https://github.com/iocage/iocage', +- packages=find_packages(), +- include_package_data=True, +- install_requires=[ +- 'dulwich>=0.18.6', +- 'netifaces>=0.10.8', +- 'dnspython>=1.15.0', +- 'libzfs' +- ], +- setup_requires=['pytest-runner'], +- entry_points={'console_scripts': ['iocage = iocage_lib:cli']}, +- data_files=_data, +- tests_require=['pytest', 'pytest-cov', 'pytest-pep8'] +-) ++#setup( ++# name='iocage_lib', ++# version=VERSION, ++# description='A jail manager that uses ZFS.', ++# author='iocage Contributors', ++# author_email='https://groups.google.com/forum/#!forum/iocage', ++# url='https://github.com/iocage/iocage', ++# packages=find_packages(), ++# include_package_data=True, ++# install_requires=[ ++# 'dulwich>=0.18.6', ++# 'netifaces>=0.10.8', ++# 'dnspython>=1.15.0', ++# 'libzfs' ++# ], ++# setup_requires=['pytest-runner'], ++# entry_points={'console_scripts': ['iocage = iocage_lib:cli']}, ++# data_files=_data, ++# tests_require=['pytest', 'pytest-cov', 'pytest-pep8'] ++#) + + setup( + name='iocage_cli', |