Re: [Xen-devel] [PATCH raisin 2/4] config: Separate config urls into a separate file

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Mon, 13 Jun 2016, George Dunlap wrote:
> So that we're not duplicating information.
> 
> Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxx>

Acked-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>


>  configs/config-4.5      | 39 ---------------------------------------
>  configs/config-4.6      | 39 ---------------------------------------
>  configs/config-master   | 38 --------------------------------------
>  configs/config-url-git  |  8 ++++++++
>  configs/config-url-http |  7 +++++++
>  defconfig               | 35 ++++++++++++++++++++++++++++++++++-
>  6 files changed, 49 insertions(+), 117 deletions(-)
> 
> diff --git a/configs/config-4.5 b/configs/config-4.5
> index e3b92d5..4163b68 100644
> --- a/configs/config-4.5
> +++ b/configs/config-4.5
> @@ -1,37 +1,3 @@
> -# 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"
> @@ -40,8 +6,3 @@ 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
> index ebd45e7..e8b2a09 100644
> --- a/configs/config-4.6
> +++ b/configs/config-4.6
> @@ -1,37 +1,3 @@
> -# 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"
> @@ -40,8 +6,3 @@ 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
> index b218708..bd26ce3 100644
> --- a/configs/config-master
> +++ b/configs/config-master
> @@ -1,36 +1,3 @@
> -# 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"
> @@ -39,8 +6,3 @@ 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/configs/config-url-git b/configs/config-url-git
> new file mode 100644
> index 0000000..79813c4
> --- /dev/null
> +++ b/configs/config-url-git
> @@ -0,0 +1,8 @@
> +XEN_URL="git://xenbits.xen.org/xen.git"
> +QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
> +QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.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"
> diff --git a/configs/config-url-http b/configs/config-url-http
> new file mode 100644
> index 0000000..0ea8484
> --- /dev/null
> +++ b/configs/config-url-http
> @@ -0,0 +1,7 @@
> +XEN_URL="http://xenbits.xen.org/git-http/xen.git";
> +QEMU_URL="http://xenbits.xen.org/git-http/qemu-xen.git";
> +QEMU_TRADITIONAL_URL="http://xenbits.xen.org/git-http/qemu-xen-traditional.git";
> +SEABIOS_URL="http://xenbits.xen.org/git-http/seabios.git";
> +GRUB_URL="http://git.savannah.gnu.org/r/grub.git";
> +LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git";
> +OVMF_URL="http://xenbits.xen.org/git-http/ovmf.git";
> diff --git a/defconfig b/defconfig
> deleted file mode 120000
> index 7ba643e..0000000
> --- a/defconfig
> +++ /dev/null
> @@ -1 +0,0 @@
> -configs/config-4.6
> \ No newline at end of file
> diff --git a/defconfig b/defconfig
> new file mode 100644
> index 0000000..8e79a43
> --- /dev/null
> +++ b/defconfig
> @@ -0,0 +1,34 @@
> +# Config variables for raisin
> +# Setup a Xen based system.
> +
> +# Available options: 4.5, 4.6, master (for development branch)
> +XEN_RELEASE="4.6"
> +
> +# 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 transport.  Use "http" if you're behind a firewall
> +GIT_TRANSPORT="git"
> +. configs/config-url-${GIT_TRANSPORT}
> +
> +# Software versions.
> +. configs/config-${XEN_RELEASE}
> +
> +# Tests
> +## All tests: busybox-pv busybox-hvm
> +## ENABLED_TESTS is the list of test run by raise test
> +ENABLED_TESTS="busybox-pv busybox-hvm"
> -- 
> 2.1.4
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel