From c68cfff50d3bbb5612746c906b3f453b7764cdae Mon Sep 17 00:00:00 2001
From: Wei Liu <wei.liu2@citrix.com>
Date: Fri, 16 Oct 2015 17:15:18 +0100
Subject: [PATCH] upgrade to latest config syntax

---
 rumpbake.conf | 81 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 70 insertions(+), 11 deletions(-)

diff --git a/rumpbake.conf b/rumpbake.conf
index 34deaeb..1750782 100644
--- a/rumpbake.conf
+++ b/rumpbake.conf
@@ -1,16 +1,75 @@
 #
-# rumpbake configuration file
+# rumpbake default configuration file
 #
-# To add a new configuration `name', call addconfig()
+
+version 20150930
+
+#
+# First, define internal convenience sets.
+#
+create _foundation "basic components for the Rumprun unikernel"
+	add _foundation				\
+		-lrumpvfs			\
+		-lrumpkern_bmktc		\
+		-lrumpdev			\
+		-lrumpfs_tmpfs			\
+		-lrumpnet_config		\
+		-lrumpnet			\
+		-lrumpdev_bpf			\
+		-lrumpdev_vnd			\
+		-lrumpdev_rnd
+
+create _netinet "TCP/IP (v4)"
+	add _netinet				\
+		-lrumpnet_netinet		\
+		-lrumpnet_net			\
+		-lrumpnet
+
+create _netinet6 "TCP/IP (v6)"
+	add _netinet6				\
+		-lrumpnet_netinet6		\
+		-lrumpnet_net			\
+		-lrumpnet
+
+create _netunix "local domain sockets"
+	add _netunix				\
+		-lrumpnet_local			\
+		-lrumpnet
+
+create _stdfs "selection of file system drivers"
+	add _stdfs				\
+		-lrumpfs_ffs			\
+		-lrumpfs_cd9660			\
+		-lrumpfs_ext2fs			\
+		-lrumpdev_disk			\
+	-lrumpvfs
+
+# this is a config so that it can be assimilated
+create _sysproxy "system call proxy support"
+	add _sysproxy				\
+		-lrumpkern_sysproxy
+
+create _miconf "general useful MI/pseudo driver set"
+	assimilate _miconf		\
+		_foundation		\
+		_netinet		\
+		_netinet6		\
+		_netunix		\
+		_stdfs			\
+		_sysproxy
+
+
+#
+# then, define some end-user configs
 #
 
-RUMPBAKE_CONFVERS=20150828
+create xen_pv_qemu "Xen with paravirtualized I/O drivers"
+	assimilate xen_pv_qemu		\
+		_miconf
+	add xen_pv_qemu			\
+		-lrumpfs_kernfs		\
+		-lrumpnet_xenif		\
+		-lrumpxen_xendev	\
+		-lrumpnet_bridge	\
+		-lrumpnet_tap
 
-# Paravirtualized Xen for QEMU stubdom
-addconfig xen_pv_qemu \
-    rumpdev_vnd rumpdev_rnd rumpfs_ffs rumpfs_cd9660 rumpfs_ext2fs \
-    rumpfs_tmpfs rumpfs_kernfs rumpdev_disk rumpdev \
-    rumpnet_netinet6 rumpnet_netinet rumpnet_net rumpnet \
-    rumpnet_config rumpdev_bpf rumpnet_local rumpnet_bridge rumpnet_tap \
-    rumpkern_sysproxy \
-    rumpnet_xenif rumpxen_xendev
-- 
2.39.5