.gear/rules | 2 + .../tags/64163728cd60d6c6bbb2b71ff6b565f04f768bb7 | 6 ++ .gear/tags/list | 1 + bin/vcmmd | 2 +- bin/vcmmdctl | 2 +- setup.py | 4 +- vcmmd.spec | 102 +++++++++++++++++++++ vcmmd/config.py | 1 + 8 files changed, 116 insertions(+), 4 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..26340af --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: v@version@:. +diff: v@version@:. . name=@name@-@version@.patch diff --git a/.gear/tags/64163728cd60d6c6bbb2b71ff6b565f04f768bb7 b/.gear/tags/64163728cd60d6c6bbb2b71ff6b565f04f768bb7 new file mode 100644 index 0000000..7a405fb --- /dev/null +++ b/.gear/tags/64163728cd60d6c6bbb2b71ff6b565f04f768bb7 @@ -0,0 +1,6 @@ +object d84db6d17fa43f16470cc5e2f19769405d35ad7e +type commit +tag v8.0.71 +tagger Apache 1669392126 +0300 + +AUTO v8.0.71 tag diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..55b67ee --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +64163728cd60d6c6bbb2b71ff6b565f04f768bb7 v8.0.71 diff --git a/bin/vcmmd b/bin/vcmmd index 67762b3..b4c7fae 100755 --- a/bin/vcmmd +++ b/bin/vcmmd @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 from vcmmd.main import main main() diff --git a/bin/vcmmdctl b/bin/vcmmdctl index d2775ec..bbe8ae2 100755 --- a/bin/vcmmdctl +++ b/bin/vcmmdctl @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 from vcmmd.cli import main main() diff --git a/setup.py b/setup.py index 62a93d4..c4ccdb6 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ with open('Makefile.version') as f: f.close() servicefile = 'vcmmd.service' -systemd_unitdir = '/usr/lib/systemd/system' +systemd_unitdir = '/lib/systemd/system' systemd_unit = systemd_unitdir + "/" + servicefile setup(name='vcmmd', @@ -29,7 +29,7 @@ setup(name='vcmmd', data_files=[('/etc/dbus-1/system.d', ['dbus/com.virtuozzo.vcmmd.conf']), ('/etc/logrotate.d', ['logrotate/vcmmd']), ('/etc/vz', ['vcmmd.conf', 'vstorage-limits.conf']), - ('/etc/tmpfiles.d/', ['vcmmd-tmpfiles.conf']), + ('/lib/tmpfiles.d/', ['vcmmd-tmpfiles.conf']), (systemd_unitdir, ['systemd/{}'.format(servicefile)])], scripts=['bin/vcmmd', 'bin/vcmmdctl']) diff --git a/vcmmd.spec b/vcmmd.spec new file mode 100644 index 0000000..a7e62ef --- /dev/null +++ b/vcmmd.spec @@ -0,0 +1,102 @@ +%def_with check + +Name: vcmmd +Version: 8.0.71 +Release: alt1 + +Summary: Virtuozzo containers memory management daemon +License: GPL-2.0-or-later +Group: System/Configuration/Other + +URL: https://src.openvz.org/ +Vcs: https://src.openvz.org/scm/ovz/vcmmd.git + +Source: %name-%version.tar +Patch: %name-%version.patch + +ExclusiveArch: x86_64 + +BuildRequires(pre): rpm-build-python3 +BuildRequires: python3-devel python3-module-setuptools +BuildRequires: lib%name +BuildRequires: systemd +BuildRequires: gcc-c++ + +%if_with check +BuildRequires: /proc +BuildRequires: python3-module-mock python3-module-pytest python3-module-psutil +%endif + +%description +Virtuozzo containers memory management daemon + +%prep +%setup -n %name-%version +%patch -p1 + +%build +%__python3 setup.py build --executable="/usr/bin/python3" + +%install +# Local setup.py fails to parse "--root=path" option, only "--root path" variant: +%__python3 setup.py install --skip-build --root %buildroot --install-scripts %_sbindir +mv %buildroot/usr/lib %buildroot/usr/lib64 +mkdir %buildroot%_sysconfdir/vz/vcmmd.d/ + +%if_with check +%check +export PYTHONPATH=%buildroot%python3_sitelibdir +pushd tests +%__python3 test_util_misc.py +popd +%endif + +%files +%doc COPYING +%_sbindir/* +%python3_sitelibdir/* +%_unitdir/%name.service +%_sysconfdir/vz/vcmmd.d/ +%config(noreplace) %_sysconfdir/dbus-1/system.d/com.virtuozzo.vcmmd.conf +%config(noreplace) %_sysconfdir/vz/*.conf +%config(noreplace) %_sysconfdir/logrotate.d/* +%config %_tmpfilesdir/vcmmd-tmpfiles.conf + +%changelog +* Thu Dec 08 2022 Andrew A. Vasilyev 8.0.71-alt1 +- 8.0.71 +- change license + +* Wed Oct 26 2022 Andrew A. Vasilyev 8.0.68-alt1 +- 8.0.68 + +* Fri Mar 19 2021 Andrew A. Vasilyev 8.0.5-alt1 +- 8.0.5 + +* Wed Mar 10 2021 Andrew A. Vasilyev 8.0.3-alt1 +- 8.0.3 + +* Mon Sep 28 2020 Andrew A. Vasilyev 8.0.1-alt4 +- merge dist-vz7-u15 branch + +* Mon Aug 10 2020 Andrew A. Vasilyev 8.0.1-alt3 +- reduce difference with upstream branch dist-vz7-u15 +- add %%check in spec file + +* Sat May 23 2020 Andrew A. Vasilyev 8.0.1-alt2 +- update copyright information (cherry-pick 34deb3f7) + +* Wed Feb 05 2020 Andrew A. Vasilyev 8.0.1-alt1 +- merge from 8.0.1 + +* Mon Nov 11 2019 Andrew A. Vasilyev 7.0.165-alt4 +- cleanup spec + +* Mon Nov 11 2019 Andrew A. Vasilyev 7.0.165-alt3 +- change /var/run to /run + +* Thu Oct 31 2019 Andrew A. Vasilyev 7.0.165-alt2 +- convert to python3 + +* Mon Sep 16 2019 Andrew A. Vasilyev 7.0.165-alt1 +- initial import for ALT diff --git a/vcmmd/config.py b/vcmmd/config.py index aeff76c..8770934 100644 --- a/vcmmd/config.py +++ b/vcmmd/config.py @@ -19,6 +19,7 @@ # Our contact details: Virtuozzo International GmbH, Vordergasse 59, 8200 # Schaffhausen, Switzerland. +import collections import json import logging import os