Compare commits

..

No commits in common. "07ec2977415e5f9f601bb2b894736874e8c7e68d" and "5c2e2ef0950302c99bbaf664f5645e520002f0be" have entirely different histories.

3 changed files with 42 additions and 174 deletions

2
.gitignore vendored
View File

@ -1,3 +1 @@
/sid-0.0.4.tar.gz /sid-0.0.4.tar.gz
/sid-0.0.5.tar.gz
/sid-0.0.6.tar.gz

212
sid.spec
View File

@ -3,11 +3,7 @@
%{?commit:%global commitdate 20200828} %{?commit:%global commitdate 20200828}
%{?commit:%global scmsnap %{commitdate}git%{shortcommit}} %{?commit:%global scmsnap %{commitdate}git%{shortcommit}}
%global enable_mod_dummies 1 %global enable_dm_mpath_support 1
%global enable_mod_block_blkid 1
%global enable_mod_block_dm_mpath 1
%global enable_mod_type_dm 1
%global enable_mod_type_dm__lvm 1
############################################################################## ##############################################################################
# SID # SID
@ -17,11 +13,11 @@ Name: sid
%if 0%{?rhel} %if 0%{?rhel}
Epoch: %{rhel} Epoch: %{rhel}
%endif %endif
Version: 0.0.6 Version: 0.0.5
Release: 1%{?scmsnap:.%{scmsnap}}%{?dist} Release: 1%{?scmsnap:.%{scmsnap}}%{?dist}
Summary: Storage Instantiation Daemon (SID) Summary: Storage Instantiation Daemon (SID)
License: GPL-2.0-or-later License: GPLv2+
URL: http://sid-project.github.io URL: http://sid-project.github.io
%if %{defined commit} %if %{defined commit}
Source0: https://github.com/sid-project/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Source0: https://github.com/sid-project/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
@ -32,22 +28,22 @@ Source0: https://github.com/sid-project/%{name}/archive/v%{version}/%{name}-%{ve
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: gperf BuildRequires: gperf
BuildRequires: libtool
BuildRequires: multilib-rpm-config
BuildRequires: gcc BuildRequires: gcc
BuildRequires: libtool
BuildRequires: make
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: systemd-devel >= 221 BuildRequires: systemd-devel >= 221
BuildRequires: libudev-devel >= 174 BuildRequires: libudev-devel >= 174
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
%if %{enable_mod_block_blkid}
BuildRequires: libblkid-devel BuildRequires: libblkid-devel
%endif %if %{enable_dm_mpath_support}
%if %{enable_mod_block_dm_mpath}
BuildRequires: device-mapper-multipath-devel >= 0.8.4-7 BuildRequires: device-mapper-multipath-devel >= 0.8.4-7
%endif %endif
Requires: systemd Requires: systemd
Requires: systemd-udev Requires: systemd-udev
Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-tools = %{?epoch}:%{version}-%{release} Requires: %{name}-tools = %{?epoch}:%{version}-%{release}
@ -66,40 +62,13 @@ of devices and their layers in the stack.
%autosetup -p1 -n sid-%{version} %autosetup -p1 -n sid-%{version}
%endif %endif
%if %{enable_mod_block_blkid} %if ! %{enable_dm_mpath_support}
%global configure_mod_block_blkid --enable-mod-block-blkid %global configure_dm_mpath --disable-mod-dm_mpath
%else
%global configure_mod_block_dm_mpath --disable-mod-block-blkid
%endif
%if %{enable_mod_block_dm_mpath}
%global configure_mod_block_dm_mpath --enable-mod-block-dm_mpath
%else
%global configure_mod_block_dm_mpath --disable-mod-block-dm_mpath
%endif
%if %{enable_mod_type_dm}
%global configure_mod_type_dm --enable-mod-type-dm
%else
%global configure_mod_type_dm --disable-mod-type-dm
%endif
%if %{enable_mod_type_dm__lvm}
%global configure_mod_type_dm__lvm --enable-mod-type-dm-lvm
%else
%global configure_mod_type_dm__lvm --disable-mod-type-dm-lvm
%endif
%if %{enable_mod_dummies}
%global configure_mod_dummies --enable-mod-block-dummy --enable-mod-type-dummy
%else
%global configure_mod_dummies --disable-mod-block-dummy --disable-mod-type-dummy
%endif %endif
%build %build
autoreconf -ivf ./autogen.sh
%configure %{?configure_mod_block_blkid} %{?configure_mod_block_dm_mpath} %{?configure_mod_type_dm} %{?configure_mod_type_dm__lvm} %{?configure_mod_dummies} %configure %{?configure_dm_mpath}
%make_build %make_build
%install %install
@ -107,10 +76,9 @@ make DESTDIR=%{buildroot} install
rm -f %{buildroot}/%{_libdir}/sid/*.{a,la} rm -f %{buildroot}/%{_libdir}/sid/*.{a,la}
rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/block/*.{a,la} rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/block/*.{a,la}
rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/*.{a,la} rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/*.{a,la}
rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/dm/*.{a,la}
%files %files
%license COPYING BSD_LICENSE %license COPYING
%{_sbindir}/sid %{_sbindir}/sid
%config(noreplace) %{_sysconfdir}/sysconfig/sid.sysconfig %config(noreplace) %{_sysconfdir}/sysconfig/sid.sysconfig
%{_udevrulesdir}/00-sid.rules %{_udevrulesdir}/00-sid.rules
@ -134,12 +102,12 @@ rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/dm/*.{a,la}
%package base-libs %package base-libs
Summary: Libraries for Storage Instantiation Daemon (SID) base Summary: Libraries for Storage Instantiation Daemon (SID) base
License: GPL-2.0-or-later AND BSD-3-Clause License: GPLv2+
%description base-libs %description base-libs
This package contains shared libraries with low-level functionality needed for This package contains shared libraries with low-level functionality needed for
Storage Instantiation Daemon (SID), its modules and related tools. Currently, Storage Instantiation Daemon (SID), its modules and related tools. Currently,
it contains basic support for buffering, IPC, base64 encoding and other helper it contains basic support for bitmaps, buffering, IPC, hashing, lists, memory
functions. handling and other helper functions.
%files base-libs %files base-libs
%dir %{_libdir}/sid %dir %{_libdir}/sid
@ -153,7 +121,7 @@ functions.
%package base-libs-devel %package base-libs-devel
Summary: Development files for Storage Instantiation Daemon (SID) base Summary: Development files for Storage Instantiation Daemon (SID) base
License: GPL-2.0-or-later AND BSD-3-Clause License: GPLv2+
Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release}
%description base-libs-devel %description base-libs-devel
This package contains development files for Storage Instantiation Daemon (SID) This package contains development files for Storage Instantiation Daemon (SID)
@ -163,67 +131,26 @@ base libraries.
%dir %{_libdir}/sid %dir %{_libdir}/sid
%{_libdir}/sid/libsidbase.so %{_libdir}/sid/libsidbase.so
%dir %{_includedir}/sid %dir %{_includedir}/sid
%{_includedir}/sid/config.h
%dir %{_includedir}/sid/base %dir %{_includedir}/sid/base
%{_includedir}/sid/base/binary.h %{_includedir}/sid/base/bitmap.h
%{_includedir}/sid/base/buffer-common.h %{_includedir}/sid/base/buffer-common.h
%{_includedir}/sid/base/buffer-type.h
%{_includedir}/sid/base/buffer.h %{_includedir}/sid/base/buffer.h
%{_includedir}/sid/base/common.h
%{_includedir}/sid/base/comms.h %{_includedir}/sid/base/comms.h
%{_includedir}/sid/base/list.h
%{_includedir}/sid/base/mem.h
%{_includedir}/sid/base/util.h %{_includedir}/sid/base/util.h
%doc README.md %doc README.md
##############################################################################
# SID-INTERNAL-LIBS
##############################################################################
%package internal-libs
Summary: Development files for Storage Instantiation Daemon (SID) internal
License: GPL-2.0-or-later AND BSD-3-Clause
Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release}
%description internal-libs
This package contains shared libraries with low-level functionality needed for
Storage Instantiation Daemon (SID) and its modules. Currently, it contains
basic support for bitmaps, hashing, lists, memory handling and other helper
functions.
%files internal-libs
%dir %{_libdir}/sid
%{_libdir}/sid/libsidinternal.so.*
%doc README.md
##############################################################################
# SID-INTERNAL-LIBS-DEVEL
##############################################################################
%package internal-libs-devel
Summary: Development files for Storage Instantiation Daemon (SID) internal
License: GPL-2.0-or-later AND BSD-3-Clause
%description internal-libs-devel
This package contains development files for Storage Instantiation Daemon (SID)
internal libraries.
%files internal-libs-devel
%dir %{_includedir}/sid/internal
%{_includedir}/sid/internal/bitmap.h
%{_includedir}/sid/internal/bptree.h
%{_includedir}/sid/internal/common.h
%{_includedir}/sid/internal/comp-attrs.h
%{_includedir}/sid/internal/formatter.h
%{_includedir}/sid/internal/hash.h
%{_includedir}/sid/internal/list.h
%{_includedir}/sid/internal/mem.h
%{_includedir}/sid/internal/util.h
%{_libdir}/sid/libsidinternal.so
############################################################################## ##############################################################################
# SID-LOG-LIBS # SID-LOG-LIBS
############################################################################## ##############################################################################
%package log-libs %package log-libs
Summary: Libraries for Storage Instantiation Daemon (SID) logging Summary: Libraries for Storage Instantiation Daemon (SID) logging
License: GPL-2.0-or-later License: GPLv2+
%description log-libs %description log-libs
This package contains shared libraries with logging support needed for Storage This package contains shared libraries with logging support needed for Storage
Instantiation daemon (SID), its modules and related tools. Instantiation daemon (SID), its modules and related tools.
@ -240,7 +167,7 @@ Instantiation daemon (SID), its modules and related tools.
%package log-libs-devel %package log-libs-devel
Summary: Development files for Storage Instantiation Daemon (SID) logging Summary: Development files for Storage Instantiation Daemon (SID) logging
License: GPL-2.0-or-later License: GPLv2+
Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
%description log-libs-devel %description log-libs-devel
This package contains development files for Storage Instantiation Daemon (SID) This package contains development files for Storage Instantiation Daemon (SID)
@ -261,9 +188,8 @@ logging libraries.
%package iface-libs %package iface-libs
Summary: Libraries for Storage Instantiation Daemon (SID) interfaces Summary: Libraries for Storage Instantiation Daemon (SID) interfaces
License: GPL-2.0-or-later License: GPLv2+
Requires: %{name}-internal-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
%description iface-libs %description iface-libs
This package contains shared libraries to support interfaces used in Storage This package contains shared libraries to support interfaces used in Storage
Instantiation Daemon (SID), its modules and related tools. Instantiation Daemon (SID), its modules and related tools.
@ -271,7 +197,7 @@ Instantiation Daemon (SID), its modules and related tools.
%files iface-libs %files iface-libs
%dir %{_libdir}/sid %dir %{_libdir}/sid
%{_libdir}/sid/libsidiface_servicelink.so.* %{_libdir}/sid/libsidiface_servicelink.so.*
%{_libdir}/sid/libsidiface.so.* %{_libdir}/sid/libsidiface_usid.so.*
%doc README.md %doc README.md
@ -281,7 +207,7 @@ Instantiation Daemon (SID), its modules and related tools.
%package iface-libs-devel %package iface-libs-devel
Summary: Development files for Storage Instantiation Daemon (SID) interfaces Summary: Development files for Storage Instantiation Daemon (SID) interfaces
License: GPL-2.0-or-later License: GPLv2+
Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release}
%description iface-libs-devel %description iface-libs-devel
This package contains development files for Storage Instantiation Daemon (SID) This package contains development files for Storage Instantiation Daemon (SID)
@ -290,12 +216,11 @@ interface libraries.
%files iface-libs-devel %files iface-libs-devel
%dir %{_libdir}/sid %dir %{_libdir}/sid
%{_libdir}/sid/libsidiface_servicelink.so %{_libdir}/sid/libsidiface_servicelink.so
%{_libdir}/sid/libsidiface.so %{_libdir}/sid/libsidiface_usid.so
%dir %{_includedir}/sid %dir %{_includedir}/sid
%dir %{_includedir}/sid/iface %dir %{_includedir}/sid/iface
%{_includedir}/sid/iface/service-link.h %{_includedir}/sid/iface/service-link.h
%{_includedir}/sid/iface/iface.h %{_includedir}/sid/iface/usid.h
%{_includedir}/sid/iface/iface_internal.h
%doc README.md %doc README.md
@ -305,8 +230,9 @@ interface libraries.
%package resource-libs %package resource-libs
Summary: Libraries for Storage Instantiation Daemon (SID) resources Summary: Libraries for Storage Instantiation Daemon (SID) resources
License: GPL-2.0-or-later License: GPLv2+
Requires: %{name}-internal-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release}
# Systemd supports event loop since v221 # Systemd supports event loop since v221
Requires: systemd-libs >= 221 Requires: systemd-libs >= 221
@ -329,7 +255,7 @@ control, bridging SID core and udev and creating an instance of SID as a whole.
%package resource-libs-devel %package resource-libs-devel
Summary: Development files for Storage Instantiation Daemon (SID) resources Summary: Development files for Storage Instantiation Daemon (SID) resources
License: GPL-2.0-or-later License: GPLv2+
Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
%description resource-libs-devel %description resource-libs-devel
This package contains development files for Storage Instantiation Daemon (SID) This package contains development files for Storage Instantiation Daemon (SID)
@ -346,7 +272,6 @@ resource libraries.
%{_includedir}/sid/resource/resource-type-regs.h %{_includedir}/sid/resource/resource-type-regs.h
%{_includedir}/sid/resource/resource.h %{_includedir}/sid/resource/resource.h
%{_includedir}/sid/resource/ucmd-module.h %{_includedir}/sid/resource/ucmd-module.h
%{_includedir}/sid/resource/ubridge.h
%{_includedir}/sid/resource/worker-control.h %{_includedir}/sid/resource/worker-control.h
%doc README.md %doc README.md
@ -357,6 +282,8 @@ resource libraries.
%package tools %package tools
Summary: Storage Instantiation Daemon (SID) supporting tools Summary: Storage Instantiation Daemon (SID) supporting tools
Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: systemd-udev Requires: systemd-udev
%description tools %description tools
@ -372,11 +299,9 @@ This package contains tools to support Storage Instantiation Daemon (SID).
############################################################################## ##############################################################################
# SID-MOD-DUMMIES # SID-MOD-DUMMIES
############################################################################## ##############################################################################
%if %{enable_mod_dummies}
%package mod-dummies %package mod-dummies
Summary: Dummy block and type module for Storage Instantiation Daemon (SID) Summary: Dummy block and type module for Storage Instantiation Daemon (SID)
Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
%description mod-dummies %description mod-dummies
This package contains dummy block and type modules for Storage Instantiation This package contains dummy block and type modules for Storage Instantiation
@ -393,17 +318,14 @@ execution.
%{_libdir}/sid/modules/ucmd/type/dummy_type.so %{_libdir}/sid/modules/ucmd/type/dummy_type.so
%doc README.md %doc README.md
%endif
############################################################################## ##############################################################################
# SID-MOD-BLOCK-BLKID # SID-MOD-BLOCK-BLKID
############################################################################## ##############################################################################
%if %{enable_mod_block_blkid}
%package mod-block-blkid %package mod-block-blkid
Summary: Blkid block module for Storage Instantiation Daemon (SID) Summary: Blkid block module for Storage Instantiation Daemon (SID)
Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
%description mod-block-blkid %description mod-block-blkid
This package contains blkid block module for Storage Instantiation Daemon (SID). This package contains blkid block module for Storage Instantiation Daemon (SID).
@ -416,17 +338,16 @@ This package contains blkid block module for Storage Instantiation Daemon (SID).
%{_libdir}/sid/modules/ucmd/block/blkid.so %{_libdir}/sid/modules/ucmd/block/blkid.so
%doc README.md %doc README.md
%endif
############################################################################## ##############################################################################
# SID-MOD-BLOCK-DM_MPATH # SID-MOD-BLOCK-DM_MPATH
############################################################################## ##############################################################################
%if %{enable_mod_block_dm_mpath} %if %{enable_dm_mpath_support}
%package mod-block-dm-mpath %package mod-block-dm-mpath
Summary: Device-mapper multipath block module for Storage Instantiation Daemon (SID) Summary: Device-mapper multipath block module for Storage Instantiation Daemon (SID)
Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: device-mapper-multipath-libs >= 0.8.4-7 Requires: device-mapper-multipath-libs >= 0.8.4-7
%description mod-block-dm-mpath %description mod-block-dm-mpath
@ -448,10 +369,9 @@ Instantiation Daemon (SID).
# SID-MOD-TYPE-DM # SID-MOD-TYPE-DM
############################################################################## ##############################################################################
%if %{enable_mod_type_dm}
%package mod-type-dm %package mod-type-dm
Summary: Device-mapper type module for Storage Instantiation Daemon (SID) Summary: Device-mapper type module for Storage Instantiation Daemon (SID)
Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
%description mod-type-dm %description mod-type-dm
This package contains device-mapper type module for Storage Instantiation This package contains device-mapper type module for Storage Instantiation
@ -466,58 +386,8 @@ Daemon (SID).
%{_libdir}/sid/modules/ucmd/type/dm.so %{_libdir}/sid/modules/ucmd/type/dm.so
%doc README.md %doc README.md
%endif
##############################################################################
# SID-MOD-TYPE-DM-LVM
##############################################################################
%if %{enable_mod_type_dm__lvm}
%package mod-type-dm-lvm
Summary: LVM type module for Storage Instantiation Daemon (SID)
Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-mod-type-dm%{?_isa} = %{?epoch}:%{version}-%{release}
%description mod-type-dm-lvm
This package contains LVM type module for Storage Instantiation
Daemon (SID).
%files mod-type-dm-lvm
%{_libdir}/sid/modules/ucmd/type/dm/lvm.so
%doc README.md
%endif
%changelog %changelog
* Fri Feb 9 2024 Peter Rajnoha <prajnoha@redhat.com> - 0.0.6-1
- Update to latest upstream release.
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Jan 03 2023 Peter Rajnoha <prajnoha@redhat.com> - 0.0.5-6
- Use SPDX values for License fields in RPM spec file.
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri May 14 2021 Timm Bäder <tbaeder@redhat.com> - 0.0.5-2
- Use make_install macro
* Tue Apr 06 2021 Peter Rajnoha <prajnoha@redhat.com> - 0.0.5-1 * Tue Apr 06 2021 Peter Rajnoha <prajnoha@redhat.com> - 0.0.5-1
- Update to latest upstream release. - Update to latest upstream release.

View File

@ -1 +1 @@
SHA512 (sid-0.0.6.tar.gz) = f10e4caf19439731f12933aac8c819cc7f32dd44259af2bf8189b8ee63eddc4a94a6ca6ec8c211d80ad9aec11e1f0192c89a7b264bb8b57b8cd22de90466d628 SHA512 (sid-0.0.4.tar.gz) = 7e8cee52116b035922bb6791409465b65569e41a67806c6567b94cff2dac7ea6c8d754fb8d54ffa573b41581b8c72b063082b3ad80e718a9e8766e48efc5ad98