Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
commit
1d4bc143f1
GPG Key ID:
8B7F1DA0E2C9FDBB
|
|
@ -25,3 +25,9 @@
|
|||
/libstoragemgmt-1.6.0.tar.gz
|
||||
/libstoragemgmt-1.6.1.tar.gz
|
||||
/libstoragemgmt-1.6.2.tar.gz
|
||||
/libstoragemgmt-1.7.0.tar.gz
|
||||
/libstoragemgmt-1.7.1.tar.gz
|
||||
/libstoragemgmt-1.7.2.tar.gz
|
||||
/libstoragemgmt-1.7.3.tar.gz
|
||||
/libstoragemgmt-1.8.0.tar.gz
|
||||
/libstoragemgmt-1.8.2.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
diff --git a/packaging/daemon/libstoragemgmt.conf b/packaging/daemon/libstoragemgmt.conf
|
||||
index 1c118a9..cdb43c2 100644
|
||||
--- a/packaging/daemon/libstoragemgmt.conf
|
||||
+++ b/packaging/daemon/libstoragemgmt.conf
|
||||
@@ -1,2 +1,2 @@
|
||||
-D /var/run/lsm 0775 root libstoragemgmt -
|
||||
-D /var/run/lsm/ipc 0775 root libstoragemgmt -
|
||||
+D /run/lsm 0775 root libstoragemgmt -
|
||||
+D /run/lsm/ipc 0775 root libstoragemgmt -
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From 5715d7c495e4146700b3d1f0f3739b5e970ade68 Mon Sep 17 00:00:00 2001
|
||||
From: Gris Ge <fge@redhat.com>
|
||||
Date: Tue, 26 Jun 2018 01:46:39 +0800
|
||||
Subject: [PATCH] lsmcli: Fix required to run on python3.7
|
||||
|
||||
* Python 3.7 introduced new reserved keywords -- `async` which happened
|
||||
to be used in lsmcli. We change lsmcli to use `_async` instead.
|
||||
|
||||
Signed-off-by: Gris Ge <fge@redhat.com>
|
||||
---
|
||||
tools/lsmcli/cmdline.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tools/lsmcli/cmdline.py b/tools/lsmcli/cmdline.py
|
||||
index 664bf0d3..9a8324ad 100644
|
||||
--- a/tools/lsmcli/cmdline.py
|
||||
+++ b/tools/lsmcli/cmdline.py
|
||||
@@ -187,7 +187,7 @@ def _add_common_options(arg_parser, is_child=False):
|
||||
help='Include the header with terse')
|
||||
|
||||
arg_parser.add_argument(
|
||||
- '-b', action="store_true", dest="%sasync" % prefix, default=False,
|
||||
+ '-b', action="store_true", dest="%s_async" % prefix, default=False,
|
||||
help='Run the command async. Instead of waiting for completion.\n '
|
||||
'Command will exit(7) and job id written to stdout.')
|
||||
|
||||
@@ -1459,7 +1459,7 @@ def _wait_for_it(self, msg, job, item):
|
||||
else:
|
||||
# If a user doesn't want to wait, return the job id to stdout
|
||||
# and exit with job in progress
|
||||
- if self.args.async:
|
||||
+ if self.args._async:
|
||||
out(job)
|
||||
self.shutdown(ErrorNumber.JOB_STARTED)
|
||||
|
||||
--
|
||||
2.18.0
|
||||
|
||||
|
|
@ -2,23 +2,22 @@
|
|||
%global py2_build_dir %{_builddir}/%{name}-%{version}-%{release}-python2
|
||||
|
||||
%if 0%{?rhel} > 7 || 0%{?fedora} > 28
|
||||
%bcond_with python2
|
||||
%bcond_with python2
|
||||
%else
|
||||
%bcond_without python2
|
||||
%bcond_without python2
|
||||
%endif
|
||||
|
||||
Name: libstoragemgmt
|
||||
Version: 1.6.2
|
||||
Release: 8.0.riscv64%{?dist}
|
||||
Version: 1.8.2
|
||||
Release: 1.0.riscv64%{?dist}
|
||||
Summary: Storage array management library
|
||||
Group: System Environment/Libraries
|
||||
License: LGPLv2+
|
||||
URL: https://github.com/libstorage/libstoragemgmt
|
||||
Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz
|
||||
Patch1: 0001-lsmcli-Fix-required-to-run-on-python3.7.patch
|
||||
Patch1: 0001-change-run-dir.patch
|
||||
Requires: python3-%{name}
|
||||
BuildRequires: gcc gcc-c++
|
||||
BuildRequires: autoconf automake libtool yajl-devel libxml2-devel check-devel perl-interpreter
|
||||
BuildRequires: autoconf automake libtool libxml2-devel check-devel perl-interpreter
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: systemd
|
||||
|
|
@ -51,7 +50,6 @@ executing plug-ins in a separate process (lsmd).
|
|||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
|
|
@ -62,7 +60,6 @@ developing applications that use %{name}.
|
|||
%if %{with python2}
|
||||
%package -n python2-%{name}
|
||||
Summary: Python2 client libraries and plug-in support for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: python2-%{name}-clibs
|
||||
BuildArch: noarch
|
||||
|
|
@ -77,7 +74,6 @@ framework support and open source plug-ins written in python.
|
|||
|
||||
%package -n python2-%{name}-clibs
|
||||
Summary: Python2 C extension module for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%{?python_provide:%python_provide python2-%{name}-clibs}
|
||||
# Remove before F30
|
||||
|
|
@ -92,7 +88,6 @@ This package contains python2 client C extension libraries.
|
|||
|
||||
%package -n python3-%{name}
|
||||
Summary: Python 3 client libraries and plug-in support for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
Requires: python3-%{name}-clibs
|
||||
|
|
@ -104,7 +99,6 @@ support and open source plug-ins written in python 3.
|
|||
|
||||
%package -n python3-%{name}-clibs
|
||||
Summary: Python 3 C extension module for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%{?python_provide:%python_provide python3-%{name}-clibs}
|
||||
|
||||
|
|
@ -113,7 +107,6 @@ This package contains python 3 client C extension libraries.
|
|||
|
||||
%package smis-plugin
|
||||
Summary: Files for SMI-S generic array support for %{name}
|
||||
Group: System Environment/Libraries
|
||||
BuildRequires: python3-pywbem
|
||||
Requires: python3-pywbem
|
||||
%if %{with python2}
|
||||
|
|
@ -134,7 +127,6 @@ support.
|
|||
|
||||
%package netapp-plugin
|
||||
Summary: Files for NetApp array support for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: python3-%{name} = %{version}
|
||||
Requires(post): python3-%{name} = %{version}
|
||||
Requires(postun): python3-%{name} = %{version}
|
||||
|
|
@ -148,7 +140,6 @@ support.
|
|||
|
||||
%package targetd-plugin
|
||||
Summary: Files for targetd array support for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: python3-%{name} = %{version}
|
||||
Requires(post): python3-%{name} = %{version}
|
||||
Requires(postun): python3-%{name} = %{version}
|
||||
|
|
@ -161,7 +152,6 @@ support.
|
|||
|
||||
%package nstor-plugin
|
||||
Summary: Files for NexentaStor array support for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: python3-%{name} = %{version}
|
||||
Requires(post): python3-%{name} = %{version}
|
||||
Requires(postun): python3-%{name} = %{version}
|
||||
|
|
@ -173,7 +163,6 @@ support.
|
|||
|
||||
%package udev
|
||||
Summary: Udev files for %{name}
|
||||
Group: System Environment/Base
|
||||
|
||||
%description udev
|
||||
The %{name}-udev package contains udev rules and helper utilities for
|
||||
|
|
@ -181,7 +170,6 @@ uevents generated by the kernel.
|
|||
|
||||
%package megaraid-plugin
|
||||
Summary: Files for LSI MegaRAID support for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: python3-%{name} = %{version}
|
||||
Requires(post): python3-%{name} = %{version}
|
||||
Requires(postun): python3-%{name} = %{version}
|
||||
|
|
@ -193,7 +181,6 @@ MegaRAID storage management via storcli.
|
|||
|
||||
%package hpsa-plugin
|
||||
Summary: Files for HP SmartArray support for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: python3-%{name} = %{version}
|
||||
Requires(post): python3-%{name} = %{version}
|
||||
Requires(postun): python3-%{name} = %{version}
|
||||
|
|
@ -205,7 +192,6 @@ SmartArray storage management via hpssacli.
|
|||
|
||||
%package arcconf-plugin
|
||||
Summary: Files for Microsemi Adaptec and Smart Family support for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: python3-%{name} = %{version}
|
||||
Requires(post): python3-%{name} = %{version}
|
||||
Requires(postun): python3-%{name} = %{version}
|
||||
|
|
@ -217,9 +203,9 @@ Adaptec RAID and Smart Family Controller storage management.
|
|||
|
||||
%package nfs-plugin
|
||||
Summary: Files for NFS local filesystem support for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: python3-%{name} = %{version}
|
||||
Requires: %{name}-nfs-plugin-clibs = %{version}
|
||||
Requires: nfs-utils
|
||||
Requires(post): python3-%{name} = %{version}
|
||||
Requires(postun): python3-%{name} = %{version}
|
||||
BuildArch: noarch
|
||||
|
|
@ -229,26 +215,23 @@ The nfs-plugin package contains plug-in for local NFS exports support.
|
|||
|
||||
%package nfs-plugin-clibs
|
||||
Summary: Python C extension module for %{name} NFS plugin
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description nfs-plugin-clibs
|
||||
The %{name}-nfs-plugin-clibs package contains python C extension for %{name}
|
||||
NFS plugin.
|
||||
The %{name}-nfs-plugin-clibs package contains python C
|
||||
extension for %{name} NFS plugin.
|
||||
|
||||
|
||||
%package local-plugin
|
||||
Summary: Files for local pseudo plugin of %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: python3-%{name} = %{version}
|
||||
Requires(post): python3-%{name} = %{version}
|
||||
Requires(postun): python3-%{name} = %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description local-plugin
|
||||
The nfs-plugin package contains plug-in for local NFS exports support.
|
||||
LibstorageMgmt local plugin allows user to manage locally storage system
|
||||
without caring which real plugin(s) should be used.
|
||||
The %{name}-local-plugin is a plugin that provides auto
|
||||
plugin selection for locally managed storage.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
|
@ -469,8 +452,8 @@ fi
|
|||
|
||||
%{_unitdir}/%{name}.service
|
||||
|
||||
%ghost %dir %attr(0755, -, -) /run/lsm/
|
||||
%ghost %dir %attr(0755, -, -) /run/lsm/ipc
|
||||
%ghost %dir %attr(0775, root, libstoragemgmt) /run/lsm/
|
||||
%ghost %dir %attr(0775, root, libstoragemgmt) /run/lsm/ipc
|
||||
|
||||
%attr(0644, root, root) %{_tmpfilesdir}/%{name}.conf
|
||||
|
||||
|
|
@ -534,10 +517,10 @@ fi
|
|||
%{python3_sitelib}/lsm/lsmcli/data_display.*
|
||||
%{python3_sitelib}/lsm/lsmcli/cmdline.*
|
||||
%{_bindir}/sim_lsmplugin
|
||||
%dir %{_bindir}/lsm.d
|
||||
%{_bindir}/lsm.d/find_unused_lun.py
|
||||
%{_bindir}/lsm.d/local_sanity_check.py
|
||||
%{_sysconfdir}/lsm/pluginconf.d/sim.conf
|
||||
%dir %{_libexecdir}/lsm.d
|
||||
%{_libexecdir}/lsm.d/find_unused_lun.py*
|
||||
%{_libexecdir}/lsm.d/local_sanity_check.py*
|
||||
%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/sim.conf
|
||||
%{_mandir}/man1/sim_lsmplugin.1*
|
||||
|
||||
%files -n python3-%{name}-clibs
|
||||
|
|
@ -621,7 +604,7 @@ fi
|
|||
%{python3_sitelib}/lsm/plugin/nfs/__pycache__/*
|
||||
%{python3_sitelib}/lsm/plugin/nfs/__init__.*
|
||||
%{python3_sitelib}/lsm/plugin/nfs/nfs.*
|
||||
%{_sysconfdir}/lsm/pluginconf.d/nfs.conf
|
||||
%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/nfs.conf
|
||||
%{_bindir}/nfs_lsmplugin
|
||||
%{_mandir}/man1/nfs_lsmplugin.1*
|
||||
|
||||
|
|
@ -645,14 +628,50 @@ fi
|
|||
%{python3_sitelib}/lsm/plugin/local/__pycache__/*
|
||||
%{python3_sitelib}/lsm/plugin/local/__init__.*
|
||||
%{python3_sitelib}/lsm/plugin/local/local.*
|
||||
%{_sysconfdir}/lsm/pluginconf.d/local.conf
|
||||
%config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/local.conf
|
||||
%{_bindir}/local_lsmplugin
|
||||
%{_mandir}/man1/local_lsmplugin.1*
|
||||
|
||||
%changelog
|
||||
* Sun Aug 12 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1.6.2-8.0.riscv64
|
||||
* Mon Jan 20 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 1.8.2-1.0.riscv64
|
||||
- Use %{valgrind_arches} for valgrind BR
|
||||
|
||||
* Tue Dec 10 2019 Tony Asleson <tasleson@redhat.com> - 1.8.2-1
|
||||
- Upgrade to 1.8.2
|
||||
|
||||
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-4
|
||||
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
||||
|
||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1.8.0-3
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Wed Apr 17 2019 Tony Asleson <tasleson@redhat.com> - 1.8.0-1
|
||||
- Upgrade to 1.8.0
|
||||
|
||||
* Mon Feb 18 2019 Tony Asleson <tasleson@redhat.com> - 1.7.3-1
|
||||
- Upgrade to 1.7.3
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Dec 19 2018 Tony Asleson <tasleson@redhat.com> - 1.7.2-1
|
||||
- Upgrade to 1.7.2
|
||||
|
||||
* Tue Nov 6 2018 Tony Asleson <tasleson@redhat.com> - 1.7.1-1
|
||||
- Upgrade to 1.7.1
|
||||
|
||||
* Wed Oct 31 2018 Tony Asleson <tasleson@redhat.com> - 1.7.0-1
|
||||
- Upgrade to 1.7.0
|
||||
|
||||
* Tue Sep 18 2018 Gris Ge <fge@redhat.com> - 1.6.2-10
|
||||
- Add explicit package version requirement to libstoragemgmt-nfs-plugin-clibs.
|
||||
|
||||
* Mon Sep 17 2018 Gris Ge <fge@redhat.com> - 1.6.2-9
|
||||
- Fix the `rpm -V` failures. (RHBZ #1629735, the same issue also in Fedora)
|
||||
|
||||
* Tue Jul 24 2018 Adam Williamson <awilliam@redhat.com> - 1.6.2-8
|
||||
- Rebuild for new libconfig
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (libstoragemgmt-1.6.2.tar.gz) = 5ac20bf7c6e9ceb14634b8bebce0c3bb0655d6e7536859103938a269369a451e3e3234f0f4c91460ae273b3171d549842d9219edc8ec8dd83ef91d124cc95b73
|
||||
SHA512 (libstoragemgmt-1.8.2.tar.gz) = d6b8d0103f89783ad8cc7f78b642669cb896abe95cff27e8ae5b91872d5edb81a2e8886412ad32f0b716d17f50c8c1d286786949d5b136d71f320ad66cb0e6af
|
||||
|
|
|
|||
Loading…
Reference in New Issue