[Buildroot] [PATCH 2/6] qemu: make qemu and host-qemu packages' version (separately) configurable
Arnout Vandecappelle
arnout at mind.be
Sat May 7 19:01:37 UTC 2016
On 05/04/16 09:47, Simon Maes wrote:
> Signed-off-by: Simon Maes <simonn.maes at gmail.com>
> ---
> package/qemu/Config.in | 8 ++++++++
> package/qemu/Config.in.host | 8 ++++++++
> package/qemu/qemu.mk | 26 ++++++++++++++++++--------
> 3 files changed, 34 insertions(+), 8 deletions(-)
>
> diff --git a/package/qemu/Config.in b/package/qemu/Config.in
> index ea6b946..a16a65c 100644
> --- a/package/qemu/Config.in
> +++ b/package/qemu/Config.in
> @@ -36,6 +36,14 @@ config BR2_PACKAGE_QEMU
>
> if BR2_PACKAGE_QEMU
>
> +config BR2_PACKAGE_QEMU_VERSION
> + string "qemu version"
> + default "2.5.0"
Our current version is 2.5.1, so the default should be that as well.
> + help
> + QEMU version to use target qemu
^^for
> + Sometimes the latest version is broken for some specific
> + architecture or target machine
> +
> comment "Emulators selection"
>
> config BR2_PACKAGE_QEMU_CUSTOM_TARGETS
> diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host
> index 71f697e..c86768f 100644
> --- a/package/qemu/Config.in.host
> +++ b/package/qemu/Config.in.host
> @@ -18,6 +18,14 @@ config BR2_PACKAGE_HOST_QEMU
>
> if BR2_PACKAGE_HOST_QEMU
>
> +config BR2_PACKAGE_HOST_QEMU_VERSION
> + string "host qemu version"
> + default "2.5.0"
Same here, default 2.5.1.
> + help
> + QEMU version to use for host qemu
> + Sometimes the latest version is broken for some specific
> + architecture or target machine
> +
> #
> # Configuration selection
> #
> diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
> index 0e99138..151060b 100644
> --- a/package/qemu/qemu.mk
> +++ b/package/qemu/qemu.mk
> @@ -4,18 +4,19 @@
> #
> ################################################################################
>
> -QEMU_VERSION = 2.5.1
> -QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
> -QEMU_SITE = http://wiki.qemu.org/download
> -QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c
> -QEMU_LICENSE_FILES = COPYING COPYING.LIB
> -# NOTE: there is no top-level license file for non-(L)GPL licenses;
> -# the non-(L)GPL license texts are specified in the affected
> -# individual source files.
There is no reason to move all this. When there are differences between host
and target, we put target first. So just replace
QEMU_VERSION = $(call qstrip,$(BR2_PACKAGE_QEMU_VERSION))
and leave the rest as is.
>
> #-------------------------------------------------------------
> # Host-qemu
>
> +HOST_QEMU_VERSION = $(call qstrip,$(BR2_PACKAGE_HOST_QEMU_VERSION))
> +HOST_QEMU_SOURCE = qemu-$(HOST_QEMU_VERSION).tar.bz2
> +HOST_QEMU_SITE = http://wiki.qemu.org/download
> +HOST_QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c
> +HOST_QEMU_LICENSE_FILES = COPYING COPYING.LIB
Only the first two are needed, all the rest can be inherited from target.
Regards,
Arnout
> +# NOTE: there is no top-level license file for non-(L)GPL licenses;
> +# the non-(L)GPL license texts are specified in the affected
> +# individual source files.
> +
> HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-pixman
> HOST_QEMU_SITE = $(QEMU_SITE)
> HOST_QEMU_SOURCE = $(QEMU_SOURCE)
> @@ -146,6 +147,15 @@ QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(HOST_QEMU_ARCH)
> #-------------------------------------------------------------
> # Target-qemu
>
> +QEMU_VERSION = $(call qstrip,$(BR2_PACKAGE_QEMU_VERSION))
> +QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
> +QEMU_SITE = http://wiki.qemu.org/download
> +QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c
> +QEMU_LICENSE_FILES = COPYING COPYING.LIB
> +# NOTE: there is no top-level license file for non-(L)GPL licenses;
> +# the non-(L)GPL license texts are specified in the affected
> +# individual source files.
> +
> QEMU_DEPENDENCIES = host-pkgconf host-python libglib2 zlib pixman
>
> # Need the LIBS variable because librt and libm are
>
>
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
More information about the buildroot
mailing list