diff options
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | distrib/sets/lists/base/shl.elf | 6 | ||||
| -rw-r--r-- | distrib/sets/lists/base/shl.mi | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/comp/mi | 8 | ||||
| -rw-r--r-- | distrib/sets/lists/comp/shl.mi | 4 | ||||
| -rw-r--r-- | sys/rump/Makefile | 4 | ||||
| -rw-r--r-- | sys/rump/dev/Makefile.rumpdev | 5 | ||||
| -rw-r--r-- | sys/rump/dev/lib/Makefile.inc | 4 | ||||
| -rw-r--r-- | sys/rump/fs/Makefile.rumpfs | 4 |
9 files changed, 31 insertions, 15 deletions
@@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.273 2009/08/30 01:49:42 dyoung Exp $ +# $NetBSD: Makefile,v 1.274 2009/09/04 17:21:33 pooka Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -92,6 +92,7 @@ # do-lib: builds and installs prerequisites from lib. # do-gnu-lib: builds and installs prerequisites from gnu/lib. # do-external-lib: builds and installs prerequisites from external/lib. +# do-sys-rump-dev-lib: builds and installs prerequisites from sys/rump/dev/lib # do-sys-rump-fs-lib: builds and installs prerequisites from sys/rump/fs/lib # do-sys-rump-net-lib: builds and installs prerequisites from sys/rump/net/lib # do-sys-modules: builds and installs kernel modules (used by rump binaries) @@ -240,7 +241,7 @@ BUILDTARGETS+= do-lib do-gnu-lib do-external-lib .if (${MACHINE} != "evbppc") && ${MKKMOD} != "no" BUILDTARGETS+= do-sys-modules .endif -BUILDTARGETS+= do-sys-rump-fs-lib do-sys-rump-net-lib +BUILDTARGETS+= do-sys-rump-dev-lib do-sys-rump-fs-lib do-sys-rump-net-lib .if ${MKCOMPAT} != "no" BUILDTARGETS+= do-compat-lib-csu BUILDTARGETS+= do-compat-libgcc @@ -415,7 +416,7 @@ BUILD_COMPAT_LIBS= compat/lib/csu ${BUILD_CC_LIB:S/^/compat\//} compat/lib/libc BUILD_COMPAT_LIBS= .endif -.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib crypto/external/lib sys/rump/fs/lib sys/rump/net/lib sys/modules ${BUILD_COMPAT_LIBS} +.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib crypto/external/lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/net/lib sys/modules ${BUILD_COMPAT_LIBS} do-${dir:S/\//-/g}: .PHONY .MAKE .for targ in dependall install ${MAKEDIRTARGET} ${dir} ${targ} diff --git a/distrib/sets/lists/base/shl.elf b/distrib/sets/lists/base/shl.elf index e2382c5ae1a..b6886494519 100644 --- a/distrib/sets/lists/base/shl.elf +++ b/distrib/sets/lists/base/shl.elf @@ -1,4 +1,4 @@ -# $NetBSD: shl.elf,v 1.182 2009/09/03 15:35:59 pooka Exp $ +# $NetBSD: shl.elf,v 1.183 2009/09/04 17:21:33 pooka Exp $ # # Note: Do not mark "old" major and major.minor shared libraries as # "obsolete"; just remove the entry, as third-party applications @@ -226,6 +226,8 @@ ./usr/lib/librumpcrypto.so.0 base-rump-shlib ./usr/lib/librumpdev.so base-rump-shlib ./usr/lib/librumpdev.so.0 base-rump-shlib +./usr/lib/librumpdev_netsmb.so base-rump-shlib +./usr/lib/librumpdev_netsmb.so.0 base-rump-shlib ./usr/lib/librumpfs_cd9660.so base-rump-shlib ./usr/lib/librumpfs_cd9660.so.0 base-rump-shlib ./usr/lib/librumpfs_efs.so base-rump-shlib @@ -248,6 +250,8 @@ ./usr/lib/librumpfs_nilfs.so.0 base-rump-shlib ./usr/lib/librumpfs_ntfs.so base-rump-shlib ./usr/lib/librumpfs_ntfs.so.0 base-rump-shlib +./usr/lib/librumpfs_smbfs.so base-rump-shlib +./usr/lib/librumpfs_smbfs.so.0 base-rump-shlib ./usr/lib/librumpfs_syspuffs.so base-rump-shlib ./usr/lib/librumpfs_syspuffs.so.0 base-rump-shlib ./usr/lib/librumpfs_sysvbfs.so base-rump-shlib diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi index eef2adb92c5..88ee4263f49 100644 --- a/distrib/sets/lists/base/shl.mi +++ b/distrib/sets/lists/base/shl.mi @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.488 2009/09/03 15:35:59 pooka Exp $ +# $NetBSD: shl.mi,v 1.489 2009/09/04 17:21:33 pooka Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -120,6 +120,7 @@ ./usr/lib/librump.so.0.0 base-rump-shlib ./usr/lib/librumpcrypto.so.0.0 base-rump-shlib ./usr/lib/librumpdev.so.0.0 base-rump-shlib +./usr/lib/librumpdev_netsmb.so.0.0 base-rump-shlib ./usr/lib/librumpfs_cd9660.so.0.0 base-rump-shlib ./usr/lib/librumpfs_efs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_ext2fs.so.0.0 base-rump-shlib @@ -131,6 +132,7 @@ ./usr/lib/librumpfs_nfs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_nilfs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_ntfs.so.0.0 base-rump-shlib +./usr/lib/librumpfs_smbfs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_syspuffs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_sysvbfs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_tmpfs.so.0.0 base-rump-shlib diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index c8a9def0675..61a5db10116 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1299 2009/09/03 15:35:59 pooka Exp $ +# $NetBSD: mi,v 1.1300 2009/09/04 17:21:34 pooka Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2533,6 +2533,9 @@ ./usr/lib/librumpdev.a comp-c-lib ./usr/lib/librumpdev_g.a -unknown- debuglib ./usr/lib/librumpdev_p.a comp-c-proflib profile +./usr/lib/librumpdev_netsmb.a comp-c-lib +./usr/lib/librumpdev_netsmb_g.a -unknown- debuglib +./usr/lib/librumpdev_netsmb_p.a comp-c-proflib profile ./usr/lib/librumpfs_cd9660.a comp-c-lib ./usr/lib/librumpfs_cd9660_g.a -unknown- debuglib ./usr/lib/librumpfs_cd9660_p.a comp-c-proflib profile @@ -2566,6 +2569,9 @@ ./usr/lib/librumpfs_ntfs.a comp-c-lib ./usr/lib/librumpfs_ntfs_g.a -unknown- debuglib ./usr/lib/librumpfs_ntfs_p.a comp-c-proflib profile +./usr/lib/librumpfs_smbfs.a comp-c-lib +./usr/lib/librumpfs_smbfs_g.a -unknown- debuglib +./usr/lib/librumpfs_smbfs_p.a comp-c-proflib profile ./usr/lib/librumpfs_syspuffs.a comp-c-lib ./usr/lib/librumpfs_syspuffs_g.a -unknown- debuglib ./usr/lib/librumpfs_syspuffs_p.a comp-c-proflib profile diff --git a/distrib/sets/lists/comp/shl.mi b/distrib/sets/lists/comp/shl.mi index 68ac06eaf74..07df9dfbba4 100644 --- a/distrib/sets/lists/comp/shl.mi +++ b/distrib/sets/lists/comp/shl.mi @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.85 2009/09/03 15:35:59 pooka Exp $ +# $NetBSD: shl.mi,v 1.86 2009/09/04 17:21:34 pooka Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -83,6 +83,7 @@ ./usr/lib/librump_pic.a comp-c-piclib ./usr/lib/librumpcrypto_pic.a comp-c-piclib ./usr/lib/librumpdev_pic.a comp-c-piclib +./usr/lib/librumpdev_netsmb_pic.a comp-c-piclib ./usr/lib/librumpfs_cd9660_pic.a comp-c-piclib ./usr/lib/librumpfs_efs_pic.a comp-c-piclib ./usr/lib/librumpfs_ext2fs_pic.a comp-c-piclib @@ -94,6 +95,7 @@ ./usr/lib/librumpfs_nfs_pic.a comp-c-piclib ./usr/lib/librumpfs_nilfs_pic.a comp-c-piclib ./usr/lib/librumpfs_ntfs_pic.a comp-c-piclib +./usr/lib/librumpfs_smbfs_pic.a comp-c-piclib ./usr/lib/librumpfs_syspuffs_pic.a comp-c-piclib ./usr/lib/librumpfs_sysvbfs_pic.a comp-c-piclib ./usr/lib/librumpfs_tmpfs_pic.a comp-c-piclib diff --git a/sys/rump/Makefile b/sys/rump/Makefile index 578477cd66e..69aa74e3c34 100644 --- a/sys/rump/Makefile +++ b/sys/rump/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2008/11/17 10:21:44 pooka Exp $ +# $NetBSD: Makefile,v 1.5 2009/09/04 17:21:34 pooka Exp $ # -SUBDIR= include librump fs net +SUBDIR= include librump dev fs net .include <bsd.subdir.mk> diff --git a/sys/rump/dev/Makefile.rumpdev b/sys/rump/dev/Makefile.rumpdev index 5d7cad2dd16..7151b93b584 100644 --- a/sys/rump/dev/Makefile.rumpdev +++ b/sys/rump/dev/Makefile.rumpdev @@ -1,7 +1,8 @@ -# $NetBSD: Makefile.rumpdev,v 1.2 2009/07/20 18:09:20 pooka Exp $ +# $NetBSD: Makefile.rumpdev,v 1.3 2009/09/04 17:21:34 pooka Exp $ # -RUMPDEVLIST= cgd disk raidframe +#RUMPDEVLIST= cgd disk raidframe +RUMPDEVLIST= netsmb .for var in ${RUMPDEVLIST} RUMPDEVLIBS+=lib${var} diff --git a/sys/rump/dev/lib/Makefile.inc b/sys/rump/dev/lib/Makefile.inc index 37fdfeeedf5..659a673592e 100644 --- a/sys/rump/dev/lib/Makefile.inc +++ b/sys/rump/dev/lib/Makefile.inc @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.inc,v 1.1 2009/06/09 16:16:15 pooka Exp $ +# $NetBSD: Makefile.inc,v 1.2 2009/09/04 17:21:34 pooka Exp $ # RUMPTOP= ${.CURDIR}/../../.. -CPPFLAGS+= -I${RUMPTOP}/librump/rumpdev/opt +CPPFLAGS+= -I${RUMPTOP}/librump/rumpdev -I${RUMPTOP}/librump/rumpdev/opt .include "${RUMPTOP}/Makefile.rump" diff --git a/sys/rump/fs/Makefile.rumpfs b/sys/rump/fs/Makefile.rumpfs index f5234972785..6ef677e48ee 100644 --- a/sys/rump/fs/Makefile.rumpfs +++ b/sys/rump/fs/Makefile.rumpfs @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.rumpfs,v 1.15 2009/09/03 12:55:10 pooka Exp $ +# $NetBSD: Makefile.rumpfs,v 1.16 2009/09/04 17:21:34 pooka Exp $ # RUMPFSLIST= cd9660 efs ext2fs fdesc ffs hfs lfs msdos nfs nilfs ntfs -RUMPFSLIST+= syspuffs sysvbfs tmpfs udf +RUMPFSLIST+= smbfs syspuffs sysvbfs tmpfs udf .for var in ${RUMPFSLIST} RUMPFSLIBS+=lib${var} |
