Accepting request 828047 from Base:System
- Update to version 0.9.0:
* New support tools: thin_metadata_{pack,unpack}.
* thin_check can now check metadata snapshots.
* some metadata space map bug fixes.
* thin_check --auto-repair
* Stop thin_dump --repair/thin_repair ignoring under populated nodes.
- Drop no longer needed patches:
* boost_168.patch
* ft-lib_bcache-rename-raise-raise_.patch
OBS-URL: https://build.opensuse.org/request/show/828047
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/thin-provisioning-tools?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
53acc224df
@ -1,19 +0,0 @@
|
||||
Index: thin-provisioning-tools-0.8.3/thin-provisioning/thin_show_duplicates.cc
|
||||
===================================================================
|
||||
--- thin-provisioning-tools-0.8.3.orig/thin-provisioning/thin_show_duplicates.cc
|
||||
+++ thin-provisioning-tools-0.8.3/thin-provisioning/thin_show_duplicates.cc
|
||||
@@ -40,7 +40,14 @@
|
||||
#include "thin-provisioning/superblock.h"
|
||||
#include "thin-provisioning/variable_chunk_stream.h"
|
||||
|
||||
+#include <boost/version.hpp>
|
||||
+
|
||||
+#if BOOST_VERSION >= 106800
|
||||
+#include <boost/uuid/detail/sha1.hpp>
|
||||
+#else
|
||||
#include <boost/uuid/sha1.hpp>
|
||||
+#endif
|
||||
+
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <boost/optional.hpp>
|
||||
#include <deque>
|
||||
@ -1,84 +0,0 @@
|
||||
From 6332962ee866f5289de87ab70cd3db863298982c Mon Sep 17 00:00:00 2001
|
||||
From: Joe Thornber <ejt@redhat.com>
|
||||
Date: Wed, 5 Jun 2019 15:02:05 +0100
|
||||
Subject: [PATCH] [ft-lib/bcache] rename raise() -> raise_()
|
||||
|
||||
Name clash with signal.h on Debian and Gentoo.
|
||||
---
|
||||
ft-lib/bcache.c | 16 ++++++++--------
|
||||
1 file changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/ft-lib/bcache.c b/ft-lib/bcache.c
|
||||
index 0dca5031..ee5b6c59 100644
|
||||
--- a/ft-lib/bcache.c
|
||||
+++ b/ft-lib/bcache.c
|
||||
@@ -31,7 +31,7 @@ static void warn(const char *fmt, ...)
|
||||
}
|
||||
|
||||
// FIXME: raise a condition somehow?
|
||||
-static void raise(const char *fmt, ...)
|
||||
+static void raise_(const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
|
||||
@@ -51,7 +51,7 @@ static inline struct list_head *list_pop(struct list_head *head)
|
||||
struct list_head *l;
|
||||
|
||||
if (head->next == head)
|
||||
- raise("list is empty\n");
|
||||
+ raise_("list is empty\n");
|
||||
|
||||
l = head->next;
|
||||
list_del(l);
|
||||
@@ -98,7 +98,7 @@ static struct cb_set *cb_set_create(unsigned nr)
|
||||
static void cb_set_destroy(struct cb_set *cbs)
|
||||
{
|
||||
if (!list_empty(&cbs->allocated))
|
||||
- raise("async io still in flight");
|
||||
+ raise_("async io still in flight");
|
||||
|
||||
free(cbs->vec);
|
||||
free(cbs);
|
||||
@@ -713,13 +713,13 @@ struct bcache *bcache_simple(const char *path, unsigned nr_cache_blocks)
|
||||
uint64_t s;
|
||||
|
||||
if (fd < 0) {
|
||||
- raise("couldn't open cache file");
|
||||
+ raise_("couldn't open cache file");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
r = fstat(fd, &info);
|
||||
if (r < 0) {
|
||||
- raise("couldn't stat cache file");
|
||||
+ raise_("couldn't stat cache file");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -751,7 +751,7 @@ void bcache_destroy(struct bcache *cache)
|
||||
static void check_index(struct bcache *cache, block_address index)
|
||||
{
|
||||
if (index >= cache->nr_data_blocks)
|
||||
- raise("block out of bounds (%llu >= %llu)",
|
||||
+ raise_("block out of bounds (%llu >= %llu)",
|
||||
(unsigned long long) index,
|
||||
(unsigned long long) cache->nr_data_blocks);
|
||||
}
|
||||
@@ -802,7 +802,7 @@ static struct block *lookup_or_read_block(struct bcache *cache,
|
||||
// FIXME: this is insufficient. We need to also catch a read
|
||||
// lock of a write locked block. Ref count needs to distinguish.
|
||||
if (b->ref_count && (flags & (GF_DIRTY | GF_ZERO)))
|
||||
- raise("concurrent write lock attempt");
|
||||
+ raise_("concurrent write lock attempt");
|
||||
|
||||
if (test_flags(b, BF_IO_PENDING)) {
|
||||
miss(cache, flags);
|
||||
@@ -858,7 +858,7 @@ struct block *get_block(struct bcache *cache, block_address index, unsigned flag
|
||||
return b;
|
||||
}
|
||||
|
||||
- raise("couldn't get block");
|
||||
+ raise_("couldn't get block");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:377f40ba6331ecee025e0f39942a5d33f8eadc4d68b484f5fce189f03dd9f662
|
||||
size 305585
|
||||
BIN
thin-provisioning-tools-0.9.0.tar.gz
(Stored with Git LFS)
Normal file
BIN
thin-provisioning-tools-0.9.0.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 20 08:19:34 UTC 2020 - Martin Pluskal <mpluskal@suse.com>
|
||||
|
||||
- Update to version 0.9.0:
|
||||
* New support tools: thin_metadata_{pack,unpack}.
|
||||
* thin_check can now check metadata snapshots.
|
||||
* some metadata space map bug fixes.
|
||||
* thin_check --auto-repair
|
||||
* Stop thin_dump --repair/thin_repair ignoring under populated nodes.
|
||||
- Drop no longer needed patches:
|
||||
* boost_168.patch
|
||||
* ft-lib_bcache-rename-raise-raise_.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 13 14:53:11 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package thin-provisioning-tools
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,21 +17,19 @@
|
||||
|
||||
|
||||
Name: thin-provisioning-tools
|
||||
Version: 0.8.5
|
||||
Version: 0.9.0
|
||||
Release: 0
|
||||
Summary: Thin Provisioning Tools
|
||||
License: GPL-3.0-only
|
||||
Group: System/Base
|
||||
URL: https://github.com/jthornber/thin-provisioning-tools/
|
||||
Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Patch1: boost_168.patch
|
||||
# PATCH-FIX-UPSTREAM https://github.com/jthornber/thin-provisioning-tools/commit/6332962ee866f5289de87ab70cd3db863298982c.patch
|
||||
Patch2: ft-lib_bcache-rename-raise-raise_.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libaio-devel
|
||||
BuildRequires: libboost_headers-devel
|
||||
BuildRequires: libboost_iostreams-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: ncurses-devel
|
||||
@ -44,7 +42,7 @@ Conflicts: device-mapper < 1.02.115
|
||||
A suite of tools for thin provisioning on Linux.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
|
||||
Loading…
Reference in New Issue
Block a user