Provide a Xen 4.6 config file

Move the current defconfig to configs/config-master (used to build a
system from the master branches).
Make the Xen 4.6 config file the default.
Also provide a Xen 4.5 config file.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/configs/config-4.5 b/configs/config-4.5
new file mode 100644 (file)
index 0000000..e3b92d5
--- /dev/null
+++ b/configs/config-4.5
@@ -0,0 +1,47 @@
+# Config variables for raisin
+# Setup a Xen 4.5 based system
+
+# Components
+## All components: seabios ovmf xen qemu qemu_traditional grub libvirt linux
+## Core xen functionality: xen
+## Remove a component from the list below, if you want to disable it
+## You can manually overwrite this list using the COMPONENTS
+## environmental variable.
+ENABLED_COMPONENTS="seabios ovmf xen qemu qemu_traditional grub libvirt"
+
+# Build config
+## Make command to run
+MAKE="make -j2"
+## Installation prefix (configure --prefix)
+PREFIX="/usr"
+## Install everything under DESTDIR
+## If you want to install under / run raise.sh -i
+DESTDIR=dist
+
+# Git urls. Use the http urls if you are behind a firewall.
+#XEN_URL="http://xenbits.xen.org/git-http/xen.git"
+#GRUB_URL="http://git.savannah.gnu.org/r/grub.git"
+#LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git"
+XEN_URL="git://xenbits.xen.org/xen.git"
+QEMU_URL="git://xenbits.xen.org/qemu-upstream-4.5-testing.git"
+QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-4.5-testing.git"
+SEABIOS_URL="git://xenbits.xen.org/seabios.git"
+GRUB_URL="git://git.savannah.gnu.org/grub.git"
+LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
+OVMF_URL="git://xenbits.xen.org/ovmf.git"
+LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
+
+# Software versions.
+XEN_REVISION="origin/stable-4.5"
+QEMU_REVISION="master"
+QEMU_TRADITIONAL_REVISION="master"
+SEABIOS_REVISION="rel-1.7.5"
+GRUB_REVISION="master"
+LIBVIRT_REVISION="origin/xen-tested-master"
+OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
+LINUX_REVISION="master"
+
+# Tests
+## All tests: busybox-pv busybox-hvm
+## ENABLED_TESTS is the list of test run by raise test
+ENABLED_TESTS="busybox-pv busybox-hvm"

diff --git a/configs/config-4.6 b/configs/config-4.6
new file mode 100644 (file)
index 0000000..ebd45e7
--- /dev/null
+++ b/configs/config-4.6
@@ -0,0 +1,47 @@
+# Config variables for raisin
+# Setup a Xen 4.6 based system
+
+# Components
+## All components: seabios ovmf xen qemu qemu_traditional grub libvirt linux
+## Core xen functionality: xen
+## Remove a component from the list below, if you want to disable it
+## You can manually overwrite this list using the COMPONENTS
+## environmental variable.
+ENABLED_COMPONENTS="seabios ovmf xen qemu qemu_traditional grub libvirt"
+
+# Build config
+## Make command to run
+MAKE="make -j2"
+## Installation prefix (configure --prefix)
+PREFIX="/usr"
+## Install everything under DESTDIR
+## If you want to install under / run raise.sh -i
+DESTDIR=dist
+
+# Git urls. Use the http urls if you are behind a firewall.
+#XEN_URL="http://xenbits.xen.org/git-http/xen.git"
+#GRUB_URL="http://git.savannah.gnu.org/r/grub.git"
+#LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git"
+XEN_URL="git://xenbits.xen.org/xen.git"
+QEMU_URL="git://xenbits.xen.org/qemu-upstream-4.6-testing.git"
+QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-4.6-testing.git"
+SEABIOS_URL="git://xenbits.xen.org/seabios.git"
+GRUB_URL="git://git.savannah.gnu.org/grub.git"
+LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
+OVMF_URL="git://xenbits.xen.org/ovmf.git"
+LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
+
+# Software versions.
+XEN_REVISION="origin/stable-4.6"
+QEMU_REVISION="master"
+QEMU_TRADITIONAL_REVISION="master"
+SEABIOS_REVISION="rel-1.8.2"
+GRUB_REVISION="master"
+LIBVIRT_REVISION="origin/xen-tested-master"
+OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
+LINUX_REVISION="master"
+
+# Tests
+## All tests: busybox-pv busybox-hvm
+## ENABLED_TESTS is the list of test run by raise test
+ENABLED_TESTS="busybox-pv busybox-hvm"

diff --git a/configs/config-master b/configs/config-master
new file mode 100644 (file)
index 0000000..b218708
--- /dev/null
+++ b/configs/config-master
@@ -0,0 +1,46 @@
+# Config variables for raisin
+
+# Components
+## All components: seabios ovmf xen qemu qemu_traditional grub libvirt linux
+## Core xen functionality: xen
+## Remove a component from the list below, if you want to disable it
+## You can manually overwrite this list using the COMPONENTS
+## environmental variable.
+ENABLED_COMPONENTS="seabios ovmf xen qemu qemu_traditional grub libvirt"
+
+# Build config
+## Make command to run
+MAKE="make -j2"
+## Installation prefix (configure --prefix)
+PREFIX="/usr"
+## Install everything under DESTDIR
+## If you want to install under / run raise.sh -i
+DESTDIR=dist
+
+# Git urls. Use the http urls if you are behind a firewall.
+#XEN_URL="http://xenbits.xen.org/git-http/xen.git"
+#GRUB_URL="http://git.savannah.gnu.org/r/grub.git"
+#LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git"
+XEN_URL="git://xenbits.xen.org/xen.git"
+QEMU_URL="git://xenbits.xen.org/qemu-upstream-unstable.git"
+QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-unstable.git"
+SEABIOS_URL="git://xenbits.xen.org/osstest/seabios.git"
+GRUB_URL="git://git.savannah.gnu.org/grub.git"
+LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
+OVMF_URL="git://xenbits.xen.org/osstest/ovmf.git"
+LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
+
+# Software versions.
+XEN_REVISION="master"
+QEMU_REVISION="master"
+QEMU_TRADITIONAL_REVISION="master"
+SEABIOS_REVISION="origin/xen-tested-master"
+GRUB_REVISION="master"
+LIBVIRT_REVISION="origin/xen-tested-master"
+OVMF_REVISION="origin/xen-tested-master"
+LINUX_REVISION="master"
+
+# Tests
+## All tests: busybox-pv busybox-hvm
+## ENABLED_TESTS is the list of test run by raise test
+ENABLED_TESTS="busybox-pv busybox-hvm"

diff --git a/defconfig b/defconfig
deleted file mode 100644 (file)
index 47969f46331c8802c3b1203f6b37f0b5bf93915c..0000000000000000000000000000000000000000
--- a/defconfig
+++ /dev/null
@@ -1,50 +0,0 @@
-# Config variables for raisin
-
-# Components
-## All components: seabios ovmf xen qemu qemu_traditional grub libvirt linux
-## Core xen functionality: xen
-## Remove a component from the list below, if you want to disable it
-## You can manually overwrite this list using the COMPONENTS
-## environmental variable.
-ENABLED_COMPONENTS="seabios ovmf xen qemu qemu_traditional grub libvirt"
-
-# Build config
-## Make command to run
-MAKE="make -j2"
-## Installation prefix (configure --prefix)
-PREFIX="/usr"
-## Install everything under DESTDIR
-## If you want to install under / run raise.sh -i
-DESTDIR=dist
-
-# Git urls. Use the http urls if you are behind a firewall.
-#XEN_URL="http://xenbits.xen.org/git-http/xen.git"
-#GRUB_URL="http://git.savannah.gnu.org/r/grub.git"
-#LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git"
-XEN_URL="git://xenbits.xen.org/xen.git"
-QEMU_URL="git://xenbits.xen.org/qemu-upstream-unstable.git"
-QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-unstable.git"
-SEABIOS_URL="git://xenbits.xen.org/seabios.git"
-GRUB_URL="git://git.savannah.gnu.org/grub.git"
-LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
-OVMF_URL="git://xenbits.xen.org/ovmf.git"
-LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
-
-# Software versions.
-XEN_REVISION="master"
-QEMU_REVISION="master"
-QEMU_TRADITIONAL_REVISION="3b45fcf0c163b9cff4d8115f7b75b42918a9b1b5"
-# Thu Apr 9 19:49:24 2015 +0100
-# qemu-trad: xenstore: use relative path for device-model node
-SEABIOS_REVISION="rel-1.8.0"
-# Wed Feb 18 12:49:59 2015 -0500
-# docs: Note v1.8.0 release
-GRUB_REVISION="master"
-LIBVIRT_REVISION="xen-tested-master"
-OVMF_REVISION="a065efc7c7ce8bb3e5cb3e463099d023d4a92927"
-LINUX_REVISION="master"
-
-# Tests
-## All tests: busybox-pv busybox-hvm
-## ENABLED_TESTS is the list of test run by raise test
-ENABLED_TESTS="busybox-pv busybox-hvm"

diff --git a/defconfig b/defconfig
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..7ba643ef90d58c598eaedcfafd5658a0e92f51f8
--- /dev/null
+++ b/defconfig
@@ -0,0 +1 @@
+configs/config-4.6
\ No newline at end of file