packages/netdata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!3 Fix netdata build error in next branch

Browse Source 
From: @bzg1107
Reviewed-by: @overweight
Signed-off-by: @overweight
This commit is contained in:
openeuler-ci-bot 2021-08-20 06:38:50 +00:00 committed by Gitee
commit 27b22c08a7
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
netdata-fix-python2-not-compatible-with-python3.patch
View File

@ -1,25 +1,30 @@
From 913bc3e605a85dae532394f1010f640175367ab4 Mon Sep 17 00:00:00 2001 From 6c8901a24505bbf3595c9a7e65117e63242e7ac7 Mon Sep 17 00:00:00 2001
From: baizg1107 <preloyalwhite@163.com> From: bzg1107 <preloyalwhite@163.com>
Date: Tue, 22 Jun 2021 19:25:16 +0800 Date: Thu, 19 Aug 2021 10:38:45 +0800
Subject: [PATCH] netdata fix python2 not compatible with python3 Subject: [PATCH] netdata fix python2 not compatible with python3
--- ---
collectors/python.d.plugin/Makefile.am | 2 +- collectors/python.d.plugin/python_modules/pyyaml3/__init__.py | 3 ++-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am diff --git a/collectors/python.d.plugin/python_modules/pyyaml3/__init__.py b/collectors/python.d.plugin/python_modules/pyyaml3/__init__.py
index ad72cfa..3686040 100644 index a884b33..0094c3f 100644
--- a/collectors/python.d.plugin/Makefile.am --- a/collectors/python.d.plugin/python_modules/pyyaml3/__init__.py
+++ b/collectors/python.d.plugin/Makefile.am +++ b/collectors/python.d.plugin/python_modules/pyyaml3/__init__.py
@@ -138,7 +138,7 @@ dist_third_party_DATA = \ @@ -282,11 +282,12 @@ class YAMLObjectMetaclass(type):
python_modules/third_party/monotonic.py \ cls.yaml_loader.add_constructor(cls.yaml_tag, cls.from_yaml)
$(NULL) cls.yaml_dumper.add_representer(cls, cls.to_yaml)
-class YAMLObject(metaclass=YAMLObjectMetaclass):
+class YAMLObject(object):
"""
An object that can dump itself to a YAML stream
and load itself from a YAML stream.
"""
+ __metaclass__ = YAMLObjectMetaclass
__slots__ = () # no direct instantiation, so allow immutable subclasses
-pythonyaml2dir=$(pythonmodulesdir)/pyyaml2
+pythonyaml2dir=$(pythonmodulesdir)/pyyaml3
dist_pythonyaml2_DATA = \
python_modules/pyyaml2/__init__.py \
python_modules/pyyaml2/composer.py \
-- --
2.27.0 2.27.0

7
netdata.spec
View File

@ -5,9 +5,9 @@
%global upver 1.16.0 %global upver 1.16.0
Name: netdata Name: netdata
Version: %{upver}%{?rcver:~%{rcver}} Version: %{upver}%{?rcver:~%{rcver}}
Release: 2 Release: 3
Summary: Real-time performance monitoring Summary: Real-time performance monitoring
License: GPLv3 and GPLv3+ and ASL 2.0 and CC-BY and MIT and WTFPL License: GPLv3 and GPLv3+ and ASL 2.0 and CC-BY-4.0 and MIT and WTFPL
URL: https://github.com/%{name}/%{name}/ URL: https://github.com/%{name}/%{name}/
Source0: https://github.com/%{name}/%{name}/archive/v%{upver}%{?rcver:-%{rcver}}/%{name}-%{upver}%{?rcver:-%{rcver}}.tar.gz Source0: https://github.com/%{name}/%{name}/archive/v%{upver}%{?rcver:-%{rcver}}/%{name}-%{upver}%{?rcver:-%{rcver}}.tar.gz
Source1: netdata.tmpfiles.conf Source1: netdata.tmpfiles.conf
@ -218,6 +218,9 @@ fi
%attr(4755,root,root) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin %attr(4755,root,root) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin
%changelog %changelog
* Thu Aug 19 2021 baizhonggui <baizhonggui@huawei.com> - 1.16.0 - 3
- Fix python2 and python3 syntax is incompatible
* Wed Aug 04 2021 sunguoshuai <sunguoshuai@huawei.com> - 1.16.0 - 2 * Wed Aug 04 2021 sunguoshuai <sunguoshuai@huawei.com> - 1.16.0 - 2
- Fix missing extern in some global variables - Fix missing extern in some global variables