diff --git a/0000-device-mapper-persistent-data-avoid-strip.patch b/0001-device-mapper-persistent-data-avoid-strip.patch similarity index 100% rename from 0000-device-mapper-persistent-data-avoid-strip.patch rename to 0001-device-mapper-persistent-data-avoid-strip.patch diff --git a/6000-build-Fix-static-build-by-including-contrib-Makefile.patch b/6000-build-Fix-static-build-by-including-contrib-Makefile.patch deleted file mode 100644 index d9defbd97d09b615e103c10ea843f88d80d72ea0..0000000000000000000000000000000000000000 --- a/6000-build-Fix-static-build-by-including-contrib-Makefile.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2c9ee45c8c7836674194739a2bcc4bb4db08d27e Mon Sep 17 00:00:00 2001 -From: root -Date: Tue, 9 Apr 2019 21:27:36 +0800 -Subject: [PATCH 1/4] [build] Fix static build by including contrib/Makefile - early (#100) Closes: #99 - ---- - Makefile.in | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index df590b4..5e9f30a 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -29,6 +29,8 @@ endif - .PHONY: all - all: $(PROGRAMS) $(TESTLIBS) - -+include contrib/Makefile -+ - SOURCE=\ - base/output_file_requirements.cc \ - base/application.cc \ -@@ -140,10 +142,8 @@ CXX:=@CXX@ - STRIP:=@STRIP@ - OBJECTS:=$(subst .cc,.o,$(SOURCE)) - --# FIXME EMITTERS += $(PLUGIN_LIBS) doesn't work, probably because it's empty at --# the time of use? - ifeq ("@STATIC@", "yes") --EMITTERS += contrib/*.a -+EMITTERS += $(PLUGIN_LIBS) - endif - - TOP_DIR:=@top_srcdir@ -@@ -318,8 +318,6 @@ endif - - .PHONY: install - --include contrib/Makefile -- - ifeq ("@TESTING@", "yes") - include unit-tests/Makefile - --- -2.19.1 - diff --git a/6001-restore_emitter-squash-a-strncpy-warning.patch b/6001-restore_emitter-squash-a-strncpy-warning.patch deleted file mode 100644 index 3b5e475a5d70458c078306e2dfecc66cee7200d7..0000000000000000000000000000000000000000 --- a/6001-restore_emitter-squash-a-strncpy-warning.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9b1acc658fdf5b066a2afc5324de8e3067fa5912 Mon Sep 17 00:00:00 2001 -From: root -Date: Tue, 9 Apr 2019 21:29:33 +0800 -Subject: [PATCH 2/4] [restore_emitter] squash a strncpy warning - ---- - caching/restore_emitter.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/caching/restore_emitter.cc b/caching/restore_emitter.cc -index b7a573f..5c30b9f 100644 ---- a/caching/restore_emitter.cc -+++ b/caching/restore_emitter.cc -@@ -26,7 +26,7 @@ namespace { - - superblock &sb = md_->sb_; - sb.version = metadata_version_; -- strncpy((char *) sb.policy_name, policy.c_str(), sizeof(sb.policy_name)); -+ strncpy((char *) sb.policy_name, policy.c_str(), sizeof(sb.policy_name) - 1); - memset(sb.policy_version, 0, sizeof(sb.policy_version)); // FIXME: should come from xml - sb.policy_hint_size = hint_width; - md_->setup_hint_array(hint_width); --- -2.19.1 - diff --git a/6002-run_set-fix-invalid-iterator-operations-113.patch b/6002-run_set-fix-invalid-iterator-operations-113.patch deleted file mode 100644 index b58509d1ab245f52a4b061b70273afc8840cc500..0000000000000000000000000000000000000000 --- a/6002-run_set-fix-invalid-iterator-operations-113.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5276bce4b8bca71cad36f48b309bdef23fac1134 Mon Sep 17 00:00:00 2001 -From: root -Date: Tue, 9 Apr 2019 21:33:29 +0800 -Subject: [PATCH 3/4] [run_set] fix invalid iterator operations (#113) - ---- - persistent-data/run_set.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/persistent-data/run_set.h b/persistent-data/run_set.h -index 68a5f46..6c23dc1 100644 ---- a/persistent-data/run_set.h -+++ b/persistent-data/run_set.h -@@ -64,13 +64,13 @@ namespace base { - - typename rset::const_iterator it = runs_.lower_bound(run(v)); - -- if (it->begin_ == v) -+ if (it != runs_.end() && it->begin_ == v) - return true; - -- it--; -- -- if (it != runs_.end()) -+ if (it != runs_.begin()) { -+ it--; - return it->contains(v); -+ } - - return false; - } --- -2.19.1 - diff --git a/6003-space-map-disk-fix-the-search-range-117.patch b/6003-space-map-disk-fix-the-search-range-117.patch deleted file mode 100644 index 84fd82dc68ebc1f334e64c3019bf8084b4b72d5c..0000000000000000000000000000000000000000 --- a/6003-space-map-disk-fix-the-search-range-117.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 529a7cf3f5d5780d5e44c8508d2d42903672f7e8 Mon Sep 17 00:00:00 2001 -From: root -Date: Tue, 9 Apr 2019 21:36:22 +0800 -Subject: [PATCH 4/4] [space-map-disk] fix the search range (#117) - ---- - persistent-data/space-maps/disk.cc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/persistent-data/space-maps/disk.cc b/persistent-data/space-maps/disk.cc -index ce6a42c..d8db76f 100644 ---- a/persistent-data/space-maps/disk.cc -+++ b/persistent-data/space-maps/disk.cc -@@ -390,7 +390,8 @@ namespace { - - bitmap bm(tm_, ie, bitmap_validator_); - unsigned bit_begin = (index == begin_index) ? (begin % ENTRIES_PER_BLOCK) : 0; -- unsigned bit_end = (index == end_index - 1) ? (end % ENTRIES_PER_BLOCK) : ENTRIES_PER_BLOCK; -+ unsigned bit_end = (index == end_index - 1) ? -+ (end - ENTRIES_PER_BLOCK * index) : ENTRIES_PER_BLOCK; - - boost::optional maybe_b = bm.find_free(bit_begin, bit_end); - if (maybe_b) { --- -2.19.1 - diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 4212229433d05c09aa82e64251887d4c9933ae54..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# thin-provisioning-tools - -#### Description -A suite of tools for manipulating the metadata of the dm-thin, dm-cache and dm-era device-mapper targets. - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 4624b5dfd4ada68823ba88faaf122643c8db4e7d..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# thin-provisioning-tools - -#### 介绍 -A suite of tools for manipulating the metadata of the dm-thin, dm-cache and dm-era device-mapper targets. - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/thin-provisioning-tools.spec b/thin-provisioning-tools.spec index 07eadca505ca76664f89d4cab7b5240b17c89444..977680f2963e86533229661109102841f4c2ddc5 100644 --- a/thin-provisioning-tools.spec +++ b/thin-provisioning-tools.spec @@ -1,20 +1,16 @@ Name: thin-provisioning-tools -Version: 0.7.6 -Release: 5 +Version: 0.9.0 +Release: 1 Summary: Tools for manipulating Device-mapper metadata License: GPLv3+ URL: https://github.com/jthornber/thin-provisioning-tools Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz -Patch0: 0000-device-mapper-persistent-data-avoid-strip.patch -Patch1: 6000-build-Fix-static-build-by-including-contrib-Makefile.patch -Patch2: 6001-restore_emitter-squash-a-strncpy-warning.patch -Patch3: 6002-run_set-fix-invalid-iterator-operations-113.patch -Patch4: 6003-space-map-disk-fix-the-search-range-117.patch +Patch1: 0001-device-mapper-persistent-data-avoid-strip.patch BuildRequires: autoconf, expat-devel BuildRequires: libaio-devel, libstdc++-devel BuildRequires: boost-devel, gcc-c++ -Requires: expat +Requires: expat, boost-iostreams Provides: device-mapper-persistent-data Obsoletes: device-mapper-persistent-data @@ -53,6 +49,21 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install %{_mandir}/man*/* %changelog +* Thu Aug 25 2020 lixiaokeng - 0.9.0-1 +- upgrade package to 0.9.0 + +* Thu July 30 2020 lixiaokeng - 0.8.5-2 +- remove thin-provisioning-tools.yaml + +* Wed July 15 2020 Liu Bo - 0.8.5-1 +- upgrade package to 0.8.5 + +* Sun Jul 5 2020 Zhiqiang Liu - 0.7.6-7 +- remove useless readme files. + +* Wed Jul 1 2020 Wu Bo - 0.7.6-6 +- rebuild package + * Sat Jan 11 2020 wangjufeng - 0.7.6-5 - Type:enhancemnet - ID:NA diff --git a/v0.7.6.tar.gz b/v0.7.6.tar.gz deleted file mode 100644 index 5d483bc0701e6cd4df6fc130d25df4be0d4d30b7..0000000000000000000000000000000000000000 Binary files a/v0.7.6.tar.gz and /dev/null differ diff --git a/v0.9.0.tar.gz b/v0.9.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..15c3278cce086c7751e30059a32fb0d2728b89a3 Binary files /dev/null and b/v0.9.0.tar.gz differ