Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/rump Put the kernelside rump kernel headers into <rump-s...



details:   https://anonhg.NetBSD.org/src/rev/6e0974904535
branches:  trunk
changeset: 343264:6e0974904535
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Jan 26 23:12:14 2016 +0000

description:
Put the kernelside rump kernel headers into <rump-sys> instead of
sprinkling them around the faction directories.  Avoids having
to add a CPPFLAGS (or several) to pretty much every component
Makefile.

Leave compat headers around in the old locations.

The commit changes some autogenerated files, but I'll fix the
generators shortly and regen.

diffstat:

 sys/rump/dev/lib/Makefile.inc                              |    3 +-
 sys/rump/dev/lib/component_simple.c                        |    6 +-
 sys/rump/dev/lib/libaudio/Makefile                         |    4 +-
 sys/rump/dev/lib/libaudio/audio_component.c                |    8 +-
 sys/rump/dev/lib/libbpf/Makefile                           |    4 +-
 sys/rump/dev/lib/libbpf/bpf_component.c                    |    8 +-
 sys/rump/dev/lib/libcgd/Makefile                           |    4 +-
 sys/rump/dev/lib/libcgd/cgd_component.c                    |    8 +-
 sys/rump/dev/lib/libdisk/disk_component.c                  |    7 +-
 sys/rump/dev/lib/libdm/Makefile                            |    4 +-
 sys/rump/dev/lib/libdm/dm_component.c                      |    9 +-
 sys/rump/dev/lib/libdrvctl/drvctl_component.c              |    6 +-
 sys/rump/dev/lib/libfss/Makefile                           |    4 +-
 sys/rump/dev/lib/libfss/fss_component.c                    |    8 +-
 sys/rump/dev/lib/libmd/Makefile                            |    4 +-
 sys/rump/dev/lib/libmd/md_component.c                      |   10 +-
 sys/rump/dev/lib/libnetsmb/Makefile                        |    3 +-
 sys/rump/dev/lib/libnetsmb/netsmb_component.c              |   10 +-
 sys/rump/dev/lib/libopencrypto/Makefile                    |    4 +-
 sys/rump/dev/lib/libopencrypto/opencrypto_component.c      |   10 +-
 sys/rump/dev/lib/libpad/Makefile                           |    4 +-
 sys/rump/dev/lib/libpad/pad_component.c                    |    8 +-
 sys/rump/dev/lib/libpci/Makefile                           |    5 +-
 sys/rump/dev/lib/libpci/pci_at_mainbus.c                   |    8 +-
 sys/rump/dev/lib/libpud/Makefile                           |    4 +-
 sys/rump/dev/lib/libpud/pud_component.c                    |    8 +-
 sys/rump/dev/lib/libputter/Makefile                        |    4 +-
 sys/rump/dev/lib/libputter/putter_component.c              |    8 +-
 sys/rump/dev/lib/libraidframe/Makefile                     |    4 +-
 sys/rump/dev/lib/libraidframe/raidframe_component.c        |   10 +-
 sys/rump/dev/lib/librnd/Makefile                           |    4 +-
 sys/rump/dev/lib/librnd/rnd_component.c                    |   10 +-
 sys/rump/dev/lib/libscsipi/Makefile                        |    4 +-
 sys/rump/dev/lib/libscsipi/scsipi_component.c              |    7 +-
 sys/rump/dev/lib/libsysmon/Makefile                        |    4 +-
 sys/rump/dev/lib/libsysmon/sysmon_component.c              |   10 +-
 sys/rump/dev/lib/libucom/ucom_at_usb.c                     |    7 +-
 sys/rump/dev/lib/libugenhc/Makefile                        |    4 +-
 sys/rump/dev/lib/libugenhc/ugenhc.c                        |   10 +-
 sys/rump/dev/lib/libulpt/Makefile                          |    4 +-
 sys/rump/dev/lib/libulpt/ulpt_at_usb.c                     |    7 +-
 sys/rump/dev/lib/libumass/umass_component.c                |    5 +-
 sys/rump/dev/lib/libvirtio_ld/Makefile                     |    4 +-
 sys/rump/dev/lib/libvirtio_ld/ld_at_virtio.c               |    8 +-
 sys/rump/dev/lib/libvnd/Makefile                           |    4 +-
 sys/rump/dev/lib/libvnd/vnd_component.c                    |    8 +-
 sys/rump/dev/lib/libwscons/Makefile                        |    4 +-
 sys/rump/dev/lib/libwscons/wscons_component.c              |    7 +-
 sys/rump/fs/lib/libsyspuffs/Makefile                       |    5 +-
 sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c               |    8 +-
 sys/rump/fs/lib/libsyspuffs/syspuffs_component.c           |    6 +-
 sys/rump/fs/lib/libzfs/Makefile                            |    6 +-
 sys/rump/fs/lib/libzfs/zfs_component.c                     |    8 +-
 sys/rump/include/rump-sys/README                           |    6 +
 sys/rump/include/rump-sys/dev.h                            |   45 ++
 sys/rump/include/rump-sys/kern.h                           |  255 +++++++++++++
 sys/rump/include/rump-sys/kern_if.h                        |   51 ++
 sys/rump/include/rump-sys/net.h                            |   35 +
 sys/rump/include/rump-sys/net_if.h                         |    9 +
 sys/rump/include/rump-sys/vfs.h                            |   65 +++
 sys/rump/include/rump-sys/vfs_if.h                         |   69 +++
 sys/rump/kern/lib/libsys_cygwin/Makefile                   |    5 +-
 sys/rump/kern/lib/libsys_cygwin/sys_cygwin_component.c     |    4 +-
 sys/rump/kern/lib/libsys_linux/Makefile                    |    3 +-
 sys/rump/kern/lib/libsys_linux/sys_linux_component.c       |    4 +-
 sys/rump/kern/lib/libsys_sunos/Makefile                    |    5 +-
 sys/rump/kern/lib/libsys_sunos/sys_sunos_component.c       |    4 +-
 sys/rump/kern/lib/libsysproxy/Makefile                     |    4 +-
 sys/rump/kern/lib/libsysproxy/sysproxy.c                   |    6 +-
 sys/rump/kern/lib/libtty/Makefile                          |    4 +-
 sys/rump/kern/lib/libtty/tty_component.c                   |    8 +-
 sys/rump/librump/rumpdev/autoconf.c                        |    6 +-
 sys/rump/librump/rumpdev/rump_dev.c                        |    8 +-
 sys/rump/librump/rumpdev/rump_dev_private.h                |   45 +--
 sys/rump/librump/rumpkern/accessors.c                      |    6 +-
 sys/rump/librump/rumpkern/arch/generic/rump_generic_abi.c  |    6 +-
 sys/rump/librump/rumpkern/arch/generic/rump_generic_cpu.c  |    6 +-
 sys/rump/librump/rumpkern/arch/generic/rump_generic_pmap.c |    6 +-
 sys/rump/librump/rumpkern/arch/x86/rump_x86_abi.c          |    6 +-
 sys/rump/librump/rumpkern/arch/x86/rump_x86_cpu.c          |    7 +-
 sys/rump/librump/rumpkern/arch/x86/rump_x86_pmap.c         |    6 +-
 sys/rump/librump/rumpkern/arch/x86/rump_x86_spl.c          |    6 +-
 sys/rump/librump/rumpkern/cons.c                           |    8 +-
 sys/rump/librump/rumpkern/emul.c                           |    8 +-
 sys/rump/librump/rumpkern/etfs_wrap.c                      |    6 +-
 sys/rump/librump/rumpkern/hyperentropy.c                   |    8 +-
 sys/rump/librump/rumpkern/intr.c                           |    8 +-
 sys/rump/librump/rumpkern/klock.c                          |    8 +-
 sys/rump/librump/rumpkern/locks.c                          |    8 +-
 sys/rump/librump/rumpkern/locks_up.c                       |    8 +-
 sys/rump/librump/rumpkern/ltsleep.c                        |    8 +-
 sys/rump/librump/rumpkern/lwproc.c                         |    8 +-
 sys/rump/librump/rumpkern/rump.c                           |   14 +-
 sys/rump/librump/rumpkern/rump_private.h                   |  255 +------------
 sys/rump/librump/rumpkern/rump_syscalls.c                  |    7 +-
 sys/rump/librump/rumpkern/rumpcopy.c                       |    8 +-
 sys/rump/librump/rumpkern/rumpkern_if_priv.h               |   52 +--
 sys/rump/librump/rumpkern/rumpkern_if_wrappers.c           |    7 +-
 sys/rump/librump/rumpkern/rumpkern_syscalls.c              |    6 +-
 sys/rump/librump/rumpkern/scheduler.c                      |    8 +-
 sys/rump/librump/rumpkern/signals.c                        |    9 +-
 sys/rump/librump/rumpkern/sleepq.c                         |    6 +-
 sys/rump/librump/rumpkern/threads.c                        |    8 +-
 sys/rump/librump/rumpkern/vm.c                             |   12 +-
 sys/rump/librump/rumpnet/netisr.c                          |    8 +-
 sys/rump/librump/rumpnet/rump_net.c                        |    8 +-
 sys/rump/librump/rumpnet/rump_net_private.h                |   35 +-
 sys/rump/librump/rumpnet/rumpnet_if_priv.h                 |   10 +-
 sys/rump/librump/rumpnet/rumpnet_if_wrappers.c             |    8 +-
 sys/rump/librump/rumpnet/rumpnet_syscalls.c                |    6 +-
 sys/rump/librump/rumpvfs/Makefile.rumpvfs                  |    4 +-
 sys/rump/librump/rumpvfs/devnodes.c                        |    6 +-
 sys/rump/librump/rumpvfs/devnull.c                         |    6 +-
 sys/rump/librump/rumpvfs/rump_vfs.c                        |   10 +-
 sys/rump/librump/rumpvfs/rump_vfs_private.h                |   65 +---
 sys/rump/librump/rumpvfs/rumpblk.c                         |   10 +-
 sys/rump/librump/rumpvfs/rumpfs.c                          |   10 +-
 sys/rump/librump/rumpvfs/rumpvfs_compat50.c                |    8 +-
 sys/rump/librump/rumpvfs/rumpvfs_if_priv.h                 |   70 +---
 sys/rump/librump/rumpvfs/rumpvfs_if_wrappers.c             |    8 +-
 sys/rump/librump/rumpvfs/rumpvfs_syscalls.c                |    6 +-
 sys/rump/librump/rumpvfs/rumpvnode_if.c                    |    8 +-
 sys/rump/net/lib/Makefile.inc                              |    3 +-
 sys/rump/net/lib/libagr/agr_component.c                    |    7 +-
 sys/rump/net/lib/libbridge/bridge_component.c              |    7 +-
 sys/rump/net/lib/libgif/gif_component.c                    |    7 +-
 sys/rump/net/lib/liblocal/local_component.c                |    7 +-
 sys/rump/net/lib/libnet/net_component.c                    |    7 +-
 sys/rump/net/lib/libnetbt/netbt_component.c                |    7 +-
 sys/rump/net/lib/libnetinet/netinet_component.c            |    8 +-
 sys/rump/net/lib/libnetinet6/netinet6_component.c          |    7 +-
 sys/rump/net/lib/libnetmpls/netmpls_component.c            |    8 +-
 sys/rump/net/lib/libnpf/Makefile                           |    3 +-
 sys/rump/net/lib/libnpf/npf_component.c                    |    8 +-
 sys/rump/net/lib/libshmif/Makefile                         |    4 +-
 sys/rump/net/lib/libshmif/if_shmem.c                       |    9 +-
 sys/rump/net/lib/libshmif/shmif_component.c                |    7 +-
 sys/rump/net/lib/libsockin/Makefile                        |    4 +-
 sys/rump/net/lib/libsockin/sockin.c                        |    7 +-
 sys/rump/net/lib/libsockin/sockin_component.c              |    7 +-
 sys/rump/net/lib/libtap/Makefile                           |    4 +-
 sys/rump/net/lib/libtap/tap_component.c                    |    9 +-
 142 files changed, 930 insertions(+), 977 deletions(-)

diffs (truncated from 4253 to 300 lines):

diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/Makefile.inc
--- a/sys/rump/dev/lib/Makefile.inc     Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/Makefile.inc     Tue Jan 26 23:12:14 2016 +0000
@@ -1,8 +1,7 @@
-#      $NetBSD: Makefile.inc,v 1.7 2015/11/17 01:07:34 pooka Exp $
+#      $NetBSD: Makefile.inc,v 1.8 2016/01/26 23:12:14 pooka Exp $
 #
 
 RUMPTOP=       ${.CURDIR}/../../..
-CPPFLAGS+=     -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpdev
 
 RUMPDEVLIBDIR:= ${.PARSEDIR}
 
diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/component_simple.c
--- a/sys/rump/dev/lib/component_simple.c       Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/component_simple.c       Tue Jan 26 23:12:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: component_simple.c,v 1.2 2015/11/16 23:27:07 pooka Exp $       */
+/*     $NetBSD: component_simple.c,v 1.3 2016/01/26 23:12:14 pooka Exp $       */
 
 /*
  * Copyright (c) 2015 Antti Kantee.  All Rights Reserved.
@@ -26,14 +26,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: component_simple.c,v 1.2 2015/11/16 23:27:07 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component_simple.c,v 1.3 2016/01/26 23:12:14 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 
-#include "rump_private.h"
+#include <rump-sys/kern.h>
 
 #include "ioconf.c"
 
diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/libaudio/Makefile
--- a/sys/rump/dev/lib/libaudio/Makefile        Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/libaudio/Makefile        Tue Jan 26 23:12:14 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2015/10/19 16:16:32 pooka Exp $
+#      $NetBSD: Makefile,v 1.5 2016/01/26 23:12:14 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev
@@ -11,7 +11,5 @@
 SRCS=  audio.c auconv.c aurateconv.c auvolconv.c mulaw.c
 SRCS+= audio_component.c
 
-CPPFLAGS+=     -I${.CURDIR}/../../../librump/rumpvfs
-
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/libaudio/audio_component.c
--- a/sys/rump/dev/lib/libaudio/audio_component.c       Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/libaudio/audio_component.c       Tue Jan 26 23:12:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio_component.c,v 1.2 2015/06/08 12:18:04 pooka Exp $        */
+/*     $NetBSD: audio_component.c,v 1.3 2016/01/26 23:12:14 pooka Exp $        */
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio_component.c,v 1.2 2015/06/08 12:18:04 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio_component.c,v 1.3 2016/01/26 23:12:14 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -38,8 +38,8 @@
 
 #include "ioconf.c"
 
-#include "rump_private.h"
-#include "rump_vfs_private.h"
+#include <rump-sys/kern.h>
+#include <rump-sys/vfs.h>
 
 RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 {
diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/libbpf/Makefile
--- a/sys/rump/dev/lib/libbpf/Makefile  Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/libbpf/Makefile  Tue Jan 26 23:12:14 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2015/10/19 16:16:32 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2016/01/26 23:12:14 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../net
@@ -9,7 +9,5 @@
 SRCS=  bpf.c bpf_filter.c
 SRCS+= bpf_component.c
 
-CPPFLAGS+=     -I${.CURDIR}/../../../librump/rumpvfs
-
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/libbpf/bpf_component.c
--- a/sys/rump/dev/lib/libbpf/bpf_component.c   Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/libbpf/bpf_component.c   Tue Jan 26 23:12:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bpf_component.c,v 1.1 2014/03/13 02:01:04 pooka Exp $  */
+/*     $NetBSD: bpf_component.c,v 1.2 2016/01/26 23:12:14 pooka Exp $  */
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf_component.c,v 1.1 2014/03/13 02:01:04 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf_component.c,v 1.2 2016/01/26 23:12:14 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -36,8 +36,8 @@
 
 #include <net/bpf.h>
 
-#include "rump_private.h"
-#include "rump_vfs_private.h"
+#include <rump-sys/kern.h>
+#include <rump-sys/vfs.h>
 
 RUMP_COMPONENT(RUMP_COMPONENT_NET)
 {
diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/libcgd/Makefile
--- a/sys/rump/dev/lib/libcgd/Makefile  Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/libcgd/Makefile  Tue Jan 26 23:12:14 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2015/10/19 16:16:32 pooka Exp $
+#      $NetBSD: Makefile,v 1.7 2016/01/26 23:12:15 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev
@@ -11,7 +11,5 @@
 
 SRCS+= cgd_component.c
 
-CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
-
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/libcgd/cgd_component.c
--- a/sys/rump/dev/lib/libcgd/cgd_component.c   Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/libcgd/cgd_component.c   Tue Jan 26 23:12:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cgd_component.c,v 1.1 2014/03/13 01:50:51 pooka Exp $  */
+/*     $NetBSD: cgd_component.c,v 1.2 2016/01/26 23:12:15 pooka Exp $  */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -26,15 +26,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd_component.c,v 1.1 2014/03/13 01:50:51 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd_component.c,v 1.2 2016/01/26 23:12:15 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/stat.h>
 
-#include "rump_private.h"
-#include "rump_vfs_private.h"
+#include <rump-sys/kern.h>
+#include <rump-sys/vfs.h>
 
 RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 {
diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/libdisk/disk_component.c
--- a/sys/rump/dev/lib/libdisk/disk_component.c Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/libdisk/disk_component.c Tue Jan 26 23:12:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disk_component.c,v 1.1 2015/05/16 13:59:00 pooka Exp $ */
+/*     $NetBSD: disk_component.c,v 1.2 2016/01/26 23:12:15 pooka Exp $ */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -26,15 +26,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disk_component.c,v 1.1 2015/05/16 13:59:00 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disk_component.c,v 1.2 2016/01/26 23:12:15 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 
-#include "rump_private.h"
-#include "rump_dev_private.h"
+#include <rump-sys/kern.h>
 
 RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 {
diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/libdm/Makefile
--- a/sys/rump/dev/lib/libdm/Makefile   Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/libdm/Makefile   Tue Jan 26 23:12:14 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2015/10/19 16:16:32 pooka Exp $
+#      $NetBSD: Makefile,v 1.7 2016/01/26 23:12:15 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev/dm
@@ -12,7 +12,5 @@
 
 SRCS+= dm_component.c
 
-CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
-
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/libdm/dm_component.c
--- a/sys/rump/dev/lib/libdm/dm_component.c     Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/libdm/dm_component.c     Tue Jan 26 23:12:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dm_component.c,v 1.1 2014/03/13 01:54:22 pooka Exp $   */
+/*     $NetBSD: dm_component.c,v 1.2 2016/01/26 23:12:15 pooka Exp $   */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_component.c,v 1.1 2014/03/13 01:54:22 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_component.c,v 1.2 2016/01/26 23:12:15 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -36,9 +36,8 @@
 
 #include <sys/vfs_syscalls.h>
 
-#include "rump_private.h"
-#include "rump_dev_private.h"
-#include "rump_vfs_private.h"
+#include <rump-sys/kern.h>
+#include <rump-sys/vfs.h>
 
 RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 {
diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/libdrvctl/drvctl_component.c
--- a/sys/rump/dev/lib/libdrvctl/drvctl_component.c     Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/libdrvctl/drvctl_component.c     Tue Jan 26 23:12:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drvctl_component.c,v 1.1 2014/03/13 01:56:55 pooka Exp $       */
+/*     $NetBSD: drvctl_component.c,v 1.2 2016/01/26 23:12:15 pooka Exp $       */
 
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drvctl_component.c,v 1.1 2014/03/13 01:56:55 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drvctl_component.c,v 1.2 2016/01/26 23:12:15 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -35,7 +35,7 @@
 
 #include "ioconf.c"
 
-#include "rump_private.h"
+#include <rump-sys/kern.h>
 
 RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 {
diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/libfss/Makefile
--- a/sys/rump/dev/lib/libfss/Makefile  Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/libfss/Makefile  Tue Jan 26 23:12:14 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2015/10/19 16:16:32 pooka Exp $
+#      $NetBSD: Makefile,v 1.5 2016/01/26 23:12:15 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../dev
@@ -11,7 +11,5 @@
 
 SRCS+= fss_component.c
 
-CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
-
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r afadf9c9674f -r 6e0974904535 sys/rump/dev/lib/libfss/fss_component.c
--- a/sys/rump/dev/lib/libfss/fss_component.c   Tue Jan 26 22:52:14 2016 +0000
+++ b/sys/rump/dev/lib/libfss/fss_component.c   Tue Jan 26 23:12:14 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fss_component.c,v 1.1 2014/03/13 01:59:05 pooka Exp $  */
+/*     $NetBSD: fss_component.c,v 1.2 2016/01/26 23:12:15 pooka Exp $  */



Home | Main Index | Thread Index | Old Index