From af3620d44c7c6e253989a194e7ad4fecc21a6e97 Mon Sep 17 00:00:00 2001 From: Vratislav Podzimek Date: Thu, 21 May 2015 17:54:21 +0200 Subject: [PATCH] New version - Adapt the release helper targets to autotools (vpodzime) - Fixes of paths in Makefile.am's inspired by build failures on s390 (vpodzime) - Add an s390-specific BuildRequires (vpodzime) - Distribute also the boilerplate_generator.py script (vpodzime) - Fix path to the generated blockdev.pc file (vpodzime) - Adapt tests that compile stuff to autotools (vpodzime) - Merge pull request #18 from vpodzime/master-autotools (vpodzime) - Merge pull request #20 from dashea/gtkdoc-sections (vpodzime) - Use the autotools building system instead of scons (vpodzime) - Add the two new functions to the 'blockdev' docs section (vpodzime) - Fix the line defining the docs file for the s390 section (vpodzime) - Add a missing #include to the kbd.api file (vpodzime) - Prevent s390-specific stuff from being used on other architectures (vpodzime) - Update the documentation of the is_initialized() function (vpodzime) - Merge pull request #19 from vpodzime/master-ensure_init (vpodzime) - Remove private macros from the gtkdoc sections file. (dshea) - Terminate ifdef statements for arch check. (sbueno+anaconda) - Return early from the init functions if setting up logging fails (vpodzime) - Add tests for the new and modified init functions (vpodzime) - Add new try_init() and try_reinit() functions (vpodzime) - Fix for adding number of loaded plugins (vpodzime) - Fix for ensure_init() (vpodzime) - Rename the try_init() function to ensure_init() and improve it (vpodzime) - Check number of loaded plugins and library initialization state (vpodzime) - Make 'reload' default to True instead of False in overrides (vpodzime) - Add the s390 plugin test file. (sbueno+anaconda) - Add the s390 plugin functions. (sbueno+anaconda) - Add the s390 plugin. (sbueno+anaconda) - Fix a typo in the spec file. (sbueno+anaconda) - Require the kmod-devel package for the build process (vpodzime) - Merge pull request #16 from dashea/escrow-encoding (vpodzime) - Merge pull request #13 from vpodzime/master-lvm_cache (vpodzime) - Merge pull request #12 from vpodzime/master-kbd_plugin (vpodzime) - Merge pull request #14 from vpodzime/master-better_is_multipath (vpodzime) - Use g_strdup() instead of g_strdup_printf() to just dup a string (vpodzime) - Fix the spelling of "escrow" (dshea) - Make the crypto plugin string parameters const (dshea) - Set encoding to NULL before writing the escrow packet. (dshea) - Get cache stats directly from the device mapper (vpodzime) - Reimplement the is_mpath_member() function using device mapper (vpodzime) - Add the LVM cache related symbols to the LVM section in the documentation (vpodzime) - Update the list of LVM cache related functions in features.rst (vpodzime) - Add tests for functions related to the LVM cache technology (vpodzime) - Implement the lvm_cache_stats() function (vpodzime) - Implement the lvm_cache_pool_name function (vpodzime) - Implement the lvm_cache_create_cached_lv() function (vpodzime) - Implement lvm_cache_attach/detach() functions (vpodzime) - Implement the lvm_cache_create_pool() function plus two support functions (vpodzime) - Implement the lvm_cache_get_default_md_size() function (vpodzime) - Add the 'type' parameter to the lvm_lvcreate function (vpodzime) - Teach boilerplate_generator to work with enum return types (vpodzime) - Teach boilerplate_generator to work with 'const' return types (vpodzime) - Add subpackages for the KBD plugin and its devel files (vpodzime) - Add provided symbols to the documentation section of the KBD plugin (vpodzime) - Implement the bcache_get_backing/cache_device functions (vpodzime) - Exclude bcache tests from the normal 'test' target (vpodzime) - Add some more and prolong some of the waits in KBD tests (vpodzime) - Zero all newly allocated structures (vpodzime) - Implement the bcache_status function and all it wants (vpodzime) - Fix for the zram stats (vpodzime) - Add bcache_get_mode and bcache_set_mode functions (vpodzime) - Teach boilerplate_generator to work with enum return types (vpodzime) - Teach boilerplate_generator to work with 'const' return types (vpodzime) - Add the zram_get_stats function (vpodzime) - Add the check() function for the KBD plugin (vpodzime) - Add ErrorProxy instance for the KBD plugin (vpodzime) - Add tests for bcache_create/attach/detach/destroy functions (vpodzime) - Add the 'rebuild' Makefile target (vpodzime) - Add bcache_create, bcache_attach, bcache_detach and bcache_destroy functions (vpodzime) - Implement a helper function to echo string into a file (vpodzime) - Add tests for zram_create_devices and zram_destroy_devices functions (vpodzime) - Add the zram_destroy_devices function to the KBD plugin (vpodzime) - Add first function to the KBD plugin: zram_create_devices (vpodzime) - Add the KernelBlockDevices plugin (vpodzime) --- .gitignore | 1 + libblockdev.spec | 170 ++++++++++++++++++++++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 161 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index ac94a04..0cd5c3d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /libblockdev-0.11.tar.gz /libblockdev-0.12.tar.gz /libblockdev-0.13.tar.gz +/libblockdev-1.0.tar.gz diff --git a/libblockdev.spec b/libblockdev.spec index f89e1bc..f1f4e37 100644 --- a/libblockdev.spec +++ b/libblockdev.spec @@ -1,5 +1,5 @@ Name: libblockdev -Version: 0.13 +Version: 1.0 Release: 1%{?dist} Summary: A library for low-level manipulation with block devices License: LGPLv2+ @@ -19,6 +19,11 @@ BuildRequires: python-devel BuildRequires: python3-devel BuildRequires: gtk-doc BuildRequires: glib2-doc +BuildRequires: kmod-devel + +%ifarch s390 s390x +BuildRequires: s390utils-devel +%endif %description @@ -64,7 +69,7 @@ Requires: btrfs-progs %description btrfs The libblockdev library plugin (and in the same time a standalone library) -proving the BTRFS-related functionality. +providing the BTRFS-related functionality. %package btrfs-devel Summary: Development files for the libblockdev-btrfs plugin/library @@ -82,7 +87,7 @@ Summary: The crypto plugin for the libblockdev library %description crypto The libblockdev library plugin (and in the same time a standalone library) -proving the functionality related to encrypted devices (LUKS). +providing the functionality related to encrypted devices (LUKS). %package crypto-devel Summary: Development files for the libblockdev-crypto plugin/library @@ -102,7 +107,7 @@ Requires: dmraid %description dm The libblockdev library plugin (and in the same time a standalone library) -proving the functionality related to Device Mapper. +providing the functionality related to Device Mapper. %package dm-devel Summary: Development files for the libblockdev-dm plugin/library @@ -118,6 +123,27 @@ This package contains header files and pkg-config files needed for development with the libblockdev-dm plugin/library. +%package kbd +Summary: The KBD plugin for the libblockdev library +Requires: %{name}-utils%{?_isa} >= 0.11 +Requires: bcache-tools >= 1.0.8 + +%description kbd +The libblockdev library plugin (and in the same time a standalone library) +providing the functionality related to kernel block devices (namely zRAM and +Bcache). + +%package kbd-devel +Summary: Development files for the libblockdev-kbd plugin/library +Requires: %{name}-kbd%{?_isa} = %{version}-%{release} +Requires: %{name}-utils-devel%{?_isa} +Requires: glib2-devel + +%description kbd-devel +This package contains header files and pkg-config files needed for development +with the libblockdev-kbd plugin/library. + + %package loop Summary: The loop plugin for the libblockdev library Requires: %{name}-utils%{?_isa} >= 0.11 @@ -125,7 +151,7 @@ Requires: util-linux %description loop The libblockdev library plugin (and in the same time a standalone library) -proving the functionality related to loop devices. +providing the functionality related to loop devices. %package loop-devel Summary: Development files for the libblockdev-loop plugin/library @@ -145,7 +171,7 @@ Requires: lvm2 %description lvm The libblockdev library plugin (and in the same time a standalone library) -proving the LVM-related functionality. +providing the LVM-related functionality. %package lvm-devel Summary: Development files for the libblockdev-lvm plugin/library @@ -165,7 +191,7 @@ Requires: mdadm %description mdraid The libblockdev library plugin (and in the same time a standalone library) -proving the functionality related to MD RAID. +providing the functionality related to MD RAID. %package mdraid-devel Summary: Development files for the libblockdev-mdraid plugin/library @@ -185,7 +211,7 @@ Requires: device-mapper-multipath %description mpath The libblockdev library plugin (and in the same time a standalone library) -proving the functionality related to multipath devices. +providing the functionality related to multipath devices. %package mpath-devel Summary: Development files for the libblockdev-mpath plugin/library @@ -205,7 +231,7 @@ Requires: util-linux %description swap The libblockdev library plugin (and in the same time a standalone library) -proving the functionality related to swap devices. +providing the functionality related to swap devices. %package swap-devel Summary: Development files for the libblockdev-swap plugin/library @@ -217,6 +243,25 @@ Requires: glib2-devel This package contains header files and pkg-config files needed for development with the libblockdev-swap plugin/library. +%package s390 +Summary: The s390 plugin for the libblockdev library +Requires: s390utils + +%description s390 +The libblockdev library plugin (and in the same time a standalone library) +providing the functionality related to s390 devices. + +%package s390-devel +Summary: Development files for the libblockdev-s390 plugin/library +Requires: %{name}-s390%{?_isa} = %{version}-%{release} +Requires: %{name}-utils-devel%{?_isa} +Requires: glib2-devel +Requires: s390utils-devel + +%description s390-devel +This package contains header files and pkg-config files needed for development +with the libblockdev-s390 plugin/library. + %package plugins-all Summary: Meta-package that pulls all the libblockdev plugins as dependencies @@ -224,11 +269,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-btrfs%{?_isa} = %{version}-%{release} Requires: %{name}-crypto%{?_isa} = %{version}-%{release} Requires: %{name}-dm%{?_isa} = %{version}-%{release} +Requires: %{name}-kbd%{?_isa} = %{version}-%{release} Requires: %{name}-loop%{?_isa} = %{version}-%{release} Requires: %{name}-lvm%{?_isa} = %{version}-%{release} Requires: %{name}-mdraid%{?_isa} = %{version}-%{release} Requires: %{name}-mpath%{?_isa} = %{version}-%{release} Requires: %{name}-swap%{?_isa} = %{version}-%{release} +%ifarch s390 s390x +Requires: %{name}-s390%{?_isa} = %{version}-%{release} +%endif %description plugins-all A meta-package that pulls all the libblockdev plugins as dependencies. @@ -238,10 +287,12 @@ A meta-package that pulls all the libblockdev plugins as dependencies. %setup -q -n %{name}-%{version} %build -CFLAGS="%{optflags}" make %{?_smp_mflags} +%configure +%{__make} %{?_smp_mflags} %install -CFLAGS="%{optflags}" make PREFIX=%{buildroot} SITEDIRS=%{buildroot}%{python2_sitearch},%{buildroot}%{python3_sitearch} %{?_smp_mflags} install +%{make_install} +find %{buildroot} -type f -name "*.la" | xargs %{__rm} %post -p /sbin/ldconfig @@ -264,6 +315,8 @@ CFLAGS="%{optflags}" make PREFIX=%{buildroot} SITEDIRS=%{buildroot}%{python2_sit %postun mpath -p /sbin/ldconfig %post swap -p /sbin/ldconfig %postun swap -p /sbin/ldconfig +%post s390 -p /sbin/ldconfig +%postun s390 -p /sbin/ldconfig %files @@ -324,6 +377,15 @@ CFLAGS="%{optflags}" make PREFIX=%{buildroot} SITEDIRS=%{buildroot}%{python2_sit %{_includedir}/blockdev/dm.h +%files kbd +%{_libdir}/libbd_kbd.so.* + +%files kbd-devel +%{_libdir}/libbd_kbd.so +%dir %{_includedir}/blockdev +%{_includedir}/blockdev/kbd.h + + %files loop %{_libdir}/libbd_loop.so.* @@ -368,9 +430,95 @@ CFLAGS="%{optflags}" make PREFIX=%{buildroot} SITEDIRS=%{buildroot}%{python2_sit %dir %{_includedir}/blockdev %{_includedir}/blockdev/swap.h +%ifarch s390 s390x +%files s390 +%{_libdir}/libbd_s390.so.* + +%files s390-devel +%{_libdir}/libbd_s390.so +%dir %{_includedir}/blockdev +%{_includedir}/blockdev/s390.h +%endif + %files plugins-all %changelog +* Thu May 21 2015 Vratislav Podzimek - 1.0-1 +- Adapt the release helper targets to autotools (vpodzime) +- Fixes of paths in Makefile.am's inspired by build failures on s390 (vpodzime) +- Add an s390-specific BuildRequires (vpodzime) +- Distribute also the boilerplate_generator.py script (vpodzime) +- Fix path to the generated blockdev.pc file (vpodzime) +- Adapt tests that compile stuff to autotools (vpodzime) +- Merge pull request #18 from vpodzime/master-autotools (vpodzime) +- Merge pull request #20 from dashea/gtkdoc-sections (vpodzime) +- Use the autotools building system instead of scons (vpodzime) +- Add the two new functions to the 'blockdev' docs section (vpodzime) +- Fix the line defining the docs file for the s390 section (vpodzime) +- Add a missing #include to the kbd.api file (vpodzime) +- Prevent s390-specific stuff from being used on other architectures (vpodzime) +- Update the documentation of the is_initialized() function (vpodzime) +- Merge pull request #19 from vpodzime/master-ensure_init (vpodzime) +- Remove private macros from the gtkdoc sections file. (dshea) +- Terminate ifdef statements for arch check. (sbueno+anaconda) +- Return early from the init functions if setting up logging fails (vpodzime) +- Add tests for the new and modified init functions (vpodzime) +- Add new try_init() and try_reinit() functions (vpodzime) +- Fix for adding number of loaded plugins (vpodzime) +- Fix for ensure_init() (vpodzime) +- Rename the try_init() function to ensure_init() and improve it (vpodzime) +- Check number of loaded plugins and library initialization state (vpodzime) +- Make 'reload' default to True instead of False in overrides (vpodzime) +- Add the s390 plugin test file. (sbueno+anaconda) +- Add the s390 plugin functions. (sbueno+anaconda) +- Add the s390 plugin. (sbueno+anaconda) +- Fix a typo in the spec file. (sbueno+anaconda) +- Require the kmod-devel package for the build process (vpodzime) +- Merge pull request #16 from dashea/escrow-encoding (vpodzime) +- Merge pull request #13 from vpodzime/master-lvm_cache (vpodzime) +- Merge pull request #12 from vpodzime/master-kbd_plugin (vpodzime) +- Merge pull request #14 from vpodzime/master-better_is_multipath (vpodzime) +- Use g_strdup() instead of g_strdup_printf() to just dup a string (vpodzime) +- Fix the spelling of "escrow" (dshea) +- Make the crypto plugin string parameters const (dshea) +- Set encoding to NULL before writing the escrow packet. (dshea) +- Get cache stats directly from the device mapper (vpodzime) +- Reimplement the is_mpath_member() function using device mapper (vpodzime) +- Add the LVM cache related symbols to the LVM section in the documentation (vpodzime) +- Update the list of LVM cache related functions in features.rst (vpodzime) +- Add tests for functions related to the LVM cache technology (vpodzime) +- Implement the lvm_cache_stats() function (vpodzime) +- Implement the lvm_cache_pool_name function (vpodzime) +- Implement the lvm_cache_create_cached_lv() function (vpodzime) +- Implement lvm_cache_attach/detach() functions (vpodzime) +- Implement the lvm_cache_create_pool() function plus two support functions (vpodzime) +- Implement the lvm_cache_get_default_md_size() function (vpodzime) +- Add the 'type' parameter to the lvm_lvcreate function (vpodzime) +- Teach boilerplate_generator to work with enum return types (vpodzime) +- Teach boilerplate_generator to work with 'const' return types (vpodzime) +- Add subpackages for the KBD plugin and its devel files (vpodzime) +- Add provided symbols to the documentation section of the KBD plugin (vpodzime) +- Implement the bcache_get_backing/cache_device functions (vpodzime) +- Exclude bcache tests from the normal 'test' target (vpodzime) +- Add some more and prolong some of the waits in KBD tests (vpodzime) +- Zero all newly allocated structures (vpodzime) +- Implement the bcache_status function and all it wants (vpodzime) +- Fix for the zram stats (vpodzime) +- Add bcache_get_mode and bcache_set_mode functions (vpodzime) +- Teach boilerplate_generator to work with enum return types (vpodzime) +- Teach boilerplate_generator to work with 'const' return types (vpodzime) +- Add the zram_get_stats function (vpodzime) +- Add the check() function for the KBD plugin (vpodzime) +- Add ErrorProxy instance for the KBD plugin (vpodzime) +- Add tests for bcache_create/attach/detach/destroy functions (vpodzime) +- Add the 'rebuild' Makefile target (vpodzime) +- Add bcache_create, bcache_attach, bcache_detach and bcache_destroy functions (vpodzime) +- Implement a helper function to echo string into a file (vpodzime) +- Add tests for zram_create_devices and zram_destroy_devices functions (vpodzime) +- Add the zram_destroy_devices function to the KBD plugin (vpodzime) +- Add first function to the KBD plugin: zram_create_devices (vpodzime) +- Add the KernelBlockDevices plugin (vpodzime) + * Wed May 13 2015 Vratislav Podzimek - 0.13-1 - Prevent a leaky test from running in Jenkins (vpodzime) - Try harder when cleaning up after MD RAID tests (vpodzime) diff --git a/sources b/sources index 220d4e8..33aa173 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d7f1c73d05b229a82938758f7e543ae libblockdev-0.13.tar.gz +0d205760154dfe256dfbbf50a1fd7bc3 libblockdev-1.0.tar.gz