create config.mk into objdir

diff --git a/build-rr.sh b/build-rr.sh
index 6ddbfe2c8188799a9bf363aa9e190d83680f2fd5..17f04ed8a99e4c5327eb20a526f17a93b7c7c3ad 100755 (executable)
--- a/build-rr.sh
+++ b/build-rr.sh
@@ -289,7 +289,7 @@ buildrump ()
        [ $(${RUMPMAKE} -f bsd.own.mk -V '${_BUILDRUMP_CXX}') != 'yes' ] \
            || HAVECXX=true
 
-       makeconfigmk ${PLATFORMDIR}/config.mk
+       makeconfigmk ${RROBJ}/config.mk
 
        cat >> ${RUMPTOOLS}/mk.conf << EOF
 .if defined(LIB) && \${LIB} == "pthread"
@@ -316,7 +316,7 @@ EOF
 
 builduserspace ()
 {
-       ${MAKE} -C app-tools RUMPRUN_MKCONF=$(pwd)/${PLATFORMDIR}/config.mk
+       ${MAKE} -C app-tools
 
        usermtree ${STAGING}
 
@@ -403,6 +403,8 @@ makeconfigmk ()
        else
                echo "CONFIG_CXX=no" >> ${1}
        fi
+
+       export RUMPRUN_MKCONF=${1}
 }
 
 dobuild ()

diff --git a/platform/hw/Makefile b/platform/hw/Makefile
index e2cc4d79ee613c810900fc8ed25d5328982934a0..4b665c71c08bbd7cdd0559a4a63bae6c4ef49d83 100644 (file)
--- a/platform/hw/Makefile
+++ b/platform/hw/Makefile
@@ -1,9 +1,13 @@
+ifeq ($(RUMPRUN_MKCONF),)
+$(error RUMPRUN_MKCONF missing)
+endif
+include ${RUMPRUN_MKCONF}
+
 default: all
 
 PLATFORM_DEFAULT_TESTER=qemu
 
 include ../../global.mk
--include config.mk
 ifdef BUILDRUMP_TOOLFLAGS
 include ${BUILDRUMP_TOOLFLAGS}
 endif
@@ -67,5 +71,4 @@ cleanrump: clean
        rm -rf rump rumpobj rumptools
 
 distcleanrump: cleanrump
-       rm -f config.mk
        ${MAKE} -C ../../tests clean

diff --git a/platform/hw/pci/Makefile.pci b/platform/hw/pci/Makefile.pci
index 4fafa7b819dccbaa8f3b0e98d618803b2f09e3bd..ad7b5205d29b7fcf5e587207a29e1ee54988b47b 100644 (file)
--- a/platform/hw/pci/Makefile.pci
+++ b/platform/hw/pci/Makefile.pci
@@ -1,6 +1,6 @@
 PCIDIR!=       cd ${.PARSEDIR} ; pwd -P
 
-.include "${PCIDIR}/../config.mk"
+.include "${RUMPRUN_MKCONF}"
 .include "${BUILDRUMP_TOOLFLAGS}"
 
 PCI_HYPERCALLS=                rumppci.c rumpdma.c

diff --git a/platform/xen/Makefile b/platform/xen/Makefile
index 0e44b8b7296ab3efa0c060ffaf9d87d95a108382..73fe18bfc7dfebcd22d95e60649ba26288525636 100644 (file)
--- a/platform/xen/Makefile
+++ b/platform/xen/Makefile
@@ -1,10 +1,14 @@
+ifeq ($(RUMPRUN_MKCONF),)
+$(error RUMPRUN_MKCONF missing)
+endif
+include ${RUMPRUN_MKCONF}
+
 .PHONY: all
 all: default
 
 PLATFORM_DEFAULT_TESTER=xen
 
 include ../../global.mk
--include config.mk
 ifdef BUILDRUMP_TOOLFLAGS
 include ${BUILDRUMP_TOOLFLAGS}
 endif
@@ -74,5 +78,4 @@ cleanrump: clean
        rm -rf rump rumpobj rumptools
 
 distcleanrump: cleanrump
-       rm -f config.mk
        $(MAKE) -C ../../tests clean

diff --git a/platform/xen/pci/Makefile.pci b/platform/xen/pci/Makefile.pci
index 3b990e014b6387d6682bf3f5d66ba86190b78829..72c61e295cbe29febbba4ff7a0b9a2b55c6b2fd1 100644 (file)
--- a/platform/xen/pci/Makefile.pci
+++ b/platform/xen/pci/Makefile.pci
@@ -1,6 +1,6 @@
 PCIDIR!=       cd ${.PARSEDIR} ; pwd -P
 
-.include "${PCIDIR}/../config.mk"
+.include "${RUMPRUN_MKCONF}"
 .include "${BUILDRUMP_TOOLFLAGS}"
 
 PCI_HYPERCALLS=                rumphyper_pci.c rumphyper_dma.c

diff --git a/platform/xen/rumpxendev/Makefile b/platform/xen/rumpxendev/Makefile
index f1e0161c48dfa90647d77b1861e009832616c4a2..b9fd0f937a12f103bf7d26464fbe94f46b24bafa 100644 (file)
--- a/platform/xen/rumpxendev/Makefile
+++ b/platform/xen/rumpxendev/Makefile
@@ -14,7 +14,7 @@ CPPFLAGS+=    -I${.CURDIR}/../xen/include -D__RUMP_KERNEL__ -I${.CURDIR}/..
 CPPFLAGS+=     -I${.CURDIR}/../../../include
 
 .if ${BUILDRR:Uno} == "true"
-.include "${.CURDIR}/../config.mk"
+.include "${RUMPRUN_MKCONF}"
 CPPFLAGS+=     -I${OBJDIR}/dest.stage/include
 .endif
 

diff --git a/platform/xen/xen/Config.mk b/platform/xen/xen/Config.mk
index 9085e05b8a83a44452020d949ad32dda723e6597..9c6b308cb129cb3dfddb898805d5cd3c82d029c1 100644 (file)
--- a/platform/xen/xen/Config.mk
+++ b/platform/xen/xen/Config.mk
@@ -1,6 +1,9 @@
 # Useful config stuff
 
-include $(MINI-OS_ROOT)/../config.mk
+feq ($(RUMPRUN_MKCONF),)
+$(error RUMPRUN_MKCONF missing)
+endif
+include ${RUMPRUN_MKCONF}
 
 # Where to find xen headers from.  XXX: this can probably be done better
 ifeq ($(shell uname -s),NetBSD)

diff --git a/platform/xen/xen/Makefile b/platform/xen/xen/Makefile
index 77754a75114650bbc681a02bd6632b3307e2cb19..95a8ecd48f4ae8a065a52701faa18979472fafc8 100644 (file)
--- a/platform/xen/xen/Makefile
+++ b/platform/xen/xen/Makefile
@@ -1,5 +1,4 @@
 include ../../../global.mk
--include ../config.mk
 
 # Common Makefile for mini-os.
 #

diff --git a/tests/nolibc/Makefile b/tests/nolibc/Makefile
index 08d0735424f11a828c3f511e59235bfc26790411..b1cacf946ccd740537fcc35479572fa77b66e8ce 100644 (file)
--- a/tests/nolibc/Makefile
+++ b/tests/nolibc/Makefile
@@ -1,11 +1,14 @@
-PLATFORM?= hw
-
-include ../../global.mk
--include ../../platform/${PLATFORM}/config.mk
+ifeq ($(RUMPRUN_MKCONF),)
+$(error RUMPRUN_MKCONF missing)
+endif
+include ${RUMPRUN_MKCONF}
 
-ifdef BUILDRUMP_TOOLFLAGS
-include ${BUILDRUMP_TOOLFLAGS}
+ifeq (${BUILDRUMP_TOOLFLAGS},)
+$(error invalid config file ${RUMPRUN_MKCONF})
 endif
+include ${BUILDRUMP_TOOLFLAGS}
+
+include ../../global.mk
 
 CFLAGS+=       ${BUILDRUMP_TOOL_CFLAGS}