Module Name: src
Committed By: pooka
Date: Thu Sep 3 15:35:59 UTC 2009
Modified Files:
src/distrib/sets/lists/base: md.amd64 md.sparc64 shl.elf shl.mi
src/distrib/sets/lists/comp: md.amd64 md.sparc64 mi shl.mi
src/lib: Makefile
src/sys/rump/librump: Makefile
Added Files:
src/compat/lib/librumpdev: Makefile
src/lib/librumpdev: Makefile
Log Message:
Build & install rumpdev, a device component for rump. It currently
supports autoconf and is required for example by pseudo-device rump
components.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/compat/lib/librumpdev/Makefile
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.58 -r1.59 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.181 -r1.182 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.487 -r1.488 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.1298 -r1.1299 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.142 -r1.143 src/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/librumpdev/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.65 src/distrib/sets/lists/base/md.amd64:1.66
--- src/distrib/sets/lists/base/md.amd64:1.65 Thu Sep 3 12:33:54 2009
+++ src/distrib/sets/lists/base/md.amd64 Thu Sep 3 15:35:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.65 2009/09/03 12:33:54 pooka Exp $
+# $NetBSD: md.amd64,v 1.66 2009/09/03 15:35:59 pooka Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -174,6 +174,8 @@
./usr/lib/i386/librump.so.0.0 base-compat-shlib compat,pic
./usr/lib/i386/librumpcrypto.so.0 base-compat-shlib compat,pic
./usr/lib/i386/librumpcrypto.so.0.0 base-compat-shlib compat,pic
+./usr/lib/i386/librumpdev.so.0 base-compat-shlib compat,pic
+./usr/lib/i386/librumpdev.so.0.0 base-compat-shlib compat,pic
./usr/lib/i386/librumpnet.so.0 base-compat-shlib compat,pic
./usr/lib/i386/librumpnet.so.0.0 base-compat-shlib compat,pic
./usr/lib/i386/librumpuser.so.0 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.58 src/distrib/sets/lists/base/md.sparc64:1.59
--- src/distrib/sets/lists/base/md.sparc64:1.58 Thu Sep 3 12:33:54 2009
+++ src/distrib/sets/lists/base/md.sparc64 Thu Sep 3 15:35:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.58 2009/09/03 12:33:54 pooka Exp $
+# $NetBSD: md.sparc64,v 1.59 2009/09/03 15:35:59 pooka Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-sysutil-root
./usr/bin/fdformat base-util-bin
@@ -170,6 +170,8 @@
./usr/lib/sparc/librump.so.0.0 base-compat-shlib compat,pic
./usr/lib/sparc/librumpcrypto.so.0 base-compat-shlib compat,pic
./usr/lib/sparc/librumpcrypto.so.0.0 base-compat-shlib compat,pic
+./usr/lib/sparc/librumpdev.so.0 base-compat-shlib compat,pic
+./usr/lib/sparc/librumpdev.so.0.0 base-compat-shlib compat,pic
./usr/lib/sparc/librumpnet.so.0 base-compat-shlib compat,pic
./usr/lib/sparc/librumpnet.so.0.0 base-compat-shlib compat,pic
./usr/lib/sparc/librumpuser.so.0 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/shl.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.181 src/distrib/sets/lists/base/shl.elf:1.182
--- src/distrib/sets/lists/base/shl.elf:1.181 Thu Sep 3 12:55:10 2009
+++ src/distrib/sets/lists/base/shl.elf Thu Sep 3 15:35:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.181 2009/09/03 12:55:10 pooka Exp $
+# $NetBSD: shl.elf,v 1.182 2009/09/03 15:35:59 pooka Exp $
#
# Note: Do not mark "old" major and major.minor shared libraries as
# "obsolete"; just remove the entry, as third-party applications
@@ -224,6 +224,8 @@
./usr/lib/librump.so.0 base-rump-shlib
./usr/lib/librumpcrypto.so base-rump-shlib
./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/librumpfs_cd9660.so base-rump-shlib
./usr/lib/librumpfs_cd9660.so.0 base-rump-shlib
./usr/lib/librumpfs_efs.so base-rump-shlib
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.487 src/distrib/sets/lists/base/shl.mi:1.488
--- src/distrib/sets/lists/base/shl.mi:1.487 Thu Sep 3 12:55:10 2009
+++ src/distrib/sets/lists/base/shl.mi Thu Sep 3 15:35:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.487 2009/09/03 12:55:10 pooka Exp $
+# $NetBSD: shl.mi,v 1.488 2009/09/03 15:35:59 pooka Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -119,6 +119,7 @@
./usr/lib/librt.so.1.0 base-sys-shlib
./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/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
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.53 src/distrib/sets/lists/comp/md.amd64:1.54
--- src/distrib/sets/lists/comp/md.amd64:1.53 Thu Sep 3 12:33:54 2009
+++ src/distrib/sets/lists/comp/md.amd64 Thu Sep 3 15:35:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.53 2009/09/03 12:33:54 pooka Exp $
+# $NetBSD: md.amd64,v 1.54 2009/09/03 15:35:59 pooka Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -609,6 +609,10 @@
./usr/lib/i386/librumpcrypto.so comp-sys-shlib compat,pic
./usr/lib/i386/librumpcrypto_p.a comp-c-proflib compat,profile
./usr/lib/i386/librumpcrypto_pic.a comp-c-piclib compat,pic
+./usr/lib/i386/librumpdev.a comp-c-lib compat
+./usr/lib/i386/librumpdev.so comp-sys-shlib compat,pic
+./usr/lib/i386/librumpdev_p.a comp-c-proflib compat,profile
+./usr/lib/i386/librumpdev_pic.a comp-c-piclib compat,pic
./usr/lib/i386/librumpnet.a comp-c-lib compat
./usr/lib/i386/librumpnet.so comp-sys-shlib compat,pic
./usr/lib/i386/librumpnet_p.a comp-c-proflib compat,profile
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.46 src/distrib/sets/lists/comp/md.sparc64:1.47
--- src/distrib/sets/lists/comp/md.sparc64:1.46 Thu Sep 3 12:33:54 2009
+++ src/distrib/sets/lists/comp/md.sparc64 Thu Sep 3 15:35:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.46 2009/09/03 12:33:54 pooka Exp $
+# $NetBSD: md.sparc64,v 1.47 2009/09/03 15:35:59 pooka Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
@@ -508,6 +508,10 @@
./usr/lib/sparc/librumpcrypto.so base-sys-shlib compat,pic
./usr/lib/sparc/librumpcrypto_p.a comp-c-proflib compat,profile
./usr/lib/sparc/librumpcrypto_pic.a comp-c-piclib compat,pic
+./usr/lib/sparc/librumpdev.a comp-c-lib compat
+./usr/lib/sparc/librumpdev.so base-sys-shlib compat,pic
+./usr/lib/sparc/librumpdev_p.a comp-c-proflib compat,profile
+./usr/lib/sparc/librumpdev_pic.a comp-c-piclib compat,pic
./usr/lib/sparc/librumpnet.a comp-c-lib compat
./usr/lib/sparc/librumpnet.so base-sys-shlib compat,pic
./usr/lib/sparc/librumpnet_p.a comp-c-proflib compat,profile
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1298 src/distrib/sets/lists/comp/mi:1.1299
--- src/distrib/sets/lists/comp/mi:1.1298 Thu Sep 3 12:55:10 2009
+++ src/distrib/sets/lists/comp/mi Thu Sep 3 15:35:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1298 2009/09/03 12:55:10 pooka Exp $
+# $NetBSD: mi,v 1.1299 2009/09/03 15:35:59 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2530,6 +2530,9 @@
./usr/lib/librumpcrypto.a comp-c-lib
./usr/lib/librumpcrypto_g.a -unknown- debuglib
./usr/lib/librumpcrypto_p.a comp-c-proflib profile
+./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/librumpfs_cd9660.a comp-c-lib
./usr/lib/librumpfs_cd9660_g.a -unknown- debuglib
./usr/lib/librumpfs_cd9660_p.a comp-c-proflib profile
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.84 src/distrib/sets/lists/comp/shl.mi:1.85
--- src/distrib/sets/lists/comp/shl.mi:1.84 Thu Sep 3 12:55:10 2009
+++ src/distrib/sets/lists/comp/shl.mi Thu Sep 3 15:35:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.84 2009/09/03 12:55:10 pooka Exp $
+# $NetBSD: shl.mi,v 1.85 2009/09/03 15:35:59 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -82,6 +82,7 @@
./usr/lib/librt_pic.a comp-c-piclib
./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/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
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.142 src/lib/Makefile:1.143
--- src/lib/Makefile:1.142 Thu Sep 3 12:33:54 2009
+++ src/lib/Makefile Thu Sep 3 15:35:58 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.142 2009/09/03 12:33:54 pooka Exp $
+# $NetBSD: Makefile,v 1.143 2009/09/03 15:35:58 pooka Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -83,6 +83,7 @@
.endif
SUBDIR+= librumpcrypto # depends on librump
+SUBDIR+= librumpdev # depends on librump
SUBDIR+= librumpnet # depends on librump
SUBDIR+= librumpvfs # depends on librump
Index: src/sys/rump/librump/Makefile
diff -u src/sys/rump/librump/Makefile:1.5 src/sys/rump/librump/Makefile:1.6
--- src/sys/rump/librump/Makefile:1.5 Thu Sep 3 12:35:19 2009
+++ src/sys/rump/librump/Makefile Thu Sep 3 15:35:58 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2009/09/03 12:35:19 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2009/09/03 15:35:58 pooka Exp $
#
SUBDIR= rumpkern
SUBDIR+= rumpuser
-SUBDIR+= rumpcrypto rumpnet rumpvfs
+SUBDIR+= rumpcrypto rumpdev rumpnet rumpvfs
.include <bsd.subdir.mk>
Added files:
Index: src/compat/lib/librumpdev/Makefile
diff -u /dev/null src/compat/lib/librumpdev/Makefile:1.1
--- /dev/null Thu Sep 3 15:35:59 2009
+++ src/compat/lib/librumpdev/Makefile Thu Sep 3 15:35:59 2009
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1 2009/09/03 15:35:59 pooka Exp $
+# Generated from: NetBSD: build-makefiles,v 1.7 2009/07/21 00:23:02 mrg Exp
+
+NOLINT= # defined
+NOMAN= # defined
+NONLS= # defined
+NOINFO= # defined
+NOSHARE= # defined
+LIBDPLIBS= rump ${.CURDIR}/../librump
+
+NOCHECKVER= # defined
+
+.include <bsd.obj.mk>
+
+# Resolve pathnames in variables.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
+.for var in ${_RESOLVE_VARS}
+${var}:= ${${var}}
+.endfor
+
+.include <bsd.own.mk>
+
+_CURDIR:= ${.CURDIR}
+
+.PATH: ${NETBSDSRCDIR}/lib/librumpdev
+.CURDIR:=${NETBSDSRCDIR}/lib/librumpdev
+
+.include "${NETBSDSRCDIR}/compat/Makefile.compat"
+.include "${.CURDIR}/Makefile"
+
+# Resolve pathnames from "real" Makefile, and switch .CURDIR back.
+_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
+.for var in ${_RESOLVE_VARS}
+${var}:= ${${var}}
+.endfor
+
+.CURDIR:= ${_CURDIR}
+.undef _CURDIR
Index: src/lib/librumpdev/Makefile
diff -u /dev/null src/lib/librumpdev/Makefile:1.1
--- /dev/null Thu Sep 3 15:35:59 2009
+++ src/lib/librumpdev/Makefile Thu Sep 3 15:35:59 2009
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2009/09/03 15:35:59 pooka Exp $
+#
+
+RUMPTOP= ${.CURDIR}/../../sys/rump
+
+LIBDPLIBS+= rump ${.CURDIR}/../librump
+
+WARNS= 3 # XXX: kernel isn't ready for -Wsign-compare
+
+.include "${RUMPTOP}/librump/rumpdev/Makefile.rumpdev"
