Link self-contained file systems (i.e. do not depend on other file systems) against the kernel module on select archs.diff -r1.6 -r1.7 src/usr.sbin/puffs/Makefile.inc
(pooka)
--- src/usr.sbin/puffs/Makefile.inc 2008/11/19 14:10:49 1.6
+++ src/usr.sbin/puffs/Makefile.inc 2008/12/30 22:20:56 1.7
@@ -1,31 +1,43 @@ | @@ -1,31 +1,43 @@ | |||
1 | # $NetBSD: Makefile.inc,v 1.6 2008/11/19 14:10:49 pooka Exp $ | 1 | # $NetBSD: Makefile.inc,v 1.7 2008/12/30 22:20:56 pooka Exp $ | |
2 | ||||
3 | .include <bsd.own.mk> | |||
4 | .include <bsd.sys.mk> | |||
2 | 5 | |||
3 | USE_FORT?= yes # network client | 6 | USE_FORT?= yes # network client | |
4 | 7 | |||
5 | .if exists(${.CURDIR}/../../Makefile.inc) | 8 | .if exists(${.CURDIR}/../../Makefile.inc) | |
6 | .include "${.CURDIR}/../../Makefile.inc" | 9 | .include "${.CURDIR}/../../Makefile.inc" | |
7 | .endif | 10 | .endif | |
8 | 11 | |||
9 | .ifdef(ISRUMP) | 12 | .ifdef(ISRUMP) | |
10 | .ifdef(MOUNTNAME) | 13 | .ifdef(MOUNTNAME) | |
11 | PROG= rump_${MOUNTNAME} | 14 | PROG= rump_${MOUNTNAME} | |
12 | MAN= rump_${MOUNTNAME}.8 | 15 | MAN= rump_${MOUNTNAME}.8 | |
13 | 16 | |||
14 | MOUNTDIR= ${.CURDIR}/../../../sbin | 17 | MOUNTDIR= ${.CURDIR}/../../../sbin | |
15 | MOUNT= ${MOUNTDIR}/mount | 18 | MOUNT= ${MOUNTDIR}/mount | |
16 | 19 | |||
17 | CPPFLAGS+= -I${MOUNTDIR}/mount_${MOUNTNAME} -I${MOUNT} -DMOUNT_NOMAIN | 20 | CPPFLAGS+= -I${MOUNTDIR}/mount_${MOUNTNAME} -I${MOUNT} -DMOUNT_NOMAIN | |
18 | SRCS+= mount_${MOUNTNAME}.c rump_${MOUNTNAME}.c pathadj.c fattr.c | 21 | SRCS+= mount_${MOUNTNAME}.c rump_${MOUNTNAME}.c pathadj.c fattr.c | |
19 | 22 | |||
23 | # on select archs use the kernel module directly, otherwise fallback | |||
24 | # to the rump library | |||
25 | .ifdef(RUMPKMOD) | |||
26 | OSRELEASE!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh | |||
27 | KMODULEDIR= ${DESTDIR}/stand/${MACHINE}/${OSRELEASE}/modules/${MOUNTNAME} | |||
28 | LDADD+= ${KMODULEDIR}/${MOUNTNAME}.kmod | |||
29 | .else | |||
20 | LDADD+= -lrumpfs_${MOUNTNAME} | 30 | LDADD+= -lrumpfs_${MOUNTNAME} | |
31 | .endif | |||
32 | ||||
21 | .PATH: ${MOUNT} ${MOUNTDIR}/mount_${MOUNTNAME} | 33 | .PATH: ${MOUNT} ${MOUNTDIR}/mount_${MOUNTNAME} | |
22 | .endif # MOUNTNAME | 34 | .endif # MOUNTNAME | |
23 | 35 | |||
24 | LDADD+= -lp2k -lukfs -lrumpvfs -lrump -lrumpuser -lpuffs -lutil | 36 | LDADD+= -lp2k -lukfs -lrumpvfs -lrump -lrumpuser -lpuffs -lutil | |
25 | LDADD+= -lpthread | 37 | LDADD+= -lpthread | |
26 | 38 | |||
27 | DPADD+= ${LIBP2K} ${LIBUKFS} ${LIBRUMPVFS} ${LIBRUMP} ${LIBRUMPUSER} | 39 | DPADD+= ${LIBP2K} ${LIBUKFS} ${LIBRUMPVFS} ${LIBRUMP} ${LIBRUMPUSER} | |
28 | DPADD+= ${LIBPUFFS} ${LIBUTIL} ${LIBPTHREAD} | 40 | DPADD+= ${LIBPUFFS} ${LIBUTIL} ${LIBPTHREAD} | |
29 | 41 | |||
30 | LDFLAGS+= -Wl,--wrap=malloc | 42 | LDFLAGS+= -Wl,--wrap=malloc | |
31 | .endif # ISRUMP | 43 | .endif # ISRUMP |
--- src/usr.sbin/puffs/rump_ext2fs/Makefile 2008/11/26 19:41:11 1.3
+++ src/usr.sbin/puffs/rump_ext2fs/Makefile 2008/12/30 22:20:56 1.4
@@ -1,11 +1,14 @@ | @@ -1,11 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.3 2008/11/26 19:41:11 pooka Exp $ | 1 | # $NetBSD: Makefile,v 1.4 2008/12/30 22:20:56 pooka Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include <bsd.own.mk> | |||
5 | .undef RUMPKMOD | |||
6 | ||||
4 | MOUNTNAME= ext2fs | 7 | MOUNTNAME= ext2fs | |
5 | 8 | |||
6 | LDADD+= -lrumpfs_ufs -lrumpfs_ffs | 9 | LDADD+= -lrumpfs_ufs -lrumpfs_ffs | |
7 | DPADD+= ${LIBRUMPFS_UFS} ${LIBRUMPFS_FFS} | 10 | DPADD+= ${LIBRUMPFS_UFS} ${LIBRUMPFS_FFS} | |
8 | 11 | |||
9 | ISRUMP= # yea baby | 12 | ISRUMP= # yea baby | |
10 | 13 | |||
11 | .include <bsd.prog.mk> | 14 | .include <bsd.prog.mk> |
--- src/usr.sbin/puffs/rump_ffs/Makefile 2008/08/05 20:57:46 1.2
+++ src/usr.sbin/puffs/rump_ffs/Makefile 2008/12/30 22:20:56 1.3
@@ -1,11 +1,14 @@ | @@ -1,11 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.2 2008/08/05 20:57:46 pooka Exp $ | 1 | # $NetBSD: Makefile,v 1.3 2008/12/30 22:20:56 pooka Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include <bsd.own.mk> | |||
5 | .undef RUMPKMOD | |||
6 | ||||
4 | MOUNTNAME= ffs | 7 | MOUNTNAME= ffs | |
5 | 8 | |||
6 | LDADD+= -lrumpfs_ffs -lrumpfs_ufs | 9 | LDADD+= -lrumpfs_ffs -lrumpfs_ufs | |
7 | DPADD+= ${LIBRUMPFS_FFS} ${LIBRUMPFS_UFS} | 10 | DPADD+= ${LIBRUMPFS_FFS} ${LIBRUMPFS_UFS} | |
8 | 11 | |||
9 | ISRUMP= # affirmative | 12 | ISRUMP= # affirmative | |
10 | 13 | |||
11 | .include <bsd.prog.mk> | 14 | .include <bsd.prog.mk> |
--- src/usr.sbin/puffs/rump_lfs/Makefile 2008/08/05 20:57:46 1.2
+++ src/usr.sbin/puffs/rump_lfs/Makefile 2008/12/30 22:20:56 1.3
@@ -1,11 +1,14 @@ | @@ -1,11 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.2 2008/08/05 20:57:46 pooka Exp $ | 1 | # $NetBSD: Makefile,v 1.3 2008/12/30 22:20:56 pooka Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include <bsd.own.mk> | |||
5 | .undef RUMPKMOD | |||
6 | ||||
4 | MOUNTNAME= lfs | 7 | MOUNTNAME= lfs | |
5 | 8 | |||
6 | LDADD+= -lrumpfs_lfs -lrumpfs_ufs -lrumpfs_ffs | 9 | LDADD+= -lrumpfs_lfs -lrumpfs_ufs -lrumpfs_ffs | |
7 | DPADD+= ${LIBRUMPFS_LFS} ${LIBRUMPFS_UFS} ${LIBRUMPFS_FFS} | 10 | DPADD+= ${LIBRUMPFS_LFS} ${LIBRUMPFS_UFS} ${LIBRUMPFS_FFS} | |
8 | 11 | |||
9 | ISRUMP= # don't deny it | 12 | ISRUMP= # don't deny it | |
10 | 13 | |||
11 | .include <bsd.prog.mk> | 14 | .include <bsd.prog.mk> |
--- src/usr.sbin/puffs/rump_nfs/Makefile 2008/10/16 09:30:57 1.1
+++ src/usr.sbin/puffs/rump_nfs/Makefile 2008/12/30 22:20:56 1.2
@@ -1,20 +1,26 @@ | @@ -1,20 +1,26 @@ | |||
1 | # $NetBSD: Makefile,v 1.1 2008/10/16 09:30:57 pooka Exp $ | 1 | # $NetBSD: Makefile,v 1.2 2008/12/30 22:20:56 pooka Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include <bsd.own.mk> | |||
5 | ||||
4 | MOUNTNAME= nfs | 6 | MOUNTNAME= nfs | |
5 | 7 | |||
6 | SRCS+= getnfsargs.c | 8 | SRCS+= getnfsargs.c | |
7 | 9 | |||
8 | # One or the other of the following. Compile-time selection for now. | 10 | # One or the other of the following. Compile-time selection for now. | |
9 | # The first one uses host sockets to provide a networking stack, the | 11 | # The first one uses host sockets to provide a networking stack, the | |
10 | # second one runs the real NetBSD kernel networking stack in userspace | 12 | # second one runs the real NetBSD kernel networking stack in userspace | |
11 | # and uses /dev/tap to access the network. | 13 | # and uses /dev/tap to access the network. | |
12 | # | 14 | # | |
15 | .ifdef(RUMPKMOD) | |||
16 | LDADD+= -lrumpnet -lrumpnet_sockin | |||
17 | .else | |||
13 | LDADD+= -lrumpfs_nfs -lrumpnet -lrumpnet_sockin | 18 | LDADD+= -lrumpfs_nfs -lrumpnet -lrumpnet_sockin | |
19 | .endif | |||
14 | #LDADD+= -lrumpfs_nfs -lrumpnet -lrumpnet_net -lrumpnet_netinet \ | 20 | #LDADD+= -lrumpfs_nfs -lrumpnet -lrumpnet_net -lrumpnet_netinet \ | |
15 | -lrumpnet_virtif | 21 | -lrumpnet_virtif | |
16 | 22 | |||
17 | ISRUMP= # gives me nightmares | 23 | ISRUMP= # gives me nightmares | |
18 | #CPPFLAGS+= -DINET6 # for getnfsargs? | 24 | #CPPFLAGS+= -DINET6 # for getnfsargs? | |
19 | 25 | |||
20 | .include <bsd.prog.mk> | 26 | .include <bsd.prog.mk> |
--- src/usr.sbin/puffs/rump_sysvbfs/Makefile 2008/09/04 12:21:25 1.1
+++ src/usr.sbin/puffs/rump_sysvbfs/Makefile 2008/12/30 22:20:56 1.2
@@ -1,8 +1,11 @@ | @@ -1,8 +1,11 @@ | |||
1 | # $NetBSD: Makefile,v 1.1 2008/09/04 12:21:25 pooka Exp $ | 1 | # $NetBSD: Makefile,v 1.2 2008/12/30 22:20:56 pooka Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include <bsd.own.mk> | |||
5 | .undef RUMPKMOD | |||
6 | ||||
4 | MOUNTNAME= sysvbfs | 7 | MOUNTNAME= sysvbfs | |
5 | 8 | |||
6 | ISRUMP= # oui | 9 | ISRUMP= # oui | |
7 | 10 | |||
8 | .include <bsd.prog.mk> | 11 | .include <bsd.prog.mk> |