Re: few patches from Debian

[Dmitry Smirnov <onlyjob-8fiUuRrzOP0dnm+yROfE0A@public.gmane.org>]

[-- Attachment #1.1: Type: text/plain, Size: 3838 bytes --]

=2D-nextPart8644279.qaQxpZWPAB
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"

On Mon, 14 Apr 2014 06:36:54 Ryusuke Konishi wrote:
> fhs.patch introduced the following error:
> 
>  $ ./autogen.sh
>  $ ./configure
>  $ make
>  $ sudo make install
>  ...
>  make[2]: Entering directory `/home/ryusuke/git/nilfs-utils/sbin/cleanerd'
>  make[3]: Entering directory `/home/ryusuke/git/nilfs-utils/sbin/cleanerd'
>   /bin/mkdir -p '/etc'
>   /usr/bin/install -c -m 644 nilfs_cleanerd.conf '/etc'
>   /bin/mkdir -p 'NONE/sbin'
>    /bin/sh ../../libtool   --mode=install /usr/bin/install -c nilfs_cleanerd
> 'NONE/sbin' libtool: install: `NONE/sbin' must be an absolute directory
> name
>  libtool: install: Try `libtool --help --mode=install' for more information.
> make[3]: *** [install-sbinPROGRAMS] Error 1
>  make[3]: Leaving directory `/home/ryusuke/git/nilfs-utils/sbin/cleanerd'
>  make[2]: *** [install-am] Error 2
>  make[2]: Leaving directory `/home/ryusuke/git/nilfs-utils/sbin/cleanerd'
>  make[1]: *** [install-recursive] Error 1
>  make[1]: Leaving directory `/home/ryusuke/git/nilfs-utils/sbin'
>  make: *** [install-recursive] Error 1
> 
> Can you fix this error ?

O, my bad, sorry...
Strangely enough I did not hit this error because I was explicitly passing
"--prefix=/usr" to "./configure".

Please find updated patch attached. It should be fine but there might be more 
elegant way to implement this with autotools.

By the way it's pretty scary to do 

    sudo make install

I'd rather invoke as (for example) as:

    make install DESTDIR=/tmp/nilfs-tools.test

Thank you.

=2D- 
Regards,
 Dmitry Smirnov.

=2D-nextPart8644279.qaQxpZWPAB
Content-Disposition: attachment; filename="fhs.patch"
Content-Transfer-Encoding: 7Bit
Content-Type: text/x-patch; charset="UTF-8"; name="fhs.patch"

Last-Update: 2014-04-16
Forwarded: yes
Author: Dmitry Smirnov <onlyjob-IGUgQLVVQiRCV4ILt04nZQ@public.gmane.org>
Description: install nilfs-* executables to /usr/sbin:
 Fixes the following problems (thanks, `adequate`):
  bin-or-sbin-binary-requires-usr-lib-library
    /sbin/nilfs-clean => /usr/lib/x86_64-linux-gnu/libnilfscleaner.so.0
    /sbin/nilfs-clean => /usr/lib/x86_64-linux-gnu/libnilfs.so.0
    /sbin/nilfs-resize => /usr/lib/x86_64-linux-gnu/libnilfs.so.0
    /sbin/nilfs-resize => /usr/lib/x86_64-linux-gnu/libnilfsgc.so.0
    /sbin/nilfs-tune => /usr/lib/x86_64-linux-gnu/libnilfs.so.0
    /sbin/nilfs_cleanerd => /usr/lib/x86_64-linux-gnu/libnilfs.so.0
    /sbin/nilfs_cleanerd => /usr/lib/x86_64-linux-gnu/libnilfsgc.so.0

=2D-- a/configure.ac
+++ b/configure.ac
@@ -165,9 +165,12 @@
 AC_SYS_LARGEFILE
 
 # Install directories
 AC_PREFIX_DEFAULT([/usr])
=2DAC_SUBST([sbindir], [/sbin])
+test "x$prefix" = "xNONE" && prefix="/usr"
+test "x$exec_prefix" = "xNONE" && exec_prefix="${prefix}"
+AC_SUBST([root_sbindir], [/sbin])
+AC_SUBST([sbindir], [${exec_prefix}/sbin])
 AC_SUBST([sysconfdir], [/etc])
 AC_SUBST([localstatedir], [/var])
 
 AC_CONFIG_FILES([Makefile
=2D-- a/sbin/mkfs/Makefile.am
+++ b/sbin/mkfs/Makefile.am
@@ -5,9 +5,9 @@
 LDADD = -luuid $(LIB_BLKID) $(top_builddir)/lib/libnilfsfeature.la \
 	$(top_builddir)/lib/libmountchk.la \
 	$(top_builddir)/lib/libcrc32.la
 
=2Dsbin_PROGRAMS = mkfs.nilfs2
+root_sbin_PROGRAMS = mkfs.nilfs2
 
 mkfs_nilfs2_SOURCES = mkfs.c bitops.c mkfs.h
 
 EXTRA_DIST = .gitignore
=2D-- a/sbin/mount/Makefile.am
+++ b/sbin/mount/Makefile.am
@@ -10,9 +10,9 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 LDADD = $(top_builddir)/lib/librealpath.la \
 	$(top_builddir)/lib/libcleanerexec.la $(LIB_MOUNT) $(LIB_SELINUX)
 
=2Dsbin_PROGRAMS = mount.nilfs2 umount.nilfs2
+root_sbin_PROGRAMS = mount.nilfs2 umount.nilfs2
 
 if CONFIG_LIBMOUNT
 
 COMMONSOURCES += mount_attrs.c

=2D-nextPart8644279.qaQxpZWPAB--
This is a multi-part message in MIME format.

[-- Attachment #1.2: Type: text/plain, Size: 1544 bytes --]

On Mon, 14 Apr 2014 06:36:54 Ryusuke Konishi wrote:
> fhs.patch introduced the following error:
> 
>  $ ./autogen.sh
>  $ ./configure
>  $ make
>  $ sudo make install
>  ...
>  make[2]: Entering directory `/home/ryusuke/git/nilfs-utils/sbin/cleanerd'
>  make[3]: Entering directory `/home/ryusuke/git/nilfs-utils/sbin/cleanerd'
>   /bin/mkdir -p '/etc'
>   /usr/bin/install -c -m 644 nilfs_cleanerd.conf '/etc'
>   /bin/mkdir -p 'NONE/sbin'
>    /bin/sh ../../libtool   --mode=install /usr/bin/install -c nilfs_cleanerd
> 'NONE/sbin' libtool: install: `NONE/sbin' must be an absolute directory
> name
>  libtool: install: Try `libtool --help --mode=install' for more information.
> make[3]: *** [install-sbinPROGRAMS] Error 1
>  make[3]: Leaving directory `/home/ryusuke/git/nilfs-utils/sbin/cleanerd'
>  make[2]: *** [install-am] Error 2
>  make[2]: Leaving directory `/home/ryusuke/git/nilfs-utils/sbin/cleanerd'
>  make[1]: *** [install-recursive] Error 1
>  make[1]: Leaving directory `/home/ryusuke/git/nilfs-utils/sbin'
>  make: *** [install-recursive] Error 1
> 
> Can you fix this error ?

O, my bad, sorry...
Strangely enough I did not hit this error because I was explicitly passing
"--prefix=/usr" to "./configure".

Please find updated patch attached. It should be fine but there might be more 
elegant way to implement this with autotools.

By the way it's pretty scary to do 

    sudo make install

I'd rather invoke as (for example) as:

    make install DESTDIR=/tmp/nilfs-tools.test

Thank you.

-- 
Regards,
 Dmitry Smirnov.

[-- Attachment #1.3: fhs.patch --]
[-- Type: text/x-patch, Size: 1911 bytes --]

Last-Update: 2014-04-16
Forwarded: yes
Author: Dmitry Smirnov <onlyjob-IGUgQLVVQiRCV4ILt04nZQ@public.gmane.org>
Description: install nilfs-* executables to /usr/sbin:
 Fixes the following problems (thanks, `adequate`):
  bin-or-sbin-binary-requires-usr-lib-library
    /sbin/nilfs-clean => /usr/lib/x86_64-linux-gnu/libnilfscleaner.so.0
    /sbin/nilfs-clean => /usr/lib/x86_64-linux-gnu/libnilfs.so.0
    /sbin/nilfs-resize => /usr/lib/x86_64-linux-gnu/libnilfs.so.0
    /sbin/nilfs-resize => /usr/lib/x86_64-linux-gnu/libnilfsgc.so.0
    /sbin/nilfs-tune => /usr/lib/x86_64-linux-gnu/libnilfs.so.0
    /sbin/nilfs_cleanerd => /usr/lib/x86_64-linux-gnu/libnilfs.so.0
    /sbin/nilfs_cleanerd => /usr/lib/x86_64-linux-gnu/libnilfsgc.so.0

--- a/configure.ac
+++ b/configure.ac
@@ -165,9 +165,12 @@
 AC_SYS_LARGEFILE
 
 # Install directories
 AC_PREFIX_DEFAULT([/usr])
-AC_SUBST([sbindir], [/sbin])
+test "x$prefix" = "xNONE" && prefix="/usr"
+test "x$exec_prefix" = "xNONE" && exec_prefix="${prefix}"
+AC_SUBST([root_sbindir], [/sbin])
+AC_SUBST([sbindir], [${exec_prefix}/sbin])
 AC_SUBST([sysconfdir], [/etc])
 AC_SUBST([localstatedir], [/var])
 
 AC_CONFIG_FILES([Makefile
--- a/sbin/mkfs/Makefile.am
+++ b/sbin/mkfs/Makefile.am
@@ -5,9 +5,9 @@
 LDADD = -luuid $(LIB_BLKID) $(top_builddir)/lib/libnilfsfeature.la \
 	$(top_builddir)/lib/libmountchk.la \
 	$(top_builddir)/lib/libcrc32.la
 
-sbin_PROGRAMS = mkfs.nilfs2
+root_sbin_PROGRAMS = mkfs.nilfs2
 
 mkfs_nilfs2_SOURCES = mkfs.c bitops.c mkfs.h
 
 EXTRA_DIST = .gitignore
--- a/sbin/mount/Makefile.am
+++ b/sbin/mount/Makefile.am
@@ -10,9 +10,9 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 LDADD = $(top_builddir)/lib/librealpath.la \
 	$(top_builddir)/lib/libcleanerexec.la $(LIB_MOUNT) $(LIB_SELINUX)
 
-sbin_PROGRAMS = mount.nilfs2 umount.nilfs2
+root_sbin_PROGRAMS = mount.nilfs2 umount.nilfs2
 
 if CONFIG_LIBMOUNT
 
 COMMONSOURCES += mount_attrs.c

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]