commit: 6e384bd92ffccb260caf42fbea1d9fac6a64d41f Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Mon Feb 8 21:14:19 2021 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Mon Feb 8 21:41:49 2021 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6e384bd9
Bump thin-provisioning-tools to v0.9.0 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> ...n-provisioning-tools-0.8.5-libaio-0.3.112.patch | 84 ---------------------- ...thin-provisioning-tools-0.8.5-no-manpages.patch | 0 ...hin-provisioning-tools-0.9.0-build-fixes.patch} | 51 +------------ 3 files changed, 2 insertions(+), 133 deletions(-) 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 deleted file mode 100644 index af31b90..0000000 --- a/patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-libaio-0.3.112.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 6332962ee866f5289de87ab70cd3db863298982c Mon Sep 17 00:00:00 2001 -From: Joe Thornber <[email protected]> -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; - } - 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 similarity index 100% rename from patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-no-manpages.patch rename to patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.8.5-no-manpages.patch 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 similarity index 51% rename from patches/thin-provisioning-tools/0.8.5/thin-provisioning-tools-0.8.5-build-fixes.patch rename to patches/thin-provisioning-tools/0.9.0/thin-provisioning-tools-0.9.0-build-fixes.patch index b78a758..802c434 100644 --- 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 @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -150,9 +150,9 @@ endif +@@ -160,9 +160,9 @@ endif TOP_DIR:=@top_srcdir@ TOP_BUILDDIR:=@top_builddir@ @@ -12,16 +12,7 @@ ifeq ("@DEVTOOLS@", "yes") CXXFLAGS+=-DDEV_TOOLS -@@ -230,7 +230,7 @@ endif - lib/libpdata.a: $(OBJECTS) $(EMITTERS) - @echo " [AR] $<" - @mkdir -p $(dir $@) -- $(V)ar -rv $@ $(OBJECTS) $(EMITTERS) > /dev/null 2>&1 -+ $(V)$(AR) -rv $@ $(OBJECTS) $(EMITTERS) > /dev/null 2>&1 - - bin/pdata_tools: $(OBJECTS) $(EMITTERS) - @echo " [LD] $@" -@@ -346,7 +346,7 @@ LIBFT_OBJECTS=$(subst .c,.o,$(LIBFT_SOURCE)) +@@ -363,7 +363,7 @@ LIBFT_OBJECTS=$(subst .c,.o,$(LIBFT_SOURCE)) lib/libft.so: $(LIBFT_OBJECTS) @echo " [LD]" $@ @@ -41,17 +32,6 @@ AC_PROG_SED AC_PROG_AWK AC_PROG_LN_S ---- a/contrib/Makefile.in -+++ b/contrib/Makefile.in -@@ -16,7 +16,7 @@ contrib/%.o: contrib/%.cc - - contrib/%.a: contrib/%.o - $(V)echo " [AR] $@" -- $(V)ar rcs $@ $^ -+ $(V)$(AR) rcs $@ $^ - - contrib/%.so: contrib/%.a - $(V)echo " [LD] $@" --- a/functional-tests/bcache/Makefile +++ b/functional-tests/bcache/Makefile @@ -1,8 +1,8 @@ @@ -102,31 +82,4 @@ GMOCK_DEPS=\ $(wildcard $(GMOCK_DIR)/googlemock/include/*.h) \ -@@ -36,11 +36,11 @@ GMOCK_DEPS=\ - lib/libgmock.a: $(GMOCK_DEPS) - @echo " [CXX] gtest" - @mkdir -p lib -- $(V)g++ $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googletest -c $(GMOCK_DIR)/googletest/src/gtest-all.cc -+ $(V)$(CXX) $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googletest -c $(GMOCK_DIR)/googletest/src/gtest-all.cc - @echo " [CXX] gmock" -- $(V)g++ $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googlemock -c $(GMOCK_DIR)/googlemock/src/gmock-all.cc -+ $(V)$(CXX) $(GMOCK_INCLUDES) -I$(GMOCK_DIR)/googlemock -c $(GMOCK_DIR)/googlemock/src/gmock-all.cc - @echo " [AR] $<" -- $(V)ar -rv lib/libgmock.a gtest-all.o gmock-all.o > /dev/null 2>&1 -+ $(V)$(AR) -rv lib/libgmock.a gtest-all.o gmock-all.o > /dev/null 2>&1 - - TEST_SOURCE=\ - unit-tests/gmock_main.cc \ -@@ -86,10 +86,10 @@ TEST_OBJECTS=$(subst .cc,.gmo,$(TEST_SOURCE)) - sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*.d; \ - $(RM) $*.$$$$ - --unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a -+unit-tests/unit_tests: $(TEST_OBJECTS) lib/libpdata.a - @echo " [LD] $<" - @mkdir -p $(dir $@) -- $(V)g++ $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT) -+ $(V)$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT) - - .PHONY: unit-test
