On the one thousand and ninth day rump's mainbus was moved from
rumpdev to rumpkern, liberating all rumpnet users from the need to -lrumpdev -lrumpvfs just because a loopback interface is mandatory. Rename rumpdev/autoconf.c to rumpkern/rump_autoconf.c to avoid accidentally picking up e.g. sys/arch/amd64/amd64/autoconf.c through make's .PATH. Move rumpdev/MAINBUS.ioconf to rumpkern.
This commit is contained in:
parent
554b237aba
commit
f689b51816
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.rumpdev,v 1.12 2015/10/19 16:16:38 pooka Exp $
|
||||
# $NetBSD: Makefile.rumpdev,v 1.13 2019/05/13 17:49:05 bad Exp $
|
||||
#
|
||||
|
||||
LIB= rumpdev
|
||||
|
@ -8,13 +8,10 @@ COMMENT=Rump kernel device faction
|
|||
${RUMPTOP}/../kern \
|
||||
${RUMPTOP}/../dev
|
||||
|
||||
IOCONFDIR:= ${.PARSEDIR}
|
||||
IOCONF= MAINBUS.ioconf
|
||||
|
||||
SRCS= rump_dev.c autoconf.c
|
||||
SRCS= rump_dev.c
|
||||
|
||||
# sys/kern
|
||||
SRCS+= kern_pmf.c subr_autoconf.c
|
||||
SRCS+= kern_pmf.c
|
||||
|
||||
# sys/dev
|
||||
SRCS+= dev_verbose.c
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
# $NetBSD: Makefile.rumpkern,v 1.174 2019/01/27 02:08:49 pgoyette Exp $
|
||||
# $NetBSD: Makefile.rumpkern,v 1.175 2019/05/13 17:49:05 bad Exp $
|
||||
#
|
||||
|
||||
.include "${RUMPTOP}/Makefile.rump"
|
||||
|
||||
.include <bsd.own.mk>
|
||||
IOCONFDIR:= ${.PARSEDIR}
|
||||
IOCONF= MAINBUS.ioconf
|
||||
|
||||
LIB= rump
|
||||
COMMENT= Rump kernel base
|
||||
|
@ -31,7 +30,7 @@ SRCS+= rump.c rumpcopy.c cons.c emul.c etfs_wrap.c intr.c \
|
|||
signals.c sleepq.c threads.c vm.c hyperentropy.c \
|
||||
accessors.c
|
||||
|
||||
SRCS+= rumpkern_syscalls.c
|
||||
SRCS+= rump_autoconf.c rumpkern_syscalls.c
|
||||
|
||||
# autogenerated into the correct namespace
|
||||
RUMPOBJ_NORENAME= rump_syscalls.o rump_syscalls.pico rump_syscalls.po
|
||||
|
@ -99,6 +98,7 @@ SRCS+= init_sysctl_base.c \
|
|||
kern_timeout.c \
|
||||
kern_uidinfo.c \
|
||||
param.c \
|
||||
subr_autoconf.c \
|
||||
subr_callback.c \
|
||||
subr_copy.c \
|
||||
subr_cprng.c \
|
||||
|
@ -160,6 +160,9 @@ SRCS+= rijndael-api-fst.c
|
|||
SRCS+= rijndael.c
|
||||
SRCS+= cprng_fast.c
|
||||
|
||||
.include "${RUMPTOP}/Makefile.rump"
|
||||
.include <bsd.own.mk>
|
||||
|
||||
# compat
|
||||
.if !empty(RUMP_NBCOMPAT:M50)
|
||||
SRCS+= kern_select_50.c
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: autoconf.c,v 1.9 2016/01/26 23:12:17 pooka Exp $ */
|
||||
/* $NetBSD: rump_autoconf.c,v 1.1 2019/05/13 17:49:05 bad Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
|
||||
|
@ -26,7 +26,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.9 2016/01/26 23:12:17 pooka Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rump_autoconf.c,v 1.1 2019/05/13 17:49:05 bad Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/device.h>
|
Loading…
Reference in New Issue