Link sysproxy component based on bake recipe, kill $topdir/config.mk

rumpkernel · Jun 29, 2015 · 3430430 · 3430430
1 parent 5d926da
commit 3430430
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 25 deletions.
diff --git a/app-tools/rumpbake.conf b/app-tools/rumpbake.conf
@@ -27,26 +27,28 @@ LIBS_NETINET="rumpnet_netinet6 rumpnet_netinet rumpnet_net rumpnet"
 LIBS_NETCONFIG="rumpnet_config"
 LIBS_NETBPF="rumpdev_bpf"
 LIBS_NETUNIX="rumpnet_local"
+LIBS_SYSPROXY="rumpkern_sysproxy"
 
 LIBS_XEN_NET="rumpnet_xenif"
 LIBS_XEN="rumpxen_xendev rumpxen_tc"
 
 # Paravirtualized Xen
 addconfig xen_pv rumprun-xen \
-    RND FS KERNFS DISK NETINET NETUNIX NETBPF NETCONFIG XEN XEN_NET
+    RND FS KERNFS DISK NETINET NETUNIX NETBPF NETCONFIG XEN XEN_NET SYSPROXY
 
 # Paravirtualized Xen with PCI drivers
 # (not a whole lot of them, but some anyway)
 addconfig xen_pci rumprun-xen \
-    PCI PCI_NET RND FS KERNFS DISK NETINET NETUNIX NETBPF NETCONFIG XEN XEN_NET
+    PCI PCI_NET RND FS KERNFS DISK NETINET NETUNIX NETBPF NETCONFIG	\
+    XEN XEN_NET SYSPROXY
 
 # Generic (PC-compatible) bare metal
 addconfig hw_generic rumprun-bmk \
     VIO VIO_NET VIO_LD VIO_RND PCI PCI_NET VND RND FS DISK \
-    NETINET NETUNIX NETBPF NETCONFIG \
+    NETINET NETUNIX NETBPF NETCONFIG SYSPROXY \
     AUDIO AUDIO_AC97 AUDIO_AUICH AUDIO_EAP AUDIO_HDA USB SCSI
 
 # virtio hw
 addconfig hw_virtio rumprun-bmk \
     VIO VIO_NET VIO_LD VIO_RND PCI RND VND FS DISK \
-    NETINET NETUNIX NETBPF NETCONFIG
+    NETINET NETUNIX NETBPF NETCONFIG SYSPROXY
diff --git a/config.mk b/config.mk
diff --git a/lib/librumprun_base/Makefile b/lib/librumprun_base/Makefile
@@ -1,7 +1,3 @@
-CONFIG_MK=	${.CURDIR}/../../config.mk
-DPSRCS+=	${CONFIG_MK}
-.include	"${CONFIG_MK}"
-
 LIB=		rumprun_base
 LIBISPRIVATE=	# defined
 
@@ -10,12 +6,8 @@ SRCS+=		parseargs.c rumpconfig.c
 SRCS+=		malloc.c netbsd_initfini.c signals.c
 SRCS+=		syscall_mman.c syscall_misc.c
 SRCS+=		__errno.c _lwp.c libc_stubs.c
+SRCS+=		sysproxy.c
 
 CPPFLAGS+=	-I${.CURDIR}/../../include
 
-.if ${CONFIG_SYSPROXY:U} == "yes"
-CPPFLAGS+=	-DRUMP_SYSPROXY
-SRCS+=		sysproxy.c
-.endif
-
 .include <bsd.lib.mk>
diff --git a/lib/librumprun_base/rumprun.c b/lib/librumprun_base/rumprun.c
@@ -54,12 +54,14 @@
 static pthread_mutex_t w_mtx;
 static pthread_cond_t w_cv;
 
+int rumprun_enosys(void);
 int
-rumprun_notmain(int argc, char **argv)
+rumprun_enosys(void)
 {
 
 	return ENOSYS;
 }
+__strong_alias(rumprun_notmain,rumprun_enosys);
 __weak_alias(rumpbake_main1,rumprun_notmain);
 __weak_alias(rumpbake_main2,rumprun_notmain);
 __weak_alias(rumpbake_main3,rumprun_notmain);
@@ -69,6 +71,8 @@ __weak_alias(rumpbake_main6,rumprun_notmain);
 __weak_alias(rumpbake_main7,rumprun_notmain);
 __weak_alias(rumpbake_main8,rumprun_notmain);
 
+__weak_alias(rump_init_server,rumprun_enosys);
+
 void
 rumprun_boot(char *cmdline)
 {

diff --git a/platform/Makefile.inc b/platform/Makefile.inc
@@ -14,14 +14,9 @@ RUMPKERN_LIB:=	-lrump
 LDFLAGS_BAKE+=	-L${BASEDIR}/${PLATFORM} -L${COREDIR}/${PLATFORM}	\
 		-L${RUMPUSERDIR}/${PLATFORM}
 
-ifeq (${CONFIG_SYSPROXY},yes)
-LIBS_SYSPROXY=  -lrumpkern_sysproxy
-endif
-
 LIBS_USERSTUB:=	$(shell pwd)/pseudolinkstubs.o
 
-RUMP_LDLIBS:=	--whole-archive ${LIBS_SYSPROXY} ${RUMPKERN_LIB}	\
-		--no-whole-archive
+RUMP_LDLIBS:=	--whole-archive ${RUMPKERN_LIB} --no-whole-archive
 RUMP_STUBLDLIBS:=${LIBS_USERSTUB}
 
 .PHONY: ${BASEDIR}/${PLATFORM}/librumprun_base.a

diff --git a/platform/hw/Makefile b/platform/hw/Makefile
@@ -4,7 +4,6 @@ OBJ_DIR=.
 
 all: app-tools include/bmk/machine rumprun.o commonlibs buildtest
 
-include ../../config.mk
 include ../../global.mk
 -include config.mk
 ifdef BUILDRUMP_TOOLFLAGS

diff --git a/platform/xen/Makefile b/platform/xen/Makefile
@@ -4,7 +4,6 @@ PLATFORM_DEFAULT_TESTER=xen
 .PHONY: default
 default: prepare mini-os commonlibs rumprun app-tools buildtest
 
-include ../../config.mk
 include ../../global.mk
 -include config.mk
 ifdef BUILDRUMP_TOOLFLAGS