Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: patches/thin-provisioning-tools/0.9.0/, patches/thin-provisioning-tools/0.8.5/
Date: Mon, 08 Feb 2021 22:10:33
Message-Id: 1612820509.6e384bd92ffccb260caf42fbea1d9fac6a64d41f.whissi@gentoo
1 commit: 6e384bd92ffccb260caf42fbea1d9fac6a64d41f
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 8 21:14:19 2021 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 8 21:41:49 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6e384bd9
7
8 Bump thin-provisioning-tools to v0.9.0
9
10 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
11
12 ...n-provisioning-tools-0.8.5-libaio-0.3.112.patch | 84 ----------------------
13 ...thin-provisioning-tools-0.8.5-no-manpages.patch | 0
14 ...hin-provisioning-tools-0.9.0-build-fixes.patch} | 51 +------------
15 3 files changed, 2 insertions(+), 133 deletions(-)
16
17 diff --git a/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-libaio-0.3.112.patch b/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-libaio-0.3.112.patch
18 deleted file mode 100644
19 index af31b90..0000000
20 --- a/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-libaio-0.3.112.patch
21 +++ /dev/null
22 @@ -1,84 +0,0 @@
23 -From 6332962ee866f5289de87ab70cd3db863298982c Mon Sep 17 00:00:00 2001
24 -From: Joe Thornber <ejt@××××××.com>
25 -Date: Wed, 5 Jun 2019 15:02:05 +0100
26 -Subject: [PATCH] [ft-lib/bcache] rename raise() -> raise_()
27 -
28 -Name clash with signal.h on Debian and Gentoo.
29 ----
30 - ft-lib/bcache.c | 16 ++++++++--------
31 - 1 file changed, 8 insertions(+), 8 deletions(-)
32 -
33 -diff --git a/ft-lib/bcache.c b/ft-lib/bcache.c
34 -index 0dca5031..ee5b6c59 100644
35 ---- a/ft-lib/bcache.c
36 -+++ b/ft-lib/bcache.c
37 -@@ -31,7 +31,7 @@ static void warn(const char *fmt, ...)
38 - }
39 -
40 - // FIXME: raise a condition somehow?
41 --static void raise(const char *fmt, ...)
42 -+static void raise_(const char *fmt, ...)
43 - {
44 - va_list ap;
45 -
46 -@@ -51,7 +51,7 @@ static inline struct list_head *list_pop(struct list_head *head)
47 - struct list_head *l;
48 -
49 - if (head->next == head)
50 -- raise("list is empty\n");
51 -+ raise_("list is empty\n");
52 -
53 - l = head->next;
54 - list_del(l);
55 -@@ -98,7 +98,7 @@ static struct cb_set *cb_set_create(unsigned nr)
56 - static void cb_set_destroy(struct cb_set *cbs)
57 - {
58 - if (!list_empty(&cbs->allocated))
59 -- raise("async io still in flight");
60 -+ raise_("async io still in flight");
61 -
62 - free(cbs->vec);
63 - free(cbs);
64 -@@ -713,13 +713,13 @@ struct bcache *bcache_simple(const char *path, unsigned nr_cache_blocks)
65 - uint64_t s;
66 -
67 - if (fd < 0) {
68 -- raise("couldn't open cache file");
69 -+ raise_("couldn't open cache file");
70 - return NULL;
71 - }
72 -
73 - r = fstat(fd, &info);
74 - if (r < 0) {
75 -- raise("couldn't stat cache file");
76 -+ raise_("couldn't stat cache file");
77 - return NULL;
78 - }
79 -
80 -@@ -751,7 +751,7 @@ void bcache_destroy(struct bcache *cache)
81 - static void check_index(struct bcache *cache, block_address index)
82 - {
83 - if (index >= cache->nr_data_blocks)
84 -- raise("block out of bounds (%llu >= %llu)",
85 -+ raise_("block out of bounds (%llu >= %llu)",
86 - (unsigned long long) index,
87 - (unsigned long long) cache->nr_data_blocks);
88 - }
89 -@@ -802,7 +802,7 @@ static struct block *lookup_or_read_block(struct bcache *cache,
90 - // FIXME: this is insufficient. We need to also catch a read
91 - // lock of a write locked block. Ref count needs to distinguish.
92 - if (b->ref_count && (flags & (GF_DIRTY | GF_ZERO)))
93 -- raise("concurrent write lock attempt");
94 -+ raise_("concurrent write lock attempt");
95 -
96 - if (test_flags(b, BF_IO_PENDING)) {
97 - miss(cache, flags);
98 -@@ -858,7 +858,7 @@ struct block *get_block(struct bcache *cache, block_address index, unsigned flag
99 - return b;
100 - }
101 -
102 -- raise("couldn't get block");
103 -+ raise_("couldn't get block");
104 - return NULL;
105 - }
106 -
107
108 diff --git a/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-no-manpages.patch b/patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.8.5-no-manpages.patch
109 similarity index 100%
110 rename from patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-no-manpages.patch
111 rename to patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.8.5-no-manpages.patch
112
113 diff --git a/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-build-fixes.patch b/patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.9.0-build-fixes.patch
114 similarity index 51%
115 rename from patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-build-fixes.patch
116 rename to patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.9.0-build-fixes.patch
117 index b78a758..802c434 100644
118 --- a/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-build-fixes.patch
119 +++ b/patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.9.0-build-fixes.patch
120 @@ -1,6 +1,6 @@
121 --- a/Makefile.in
122 +++ b/Makefile.in
123 -@@ -150,9 +150,9 @@ endif
124 +@@ -160,9 +160,9 @@ endif
125
126 TOP_DIR:=@top_srcdir@
127 TOP_BUILDDIR:=@top_builddir@
128 @@ -12,16 +12,7 @@
129
130 ifeq ("@DEVTOOLS@", "yes")
131 CXXFLAGS+=-DDEV_TOOLS
132 -@@ -230,7 +230,7 @@ endif
133 - lib/libpdata.a: $(OBJECTS) $(EMITTERS)
134 - @echo " [AR] $<"
135 - @mkdir -p $(dir $@)
136 -- $(V)ar -rv $@ $(OBJECTS) $(EMITTERS) > /dev/null 2>&1
137 -+ $(V)$(AR) -rv $@ $(OBJECTS) $(EMITTERS) > /dev/null 2>&1
138 -
139 - bin/pdata_tools: $(OBJECTS) $(EMITTERS)
140 - @echo " [LD] $@"
141 -@@ -346,7 +346,7 @@ LIBFT_OBJECTS=$(subst .c,.o,$(LIBFT_SOURCE))
142 +@@ -363,7 +363,7 @@ LIBFT_OBJECTS=$(subst .c,.o,$(LIBFT_SOURCE))
143
144 lib/libft.so: $(LIBFT_OBJECTS)
145 @echo " [LD]" $@
146 @@ -41,17 +32,6 @@
147 AC_PROG_SED
148 AC_PROG_AWK
149 AC_PROG_LN_S
150 ---- a/contrib/Makefile.in
151 -+++ b/contrib/Makefile.in
152 -@@ -16,7 +16,7 @@ contrib/%.o: contrib/%.cc
153 -
154 - contrib/%.a: contrib/%.o
155 - $(V)echo " [AR] $@"
156 -- $(V)ar rcs $@ $^
157 -+ $(V)$(AR) rcs $@ $^
158 -
159 - contrib/%.so: contrib/%.a
160 - $(V)echo " [LD] $@"
161 --- a/functional-tests/bcache/Makefile
162 +++ b/functional-tests/bcache/Makefile
163 @@ -1,8 +1,8 @@
164 @@ -102,31 +82,4 @@
165
166 GMOCK_DEPS=\
167 $(wildcard $(GMOCK_DIR)/googlemock/include/*.h) \
168 -@@ -36,11 +36,11 @@ GMOCK_DEPS=\
169 - lib/libgmock.a: $(GMOCK_DEPS)
170 - @echo " [CXX] gtest"
171 - @mkdir -p lib
172 -- $(V)g++ $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googletest -c $(GMOCK_DIR)/googletest/src/gtest-all.cc
173 -+ $(V)$(CXX) $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googletest -c $(GMOCK_DIR)/googletest/src/gtest-all.cc
174 - @echo " [CXX] gmock"
175 -- $(V)g++ $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googlemock -c $(GMOCK_DIR)/googlemock/src/gmock-all.cc
176 -+ $(V)$(CXX) $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googlemock -c $(GMOCK_DIR)/googlemock/src/gmock-all.cc
177 - @echo " [AR] $<"
178 -- $(V)ar -rv lib/libgmock.a gtest-all.o gmock-all.o > /dev/null 2>&1
179 -+ $(V)$(AR) -rv lib/libgmock.a gtest-all.o gmock-all.o > /dev/null 2>&1
180 -
181 - TEST_SOURCE=\
182 - unit-tests/gmock_main.cc \
183 -@@ -86,10 +86,10 @@ TEST_OBJECTS=$(subst .cc,.gmo,$(TEST_SOURCE))
184 - sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*.d; \
185 - $(RM) $*.$$$$
186 -
187 --unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a
188 -+unit-tests/unit_tests: $(TEST_OBJECTS) lib/libpdata.a
189 - @echo " [LD] $<"
190 - @mkdir -p $(dir $@)
191 -- $(V)g++ $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT)
192 -+ $(V)$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT)
193 -
194 - .PHONY: unit-test
Report Message
Find on MARC Find on Google Groups