Module Name: src
Committed By: pooka
Date: Fri Sep 4 17:21:34 UTC 2009
Modified Files:
src: Makefile
src/distrib/sets/lists/base: shl.elf shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/sys/rump: Makefile
src/sys/rump/dev: Makefile.rumpdev
src/sys/rump/dev/lib: Makefile.inc
src/sys/rump/fs: Makefile.rumpfs
Log Message:
build & install librumpdev_netsmb and librumpfs_smbfs components
To generate a diff of this commit:
cvs rdiff -u -r1.273 -r1.274 src/Makefile
cvs rdiff -u -r1.182 -r1.183 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.488 -r1.489 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1299 -r1.1300 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.85 -r1.86 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/Makefile.rumpdev
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/Makefile.inc
cvs rdiff -u -r1.15 -r1.16 src/sys/rump/fs/Makefile.rumpfs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.273 src/Makefile:1.274
--- src/Makefile:1.273 Sun Aug 30 01:49:42 2009
+++ src/Makefile Fri Sep 4 17:21:33 2009
@@ -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 @@
.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=
.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}
Index: src/distrib/sets/lists/base/shl.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.182 src/distrib/sets/lists/base/shl.elf:1.183
--- src/distrib/sets/lists/base/shl.elf:1.182 Thu Sep 3 15:35:59 2009
+++ src/distrib/sets/lists/base/shl.elf Fri Sep 4 17:21:33 2009
@@ -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
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.488 src/distrib/sets/lists/base/shl.mi:1.489
--- src/distrib/sets/lists/base/shl.mi:1.488 Thu Sep 3 15:35:59 2009
+++ src/distrib/sets/lists/base/shl.mi Fri Sep 4 17:21:33 2009
@@ -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
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1299 src/distrib/sets/lists/comp/mi:1.1300
--- src/distrib/sets/lists/comp/mi:1.1299 Thu Sep 3 15:35:59 2009
+++ src/distrib/sets/lists/comp/mi Fri Sep 4 17:21:34 2009
@@ -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
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.85 src/distrib/sets/lists/comp/shl.mi:1.86
--- src/distrib/sets/lists/comp/shl.mi:1.85 Thu Sep 3 15:35:59 2009
+++ src/distrib/sets/lists/comp/shl.mi Fri Sep 4 17:21:34 2009
@@ -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
Index: src/sys/rump/Makefile
diff -u src/sys/rump/Makefile:1.4 src/sys/rump/Makefile:1.5
--- src/sys/rump/Makefile:1.4 Mon Nov 17 10:21:44 2008
+++ src/sys/rump/Makefile Fri Sep 4 17:21:34 2009
@@ -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>
Index: src/sys/rump/dev/Makefile.rumpdev
diff -u src/sys/rump/dev/Makefile.rumpdev:1.2 src/sys/rump/dev/Makefile.rumpdev:1.3
--- src/sys/rump/dev/Makefile.rumpdev:1.2 Mon Jul 20 18:09:20 2009
+++ src/sys/rump/dev/Makefile.rumpdev Fri Sep 4 17:21:34 2009
@@ -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}
Index: src/sys/rump/dev/lib/Makefile.inc
diff -u src/sys/rump/dev/lib/Makefile.inc:1.1 src/sys/rump/dev/lib/Makefile.inc:1.2
--- src/sys/rump/dev/lib/Makefile.inc:1.1 Tue Jun 9 16:16:15 2009
+++ src/sys/rump/dev/lib/Makefile.inc Fri Sep 4 17:21:34 2009
@@ -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"
Index: src/sys/rump/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.15 src/sys/rump/fs/Makefile.rumpfs:1.16
--- src/sys/rump/fs/Makefile.rumpfs:1.15 Thu Sep 3 12:55:10 2009
+++ src/sys/rump/fs/Makefile.rumpfs Fri Sep 4 17:21:34 2009
@@ -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}
