On Sat, 19 Apr 2014 20:26:20 Ryusuke Konishi wrote: > Yes, I agree. nilfs_cleanerd should statically link libnilfs and > libnilfsgc. I am searching the way to do that. So far I was able to do it with corrected patch (attached). I hope this time I got it right... Apologies for inconvenience... -- Best wishes, Dmitry Smirnov.
Last-Update: 2014-04-19
Forwarded: yes
Author: Dmitry Smirnov <onlyjob@xxxxxxxxxxxxxx>
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
--- a/sbin/cleanerd/Makefile.am
+++ b/sbin/cleanerd/Makefile.am
@@ -1,7 +1,8 @@
## Makefile.am
-sbin_PROGRAMS = nilfs_cleanerd
+root_sbin_PROGRAMS = nilfs_cleanerd
+AM_LDFLAGS = -static
LDADD = $(top_builddir)/lib/libnilfs.la $(top_builddir)/lib/libnilfsgc.la \
$(LIB_POSIX_MQ) -luuid
nilfs_cleanerd_SOURCES = cleanerd.c cldconfig.c \
Attachment:
signature.asc
Description: This is a digitally signed message part.
