Package: btrfs-tools
Version: 0.19+20100601-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/04-werror.patch:
- fix missing initialization (fixes FTBFS)
* debian/patches/05-fix-ld.patch:
- add missing -lcom_err to fix FTBFS
The first patch fixes a issue with -Werror the second one with
the linker (fix should #554059)
Thanks for considering the patch.
Cheers,
Michael
-- System Information:
Debian Release: squeeze/sid
APT prefers natty-updates
APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.37-11-generic (SMP w/4 CPU cores)
Locale: LANG=en_DK.utf8, LC_CTYPE=en_DK.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u btrfs-tools-0.19+20100601/debian/changelog btrfs-tools-0.19+20100601/debian/changelog
diff -u btrfs-tools-0.19+20100601/debian/patches/series btrfs-tools-0.19+20100601/debian/patches/series
--- btrfs-tools-0.19+20100601/debian/patches/series
+++ btrfs-tools-0.19+20100601/debian/patches/series
@@ -3,0 +4,2 @@
+04-werror.patch
+05-fix-ld.patch
only in patch2:
unchanged:
--- btrfs-tools-0.19+20100601.orig/debian/patches/05-fix-ld.patch
+++ btrfs-tools-0.19+20100601/debian/patches/05-fix-ld.patch
@@ -0,0 +1,16 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: btrfs-tools/Makefile
+===================================================================
+--- btrfs-tools.orig/Makefile 2011-01-14 18:39:28.889413002 +0100
++++ btrfs-tools/Makefile 2011-01-14 18:39:27.729413002 +0100
+@@ -14,7 +14,7 @@
+ INSTALL= install
+ prefix ?= /usr/local
+ bindir = $(prefix)/bin
+-LIBS=-luuid
++LIBS=-luuid -lcom_err
+
+ progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck \
+ btrfs \
only in patch2:
unchanged:
--- btrfs-tools-0.19+20100601.orig/debian/patches/04-werror.patch
+++ btrfs-tools-0.19+20100601/debian/patches/04-werror.patch
@@ -0,0 +1,20 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: btrfs-tools/btrfs-list.c
+===================================================================
+--- btrfs-tools.orig/btrfs-list.c 2011-01-14 18:35:18.559413002 +0100
++++ btrfs-tools/btrfs-list.c 2011-01-14 18:35:02.579413002 +0100
+@@ -663,9 +663,9 @@
+ char **cache_dir_name, u64 *cache_ino,
+ char **cache_full_name)
+ {
+- u64 len;
+- u64 disk_start;
+- u64 disk_offset;
++ u64 len = 0;
++ u64 disk_start = 0;
++ u64 disk_offset = 0;
+ u8 type;
+ int compressed = 0;
+ int flags = 0;
