From 5dec96dceff190f91661454cf2c27930cd7f4b60 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Boric Date: Thu, 17 Nov 2016 13:04:14 +0100 Subject: [PATCH] rump: import librumpdev, librumpnet, librumpvfs --- distrib/sets/lists/minix-base/mi | 9 +++++++++ distrib/sets/lists/minix-comp/mi | 6 ++++++ distrib/sets/lists/minix-man/mi | 2 ++ lib/Makefile | 6 +++--- lib/librumpdev/Makefile | 10 ++++++++++ lib/librumpdev/i386 | 1 + lib/librumpdev/machine | 1 + lib/librumpdev/x86 | 1 + lib/librumpnet/Makefile | 10 ++++++++++ lib/librumpnet/i386 | 1 + lib/librumpnet/machine | 1 + lib/librumpnet/x86 | 1 + lib/librumpvfs/Makefile | 10 ++++++++++ 13 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 lib/librumpdev/Makefile create mode 120000 lib/librumpdev/i386 create mode 120000 lib/librumpdev/machine create mode 120000 lib/librumpdev/x86 create mode 100644 lib/librumpnet/Makefile create mode 120000 lib/librumpnet/i386 create mode 120000 lib/librumpnet/machine create mode 120000 lib/librumpnet/x86 create mode 100644 lib/librumpvfs/Makefile diff --git a/distrib/sets/lists/minix-base/mi b/distrib/sets/lists/minix-base/mi index edb9f19de..887fbcc7f 100644 --- a/distrib/sets/lists/minix-base/mi +++ b/distrib/sets/lists/minix-base/mi @@ -872,6 +872,9 @@ ./usr/lib/librump.so.0.0 minix-base rump ./usr/lib/librump.so.0 minix-base rump ./usr/lib/librump.so minix-base rump +./usr/lib/librumpdev.so.0.0 minix-base rump +./usr/lib/librumpdev.so.0 minix-base rump +./usr/lib/librumpdev.so minix-base rump ./usr/lib/librumpfs_cd9660.so.0.0 minix-base rump ./usr/lib/librumpfs_cd9660.so.0 minix-base rump ./usr/lib/librumpfs_cd9660.so minix-base rump @@ -953,6 +956,12 @@ ./usr/lib/librumpkern_z.so.0.0 minix-base rump ./usr/lib/librumpkern_z.so.0 minix-base rump ./usr/lib/librumpkern_z.so minix-base rump +./usr/lib/librumpnet.so.0.0 minix-base rump +./usr/lib/librumpnet.so.0 minix-base rump +./usr/lib/librumpnet.so minix-base rump +./usr/lib/librumpvfs.so.0.0 minix-base rump +./usr/lib/librumpvfs.so.0 minix-base rump +./usr/lib/librumpvfs.so minix-base rump ./usr/lib/librumpvfs_aio.so.0.0 minix-base rump ./usr/lib/librumpvfs_aio.so.0 minix-base rump ./usr/lib/librumpvfs_aio.so minix-base rump diff --git a/distrib/sets/lists/minix-comp/mi b/distrib/sets/lists/minix-comp/mi index ef9fbe367..7e9186c28 100644 --- a/distrib/sets/lists/minix-comp/mi +++ b/distrib/sets/lists/minix-comp/mi @@ -2296,6 +2296,8 @@ ./usr/lib/librmt.a minix-comp ./usr/lib/librump.a minix-comp rump ./usr/lib/librump_pic.a minix-comp rump +./usr/lib/librumpdev.a minix-comp rump +./usr/lib/librumpdev_pic.a minix-comp rump ./usr/lib/librumpfs_cd9660.a minix-comp rump ./usr/lib/librumpfs_cd9660_pic.a minix-comp rump ./usr/lib/librumpfs_efs.a minix-comp rump @@ -2350,12 +2352,16 @@ ./usr/lib/librumpkern_tty_pic.a minix-comp rump ./usr/lib/librumpkern_z.a minix-comp rump ./usr/lib/librumpkern_z_pic.a minix-comp rump +./usr/lib/librumpnet.a minix-comp rump +./usr/lib/librumpnet_pic.a minix-comp rump +./usr/lib/librumpvfs.a minix-comp rump ./usr/lib/librumpvfs_aio.a minix-comp rump ./usr/lib/librumpvfs_aio_pic.a minix-comp rump ./usr/lib/librumpvfs_fifofs.a minix-comp rump ./usr/lib/librumpvfs_fifofs_pic.a minix-comp rump ./usr/lib/librumpvfs_layerfs.a minix-comp rump ./usr/lib/librumpvfs_layerfs_pic.a minix-comp rump +./usr/lib/librumpvfs_pic.a minix-comp rump ./usr/lib/libsffs.a minix-comp ./usr/lib/libsffs_pic.a minix-comp ./usr/lib/libsqlite3.a minix-comp diff --git a/distrib/sets/lists/minix-man/mi b/distrib/sets/lists/minix-man/mi index 1a8ff5958..e9ee453e6 100644 --- a/distrib/sets/lists/minix-man/mi +++ b/distrib/sets/lists/minix-man/mi @@ -2714,6 +2714,7 @@ ./usr/man/man3/rresvport.3 minix-man ./usr/man/man3/rresvport_af.3 minix-man ./usr/man/man3/rump.3 minix-man rump +./usr/man/man3/rump_etfs.3 minix-man rump ./usr/man/man3/rump_lwproc.3 minix-man rump ./usr/man/man3/ruserok.3 minix-man ./usr/man/man3/saslc.d.3 minix-man crypto @@ -3261,6 +3262,7 @@ ./usr/man/man4/mtio.4 minix-man ./usr/man/man4/ncr810.4 minix-man ./usr/man/man4/psip.4 minix-man +./usr/man/man4/rumpfs.4 minix-man rump ./usr/man/man4/tape.4 minix-man ./usr/man/man4/tty.4 minix-man ./usr/man/man4/udp.4 minix-man diff --git a/lib/Makefile b/lib/Makefile index 5585fbfd2..52d654290 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -288,9 +288,9 @@ SUBDIR+= ../external/cddl/osnet/lib/libdtrace # depends on libproc .endif .if (${MKRUMP} != "no") -#SUBDIR+= librumpdev # depends on librump -#SUBDIR+= librumpnet # depends on librump -#SUBDIR+= librumpvfs # depends on librump +SUBDIR+= librumpdev # depends on librump +SUBDIR+= librumpnet # depends on librump +SUBDIR+= librumpvfs # depends on librump .endif .if (${MKPAM} != "no") diff --git a/lib/librumpdev/Makefile b/lib/librumpdev/Makefile new file mode 100644 index 000000000..c44a55377 --- /dev/null +++ b/lib/librumpdev/Makefile @@ -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" diff --git a/lib/librumpdev/i386 b/lib/librumpdev/i386 new file mode 120000 index 000000000..1c75cf687 --- /dev/null +++ b/lib/librumpdev/i386 @@ -0,0 +1 @@ +/home/boricj/Documents/Projets/minix/src/sys/arch/i386/include \ No newline at end of file diff --git a/lib/librumpdev/machine b/lib/librumpdev/machine new file mode 120000 index 000000000..1c75cf687 --- /dev/null +++ b/lib/librumpdev/machine @@ -0,0 +1 @@ +/home/boricj/Documents/Projets/minix/src/sys/arch/i386/include \ No newline at end of file diff --git a/lib/librumpdev/x86 b/lib/librumpdev/x86 new file mode 120000 index 000000000..a11afa2e4 --- /dev/null +++ b/lib/librumpdev/x86 @@ -0,0 +1 @@ +/home/boricj/Documents/Projets/minix/src/sys/arch/x86/include \ No newline at end of file diff --git a/lib/librumpnet/Makefile b/lib/librumpnet/Makefile new file mode 100644 index 000000000..f7dc5ff71 --- /dev/null +++ b/lib/librumpnet/Makefile @@ -0,0 +1,10 @@ +# $NetBSD: Makefile,v 1.2 2009/02/12 13:20:17 lukem Exp $ +# + +RUMPTOP= ${.CURDIR}/../../sys/rump + +LIBDPLIBS+= rump ${.CURDIR}/../librump + +WARNS= 3 # XXX: kernel isn't ready for -Wsign-compare + +.include "${RUMPTOP}/librump/rumpnet/Makefile.rumpnet" diff --git a/lib/librumpnet/i386 b/lib/librumpnet/i386 new file mode 120000 index 000000000..1c75cf687 --- /dev/null +++ b/lib/librumpnet/i386 @@ -0,0 +1 @@ +/home/boricj/Documents/Projets/minix/src/sys/arch/i386/include \ No newline at end of file diff --git a/lib/librumpnet/machine b/lib/librumpnet/machine new file mode 120000 index 000000000..1c75cf687 --- /dev/null +++ b/lib/librumpnet/machine @@ -0,0 +1 @@ +/home/boricj/Documents/Projets/minix/src/sys/arch/i386/include \ No newline at end of file diff --git a/lib/librumpnet/x86 b/lib/librumpnet/x86 new file mode 120000 index 000000000..a11afa2e4 --- /dev/null +++ b/lib/librumpnet/x86 @@ -0,0 +1 @@ +/home/boricj/Documents/Projets/minix/src/sys/arch/x86/include \ No newline at end of file diff --git a/lib/librumpvfs/Makefile b/lib/librumpvfs/Makefile new file mode 100644 index 000000000..1c7079afa --- /dev/null +++ b/lib/librumpvfs/Makefile @@ -0,0 +1,10 @@ +# $NetBSD: Makefile,v 1.5 2014/11/09 17:39:37 pooka Exp $ +# + +RUMPTOP= ${.CURDIR}/../../sys/rump + +LIBDPLIBS+= rump ${.CURDIR}/../librump + +WARNS= 3 # XXX: kernel isn't ready for -Wsign-compare + +.include "${RUMPTOP}/librump/rumpvfs/Makefile.rumpvfs"