Bug#793863: Improved patch available

2015-08-21 Thread Vincent Cheng 
On Sat, Aug 1, 2015 at 11:38 AM, 殷啟聰  wrote:
> Hi,
>
> During the work on Android SDK I corrected some compiler flags for
> libf2fs_format.so, please consider this improved patch. You can also
> view the patch at
> .
> Thank you.

Sorry for the late reply!

Your patch seems to cause f2fs-tools to FTBFS in a pbuilder chroot
(see attached build log for the full log):

   dh_install
debian/tmp/sbin/dump.f2fs: error while loading shared libraries:
libf2fs.so.1: cannot open shared object file: No such file or
directory
dh_install: problem reading debian/f2fs-tools.install:
debian/rules:7: recipe for target 'binary' failed


Also, your patch introduces the following diff in d/rules:
- dh_auto_configure -- --bindir=/sbin --libdir=/lib/$(DEB_HOST_MULTIARCH)
+ dh_auto_configure -- --bindir=/sbin --libdir=/lib

Why did you drop $(DEB_HOST_MULTIARCH) from being passed to --libdir,
and then manually move various files into multiarch-compatible paths
using dh_install and dh-exec? Also, why move files from /sbin ->
/usr/sbin and /lib -> /usr/lib? That seems to be an unnecessary
change.

Regards,
Vincent


f2fs-tools_1.4.1-2_amd64.build
Description: Binary data

Bug#793863: Improved patch available

2015-08-01 Thread 殷啟聰 
Hi,

During the work on Android SDK I corrected some compiler flags for
libf2fs_format.so, please consider this improved patch. You can also
view the patch at
.
Thank you.

Regards,
Kai-Chung Yan
diff --git a/debian/changelog b/debian/changelog
index 8fb9492..2305a2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+f2fs-tools (1.4.1-2) UNRELEASED; urgency=low
+
+  * New packages:
+- libf2fs-dev
+- libf2fs-format-dev
+- libf2fs-format1
+- libf2fs1
+  * New libtool_versioning.diff: soname will include major version
+  * New libf2fs_format.diff: Produce libf2fs_format.so
+
+ -- Kai-Chung Yan   Thu, 30 Jul 2015 20:16:10 +0800
+
 f2fs-tools (1.4.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index d068f6d..92046eb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Filesystems Group 
 Uploaders: Vincent Cheng 
-Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config, uuid-dev
+Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config, uuid-dev, dh-exec
 Standards-Version: 3.9.6
 Homepage: http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git
 Vcs-Svn: svn://anonscm.debian.org/collab-maint/deb-maint/f2fs-tools/trunk
@@ -28,3 +28,46 @@ Description: Tools for Flash-Friendly File System (debug)
  System (LFS).
  .
  This package contains the debugging symbols.
+
+Package: libf2fs1
+Section: libs
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Core library for Flash-Friendly File System
+ F2FS is a new filesystem for Linux aimed at NAND flash memory-based storage
+ devices, such as SSD, eMMC, and SD cards. It is based on Log-structured File
+ System (LFS).
+
+Package: libf2fs-dev
+Section: libdevel
+Architecture: linux-any
+Depends: libf2fs1 (= ${binary:Version}), ${misc:Depends}
+Description: Core library for Flash-Friendly File System - Development files
+ F2FS is a new filesystem for Linux aimed at NAND flash memory-based storage
+ devices, such as SSD, eMMC, and SD cards. It is based on Log-structured File
+ System (LFS).
+ .
+ This package contains the development files.
+
+Package: libf2fs-format1
+Section: libs
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Library for F2FS formating
+ F2FS is a new filesystem for Linux aimed at NAND flash memory-based storage
+ devices, such as SSD, eMMC, and SD cards. It is based on Log-structured File
+ System (LFS).
+
+Package: libf2fs-format-dev
+Section: libdevel
+Architecture: linux-any
+Depends: libf2fs-dev,
+ libf2fs-format1 (= ${binary:Version}),
+ uuid-dev,
+ ${misc:Depends}
+Description: Library for F2FS formating - Development files
+ F2FS is a new filesystem for Linux aimed at NAND flash memory-based storage
+ devices, such as SSD, eMMC, and SD cards. It is based on Log-structured File
+ System (LFS).
+ .
+ This package contains the development files.
\ No newline at end of file
diff --git a/debian/f2fs-tools.install b/debian/f2fs-tools.install
new file mode 100644
index 000..0a31ff2
--- /dev/null
+++ b/debian/f2fs-tools.install
@@ -0,0 +1 @@
+debian/tmp/sbin/* usr/sbin
\ No newline at end of file
diff --git a/debian/libf2fs-dev.install b/debian/libf2fs-dev.install
new file mode 100755
index 000..48963e7
--- /dev/null
+++ b/debian/libf2fs-dev.install
@@ -0,0 +1,4 @@
+#!/usr/bin/dh-exec
+
+debian/tmp/lib/libf2fs.a  usr/lib/${DEB_HOST_MULTIARCH}
+include/* usr/include/f2fs-tools
\ No newline at end of file
diff --git a/debian/libf2fs-dev.links b/debian/libf2fs-dev.links
new file mode 100755
index 000..41d5535
--- /dev/null
+++ b/debian/libf2fs-dev.links
@@ -0,0 +1,3 @@
+#!/usr/bin/dh-exec
+
+usr/lib/${DEB_HOST_MULTIARCH}/libf2fs.so.${DEB_UPSTREAM_VERSION} 
usr/lib/${DEB_HOST_MULTIARCH}/libf2fs.so
\ No newline at end of file
diff --git a/debian/libf2fs-format-dev.install 
b/debian/libf2fs-format-dev.install
new file mode 100755
index 000..1427e3e
--- /dev/null
+++ b/debian/libf2fs-format-dev.install
@@ -0,0 +1,4 @@
+#!/usr/bin/dh-exec
+
+debian/tmp/lib/libf2fs_format.a usr/lib/${DEB_HOST_MULTIARCH}
+mkfs/*.husr/include/f2fs-tools
\ No newline at end of file
diff --git a/debian/libf2fs-format-dev.links b/debian/libf2fs-format-dev.links
new file mode 100755
index 000..53c4191
--- /dev/null
+++ b/debian/libf2fs-format-dev.links
@@ -0,0 +1,3 @@
+#!/usr/bin/dh-exec
+
+usr/lib/${DEB_HOST_MULTIARCH}/libf2fs_format.so.${DEB_UPSTREAM_VERSION} 
usr/lib/${DEB_HOST_MULTIARCH}/libf2fs_format.so
\ No newline at end of file
diff --git a/debian/libf2fs-format1.install b/debian/libf2fs-format1.install
new file mode 100755
index 000..8a80315
--- /dev/null
+++ b/debian/libf2fs-format1.install
@@ -0,0 +1,3 @@
+#!/usr/bin/dh-exec
+
+debian/tmp/lib/libf2fs_format.so