[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#770612: marked as done (unblock: btrfs-tools/3.17-1.1)

Your message dated Sun, 23 Nov 2014 12:09:26 +0000
with message-id <1416744566.8259.14.camel@adam-barratt.org.uk>
and subject line Re: Bug#770612: unblock: btrfs-tools/3.17-1.1
has caused the Debian Bug report #770612,
regarding unblock: btrfs-tools/3.17-1.1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
770612: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770612
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package btrfs-tools

The upload backports two patches from the upstream 3.17.1 branch, fixing
RC bug #768746 (merged with #769684).

That upload allows packages depending on libbtrfs0 (such as snapper) to build
again.

X-D-CC'ing -boot@ as btrfs-tools produces a udeb, and is currently block-udeb'd.

Guessing the right hint would be:

unblock-udeb btrfs-tools/3.17-1.1

Thanks!

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru btrfs-tools-3.17/debian/changelog btrfs-tools-3.17/debian/changelog
--- btrfs-tools-3.17/debian/changelog	2014-10-23 23:04:25.000000000 +0200
+++ btrfs-tools-3.17/debian/changelog	2014-11-22 14:52:06.000000000 +0100
@@ -1,3 +1,13 @@
+btrfs-tools (3.17-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add 0002-Fix-linking-with-libbtrfs.patch from upstream, to properly
+    export all the previously exported API (Closes: #768746)
+  * Add 0003-Make-headers-C++-compatible.patch from upstream, making the
+    new headers C++-compatible.
+
+ -- Nicolas Dandrimont <olasd@debian.org>  Sat, 22 Nov 2014 14:52:06 +0100
+
 btrfs-tools (3.17-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru btrfs-tools-3.17/debian/patches/0002-Fix-linking-with-libbtrfs.patch btrfs-tools-3.17/debian/patches/0002-Fix-linking-with-libbtrfs.patch
--- btrfs-tools-3.17/debian/patches/0002-Fix-linking-with-libbtrfs.patch	1970-01-01 01:00:00.000000000 +0100
+++ btrfs-tools-3.17/debian/patches/0002-Fix-linking-with-libbtrfs.patch	2014-11-15 16:23:00.000000000 +0100
@@ -0,0 +1,36 @@
+From dcf11c371cbcdca78f297fe042095912634a8323 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.cz>
+Date: Thu, 30 Oct 2014 18:33:41 +0100
+Subject: [PATCH] btrfs-progs: fix linking with libbtrfs
+
+Reported at https://github.com/openSUSE/snapper/issues/128
+
+Commit cdb9e22e292275237c added another rbtree file that defines
+functions that libbtrfs uses.
+
+Signed-off-by: David Sterba <dsterba@suse.cz>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9c69ada..203597c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,14 +10,14 @@ objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \
+ 	  root-tree.o dir-item.o file-item.o inode-item.o inode-map.o \
+ 	  extent-cache.o extent_io.o volumes.o utils.o repair.o \
+ 	  qgroup.o raid6.o free-space-cache.o list_sort.o props.o \
+-	  ulist.o qgroup-verify.o backref.o rbtree-utils.o
++	  ulist.o qgroup-verify.o backref.o
+ cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \
+ 	       cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \
+ 	       cmds-quota.o cmds-qgroup.o cmds-replace.o cmds-check.o \
+ 	       cmds-restore.o cmds-rescue.o chunk-recover.o super-recover.o \
+ 	       cmds-property.o
+ libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o \
+-		   uuid-tree.o utils-lib.o
++		   uuid-tree.o utils-lib.o rbtree-utils.o
+ libbtrfs_headers = send-stream.h send-utils.h send.h rbtree.h btrfs-list.h \
+ 	       crc32c.h list.h kerncompat.h radix-tree.h extent-cache.h \
+ 	       extent_io.h ioctl.h ctree.h btrfsck.h version.h
diff -Nru btrfs-tools-3.17/debian/patches/0003-Make-headers-C++-compatible.patch btrfs-tools-3.17/debian/patches/0003-Make-headers-C++-compatible.patch
--- btrfs-tools-3.17/debian/patches/0003-Make-headers-C++-compatible.patch	1970-01-01 01:00:00.000000000 +0100
+++ btrfs-tools-3.17/debian/patches/0003-Make-headers-C++-compatible.patch	2014-11-15 16:57:02.000000000 +0100
@@ -0,0 +1,96 @@
+From cafacda441120976105d01c07286e843cb7cbb94 Mon Sep 17 00:00:00 2001
+From: David Sterba <dsterba@suse.cz>
+Date: Mon, 3 Nov 2014 23:50:50 +0100
+Subject: [PATCH] btrfs-progs: libbtrfs, make exported headers compatible with
+ C++
+
+Add externs and don't use a reserved keyword.
+
+Signed-off-by: David Sterba <dsterba@suse.cz>
+---
+ rbtree-utils.h     |  8 ++++++++
+ rbtree.h           | 10 +++++++++-
+ rbtree_augmented.h |  8 ++++++++
+ 3 files changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/rbtree-utils.h b/rbtree-utils.h
+index 7298c72..718581f 100644
+--- a/rbtree-utils.h
++++ b/rbtree-utils.h
+@@ -21,6 +21,10 @@
+ 
+ #include "rbtree.h"
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* The common insert/search/free functions */
+ typedef int (*rb_compare_nodes)(struct rb_node *node1, struct rb_node *node2);
+ typedef int (*rb_compare_keys)(struct rb_node *node, void *key);
+@@ -42,4 +46,8 @@ static void free_##name##_tree(struct rb_root *root)	\
+ 	rb_free_nodes(root, free_func);			\
+ }
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
+diff --git a/rbtree.h b/rbtree.h
+index 03c06d8..0d4f2bf 100644
+--- a/rbtree.h
++++ b/rbtree.h
+@@ -34,6 +34,10 @@
+ #include <btrfs/kerncompat.h>
+ #endif /* BTRFS_FLAT_INCLUDES */
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ struct rb_node {
+ 	unsigned long  __rb_parent_color;
+ 	struct rb_node *rb_right;
+@@ -75,7 +79,7 @@ extern struct rb_node *rb_first_postorder(const struct rb_root *);
+ extern struct rb_node *rb_next_postorder(const struct rb_node *);
+ 
+ /* Fast replacement of a single node without remove/rebalance/add/rebalance */
+-extern void rb_replace_node(struct rb_node *victim, struct rb_node *new, 
++extern void rb_replace_node(struct rb_node *victim, struct rb_node *new_node,
+ 			    struct rb_root *root);
+ 
+ static inline void rb_link_node(struct rb_node * node, struct rb_node * parent,
+@@ -107,4 +111,8 @@ static inline void rb_link_node(struct rb_node * node, struct rb_node * parent,
+ 			typeof(*pos), field); 1; }); \
+ 	     pos = n)
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif	/* _LINUX_RBTREE_H */
+diff --git a/rbtree_augmented.h b/rbtree_augmented.h
+index 079eb97..cbc9639 100644
+--- a/rbtree_augmented.h
++++ b/rbtree_augmented.h
+@@ -26,6 +26,10 @@
+ 
+ #include "rbtree.h"
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /*
+  * Please note - only struct rb_augment_callbacks and the prototypes for
+  * rb_insert_augmented() and rb_erase_augmented() are intended to be public.
+@@ -228,4 +232,8 @@ rb_erase_augmented(struct rb_node *node, struct rb_root *root,
+ 		__rb_erase_color(rebalance, root, augment->rotate);
+ }
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif	/* _LINUX_RBTREE_AUGMENTED_H */
diff -Nru btrfs-tools-3.17/debian/patches/series btrfs-tools-3.17/debian/patches/series
--- btrfs-tools-3.17/debian/patches/series	2014-10-23 23:00:58.000000000 +0200
+++ btrfs-tools-3.17/debian/patches/series	2014-11-15 16:57:11.000000000 +0100
@@ -1 +1,3 @@
 0001-Fixing-unaligned-memory-accesses.patch
+0002-Fix-linking-with-libbtrfs.patch
+0003-Make-headers-C++-compatible.patch

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message --- 
On Sat, 2014-11-22 at 23:26 +0100, Cyril Brulebois wrote:
> Control: tag -1 confirmed
> 
> Adam D. Barratt <adam@adam-barratt.org.uk> (2014-11-22):
> > Control: tags -1 + d-i
> > 
> > On Sat, 2014-11-22 at 17:44 +0100, Nicolas Dandrimont wrote:
> > > Please unblock package btrfs-tools
> > > 
> > > The upload backports two patches from the upstream 3.17.1 branch, fixing
> > > RC bug #768746 (merged with #769684).
> > > 
> > > That upload allows packages depending on libbtrfs0 (such as snapper) to build
> > > again.
> > 
> > Unblock added but as you noted:
> > 
> > > X-D-CC'ing -boot@ as btrfs-tools produces a udeb, and is currently block-udeb'd.
> > > 
> > > Guessing the right hint would be:
> > > 
> > > unblock-udeb btrfs-tools/3.17-1.1
> > 
> > It needs both - an unblock for general freeze purposes and a separate
> > unblock-udeb to counteract the block-udeb.
> 
> No objection at first glance.

Thanks. -udeb hint added.

Regards,

Adam

--- End Message ---
Reply to: