[src/trunk]: src/usr.sbin/puffs/rump_lfs Link fs components into binary inste...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6dcc8c85fde2
branches:  trunk
changeset: 748792:6dcc8c85fde2
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Nov 05 14:17:07 2009 +0000

description:
Link fs components into binary instead of loading dynamically now
that it's possible (dependency handling changes to rumpuser_dl).

diffstat:

 usr.sbin/puffs/rump_lfs/Makefile   |   6 ++++--
 usr.sbin/puffs/rump_lfs/rump_lfs.c |  18 ++++--------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diffs (57 lines):

diff -r fe38215c87b7 -r 6dcc8c85fde2 usr.sbin/puffs/rump_lfs/Makefile
--- a/usr.sbin/puffs/rump_lfs/Makefile  Thu Nov 05 14:13:03 2009 +0000
+++ b/usr.sbin/puffs/rump_lfs/Makefile  Thu Nov 05 14:17:07 2009 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: Makefile,v 1.6 2009/08/06 01:00:04 pooka Exp $
+#      $NetBSD: Makefile,v 1.7 2009/11/05 14:17:07 pooka Exp $
 #
 
 .include <bsd.own.mk>
 
 MOUNTNAME=     lfs
-DONOTLINKLIBS= # FFS and LFS loaded dynamically
+
+LDADD+=                -lrumpfs_ffs
+DPADD+=                ${LIBRUMPFS_FFS}
 
 ISRUMP=                # don't deny it
 
diff -r fe38215c87b7 -r 6dcc8c85fde2 usr.sbin/puffs/rump_lfs/rump_lfs.c
--- a/usr.sbin/puffs/rump_lfs/rump_lfs.c        Thu Nov 05 14:13:03 2009 +0000
+++ b/usr.sbin/puffs/rump_lfs/rump_lfs.c        Thu Nov 05 14:17:07 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump_lfs.c,v 1.11 2009/11/05 12:00:18 pooka Exp $      */
+/*     $NetBSD: rump_lfs.c,v 1.12 2009/11/05 14:17:07 pooka Exp $      */
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -68,19 +68,6 @@
        int rv;
 
        setprogname(argv[0]);
-       p2m = p2k_init(0);
-       if (!p2m)
-               err(1, "init p2k");
-
-       /*
-        * Load FFS and LFS already here.  we need both and link set
-        * lossage does not allow them to be linked on the command line.
-        */
-       ukfs_init();
-       if (ukfs_modload("librumpfs_ffs.so") != 1)
-               err(1, "modload ffs");
-       if (ukfs_modload("librumpfs_lfs.so") != 1)
-               err(1, "modload lfs");
 
        UKFS_PARTITION_ARGVPROBE(part);
        if (part != UKFS_PARTITION_NONE) {
@@ -88,6 +75,9 @@
        }
        mount_lfs_parseargs(argc, argv, &args, &mntflags, canon_dev, canon_dir);
 
+       p2m = p2k_init(0);
+       if (!p2m)
+               err(1, "init p2k");
        /*
         * XXX: this particular piece inspired by the cleaner code.
         * obviously FIXXXME along with the cleaner.