[Buildroot] [PATCH 1/3] qemu: bump version to 2.5.0

[Buildroot] [PATCH 1/3] qemu: bump version to 2.5.0

[Vicente Olivert Riera]

- Bump version to 2.5.0.

- Update hash file.

- Remove upstreamed patch:

  http://git.qemu.org/?p=qemu.git;a=commit;h=fccd35a04640a728f979e6d72b2c7d02c05549f0

- Remove non-existent configure options:

  ERROR: unknown option --disable-guest-base
  Try './configure --help' for more information

  ERROR: unknown option --disable-smartcard-nss
  Try './configure --help' for more information

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 ...se-appropriate-code-fragment-for-fstack-p.patch | 58 ----------------------
 package/qemu/qemu.hash                             |  2 +-
 package/qemu/qemu.mk                               |  4 +-
 3 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100644 package/qemu/0001-configure-use-appropriate-code-fragment-for-fstack-p.patch

diff --git a/package/qemu/0001-configure-use-appropriate-code-fragment-for-fstack-p.patch b/package/qemu/0001-configure-use-appropriate-code-fragment-for-fstack-p.patch
deleted file mode 100644
index 9ebe334..0000000
--- a/package/qemu/0001-configure-use-appropriate-code-fragment-for-fstack-p.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 7b93e98143c376ed09bfd30658b8641d4a36e77e Mon Sep 17 00:00:00 2001
-From: Rodrigo Rebello <rprebello@gmail.com>
-Date: Thu, 12 Nov 2015 12:04:28 -0200
-Subject: [PATCH] configure: use appropriate code fragment for
- -fstack-protector checks
-Cc: qemu-trivial at nongnu.org
-
-The check for stack-protector support consisted in compiling and linking
-the test program below (output by function write_c_skeleton()) with the
-compiler flag -fstack-protector-strong first and then with
--fstack-protector-all if the first one failed to work:
-
-  int main(void) { return 0; }
-
-This caused false positives when using certain toolchains in which the
-compiler accepts -fstack-protector-strong but no support is provided by
-the C library, since in this stack-protector variant the compiler emits
-canary code only for functions that meet specific conditions (local
-arrays, memory references to local variables, etc.) and the code
-fragment under test included none of them (hence no stack protection
-code generated, no link failure).
-
-This fix modifies the test program used for -fstack-protector checks to
-meet conditions which cause the compiler to generate canary code in all
-variants.
-
-Upstream status: sent
-https://patchwork.ozlabs.org/patch/543357/
-
-Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
----
- configure | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/configure b/configure
-index cd219d8..27d7b3c 100755
---- a/configure
-+++ b/configure
-@@ -1471,6 +1471,16 @@ for flag in $gcc_flags; do
- done
- 
- if test "$stack_protector" != "no"; then
-+  cat > $TMPC << EOF
-+int main(int argc, char *argv[])
-+{
-+    char arr[64], *p = arr, *c = argv[0];
-+    while (*c) {
-+        *p++ = *c++;
-+    }
-+    return 0;
-+}
-+EOF
-   gcc_flags="-fstack-protector-strong -fstack-protector-all"
-   sp_on=0
-   for flag in $gcc_flags; do
--- 
-2.1.4
-
diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash
index c563271..cccb059 100644
--- a/package/qemu/qemu.hash
+++ b/package/qemu/qemu.hash
@@ -1,2 +1,2 @@
 # Locally computed, tarball verified with GPG signature
-sha256 ecfe8b88037e41e817d72c460c56c6a0b573d540d6ba38b162d0de4fd22d1bdb  qemu-2.4.0.1.tar.bz2
+sha256 3443887401619fe33bfa5d900a4f2d6a79425ae2b7e43d5b8c36eb7a683772d4  qemu-2.5.0.tar.bz2
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 7accc1e..1b08b42 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QEMU_VERSION = 2.4.0.1
+QEMU_VERSION = 2.5.0
 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
@@ -197,7 +197,6 @@ define QEMU_CONFIGURE_CMDS
 			--disable-curses                \
 			--disable-curl                  \
 			--disable-bluez                 \
-			--disable-guest-base            \
 			--disable-uuid                  \
 			--disable-vde                   \
 			--disable-linux-aio             \
@@ -207,7 +206,6 @@ define QEMU_CONFIGURE_CMDS
 			--disable-rbd                   \
 			--disable-libiscsi              \
 			--disable-usb-redir             \
-			--disable-smartcard-nss         \
 			--disable-strip                 \
 			--disable-seccomp               \
 			--disable-sparse                \
-- 
2.4.10

[Buildroot] [PATCH 2/3] qemu: wrap lines to 72 characters length

[Vicente Olivert Riera]

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/qemu/Config.in      | 43 +++++++++++++++++++++++++------------------
 package/qemu/Config.in.host | 17 +++++++++--------
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 082b5ee..aced2be 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -19,18 +19,20 @@ config BR2_PACKAGE_QEMU
 	select BR2_PACKAGE_PIXMAN
 	select BR2_PACKAGE_ZLIB
 	help
-	  QEMU is a generic and open source machine emulator and virtualizer.
+	  QEMU is a generic and open source machine emulator and
+	  virtualizer.
 
-	  When used as a machine emulator, QEMU can run OSes and programs made
-	  for one machine (e.g. an ARM board) on a different machine (e.g.
-	  your own PC). By using dynamic translation, it achieves very good
-	  performance.
+	  When used as a machine emulator, QEMU can run OSes and
+	  programs made for one machine (e.g. an ARM board) on a
+	  different machine (e.g. your own PC). By using dynamic
+	  translation, it achieves very good performance.
 
-	  When used as a virtualizer, QEMU achieves near native performances
-	  by executing the guest code directly on the host CPU. QEMU supports
-	  virtualization when executing under the Xen hypervisor or using the
-	  KVM kernel module in Linux. When using KVM, QEMU can virtualize x86,
-	  server and embedded PowerPC, and S390 guests.
+	  When used as a virtualizer, QEMU achieves near native
+	  performances by executing the guest code directly on the host
+	  CPU. QEMU supports virtualization when executing under the Xen
+	  hypervisor or using the KVM kernel module in Linux. When using
+	  KVM, QEMU can virtualize x86, server and embedded PowerPC, and
+	  S390 guests.
 
 	  http://qemu.org/
 
@@ -41,7 +43,8 @@ comment "Emulators selection"
 config BR2_PACKAGE_QEMU_CUSTOM_TARGETS
 	string "Enable specific targets"
 	help
-	  Enter here the list of QEMU targets you want to build. For example:
+	  Enter here the list of QEMU targets you want to build. For
+	  example:
 
 	    System emulation      | User-land emulation
 	    ----------------------+-----------------------
@@ -62,7 +65,8 @@ config BR2_PACKAGE_QEMU_SYSTEM
 	depends on !BR2_STATIC_LIBS # dtc
 	select BR2_PACKAGE_QEMU_FDT
 	help
-	  Say 'y' to build all system emulators/virtualisers that QEMU supports.
+	  Say 'y' to build all system emulators/virtualisers that QEMU
+	  supports.
 
 comment "systems emulation needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
@@ -70,7 +74,8 @@ comment "systems emulation needs a toolchain w/ dynamic library"
 config BR2_PACKAGE_QEMU_LINUX_USER
 	bool "Enable all Linux user-land emulation"
 	help
-	  Say 'y' to build all Linux user-land emulators that QEMU supports.
+	  Say 'y' to build all Linux user-land emulators that QEMU
+	  supports.
 
 # Note: bsd-user can not be build on Linux
 
@@ -78,7 +83,9 @@ endif # BR2_PACKAGE_QEMU_CUSTOM_TARGETS == ""
 
 config BR2_PACKAGE_QEMU_HAS_EMULS
 	def_bool y
-	depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER || BR2_PACKAGE_QEMU_CUSTOM_TARGETS != ""
+	depends on BR2_PACKAGE_QEMU_SYSTEM || \
+		BR2_PACKAGE_QEMU_LINUX_USER || \
+		BR2_PACKAGE_QEMU_CUSTOM_TARGETS != ""
 
 if BR2_PACKAGE_QEMU_HAS_EMULS
 
@@ -88,8 +95,8 @@ config BR2_PACKAGE_QEMU_SDL
 	bool "Enable SDL frontend"
 	select BR2_PACKAGE_SDL
 	help
-	  Say 'y' to enable the SDL frontend, that is, a graphical window
-	  presenting the VM's display.
+	  Say 'y' to enable the SDL frontend, that is, a graphical
+	  window presenting the VM's display.
 
 comment "Misc. features"
 
@@ -98,8 +105,8 @@ config BR2_PACKAGE_QEMU_FDT
 	depends on !BR2_STATIC_LIBS # dtc
 	select BR2_PACKAGE_DTC
 	help
-	  Say 'y' here to have QEMU capable of constructing Device Trees,
-	  and passing them to the VMs.
+	  Say 'y' here to have QEMU capable of constructing Device
+	  Trees, and passing them to the VMs.
 
 comment "FDT support needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host
index c5c3f05..e9b944b 100644
--- a/package/qemu/Config.in.host
+++ b/package/qemu/Config.in.host
@@ -3,15 +3,16 @@ config BR2_PACKAGE_HOST_QEMU
 	# So far, we only build the user mode emulation, so this list
 	# of architecture dependencies only takes into account this
 	# emulation mode.
-	depends on BR2_arm       || BR2_armeb       || BR2_aarch64      || \
-		BR2_i386         || BR2_m68k        || BR2_microblazeel || \
-		BR2_microblazebe || BR2_mips        || BR2_mipsel       || \
-		BR2_mips64       || BR2_mips64el    || BR2_powerpc      || \
-		BR2_powerpc64    || BR2_powerpc64le || BR2_sh           || \
-		BR2_sparc        || BR2_x86_64
+	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || \
+		BR2_m68k || BR2_microblazeel || BR2_microblazebe || \
+		BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \
+		|| BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
+		BR2_sh || BR2_sparc || BR2_x86_64
 	help
-	  QEMU is a generic and open source machine emulator and virtualizer.
+	  QEMU is a generic and open source machine emulator and
+	  virtualizer.
 
-	  This option builds a user emulator for your selected architecture.
+	  This option builds a user emulator for your selected
+	  architecture.
 
 	  http://www.qemu.org
-- 
2.4.10

[Buildroot] [PATCH 3/3] qemu: fix project's URL

[Vicente Olivert Riera]

http://qemu.org and http://www.qemu.org redirects to
http://wiki.qemu.org/Main_Page, so let's use this one instead.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/qemu/Config.in      | 2 +-
 package/qemu/Config.in.host | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index aced2be..dc3fd9e 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -34,7 +34,7 @@ config BR2_PACKAGE_QEMU
 	  KVM, QEMU can virtualize x86, server and embedded PowerPC, and
 	  S390 guests.
 
-	  http://qemu.org/
+	  http://wiki.qemu.org/Main_Page
 
 if BR2_PACKAGE_QEMU
 
diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host
index e9b944b..4c0d877 100644
--- a/package/qemu/Config.in.host
+++ b/package/qemu/Config.in.host
@@ -15,4 +15,4 @@ config BR2_PACKAGE_HOST_QEMU
 	  This option builds a user emulator for your selected
 	  architecture.
 
-	  http://www.qemu.org
+	  http://wiki.qemu.org/Main_Page
-- 
2.4.10

[Buildroot] [PATCH 1/3] qemu: bump version to 2.5.0

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Thu, 17 Dec 2015 11:57:06 +0000, Vicente Olivert Riera wrote:
> - Bump version to 2.5.0.
> 
> - Update hash file.
> 
> - Remove upstreamed patch:
> 
>   http://git.qemu.org/?p=qemu.git;a=commit;h=fccd35a04640a728f979e6d72b2c7d02c05549f0
> 
> - Remove non-existent configure options:
> 
>   ERROR: unknown option --disable-guest-base
>   Try './configure --help' for more information
> 
>   ERROR: unknown option --disable-smartcard-nss
>   Try './configure --help' for more information
> 
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
>  ...se-appropriate-code-fragment-for-fstack-p.patch | 58 ----------------------
>  package/qemu/qemu.hash                             |  2 +-
>  package/qemu/qemu.mk                               |  4 +-
>  3 files changed, 2 insertions(+), 62 deletions(-)
>  delete mode 100644 package/qemu/0001-configure-use-appropriate-code-fragment-for-fstack-p.patch

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/3] qemu: wrap lines to 72 characters length

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

I'm with the commit, with one exception.

On Thu, 17 Dec 2015 11:57:07 +0000, Vicente Olivert Riera wrote:

> diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host
> index c5c3f05..e9b944b 100644
> --- a/package/qemu/Config.in.host
> +++ b/package/qemu/Config.in.host
> @@ -3,15 +3,16 @@ config BR2_PACKAGE_HOST_QEMU
>  	# So far, we only build the user mode emulation, so this list
>  	# of architecture dependencies only takes into account this
>  	# emulation mode.
> -	depends on BR2_arm       || BR2_armeb       || BR2_aarch64      || \
> -		BR2_i386         || BR2_m68k        || BR2_microblazeel || \
> -		BR2_microblazebe || BR2_mips        || BR2_mipsel       || \
> -		BR2_mips64       || BR2_mips64el    || BR2_powerpc      || \
> -		BR2_powerpc64    || BR2_powerpc64le || BR2_sh           || \
> -		BR2_sparc        || BR2_x86_64
> +	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || \
> +		BR2_m68k || BR2_microblazeel || BR2_microblazebe || \
> +		BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \
> +		|| BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
> +		BR2_sh || BR2_sparc || BR2_x86_64

Why are you doing this? The original version is much more readable.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 3/3] qemu: fix project's URL

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Thu, 17 Dec 2015 11:57:08 +0000, Vicente Olivert Riera wrote:
> http://qemu.org and http://www.qemu.org redirects to
> http://wiki.qemu.org/Main_Page, so let's use this one instead.
> 
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

I disagree, qemu.org remains the main official address. The fact that
it redirects to some other page on a Wiki currently is just an
"implementation detail", which the Qemu guys may change in the future.
We should continue to use qemu.org.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 3/3] qemu: fix project's URL

[Vicente Olivert Riera]

No problem, I will mark this patch as rejected if you haven't done it
already.

Regards,

Vincent.

On 17/12/15 12:09, Thomas Petazzoni wrote:
> Dear Vicente Olivert Riera,
> 
> On Thu, 17 Dec 2015 11:57:08 +0000, Vicente Olivert Riera wrote:
>> http://qemu.org and http://www.qemu.org redirects to
>> http://wiki.qemu.org/Main_Page, so let's use this one instead.
>>
>> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> 
> I disagree, qemu.org remains the main official address. The fact that
> it redirects to some other page on a Wiki currently is just an
> "implementation detail", which the Qemu guys may change in the future.
> We should continue to use qemu.org.
> 
> Best regards,
> 
> Thomas
> 

[Buildroot] [PATCH 2/3] qemu: wrap lines to 72 characters length

[Vicente Olivert Riera]

On 17/12/15 12:08, Thomas Petazzoni wrote:
> Dear Vicente Olivert Riera,
> 
> I'm with the commit, with one exception.
> 
> On Thu, 17 Dec 2015 11:57:07 +0000, Vicente Olivert Riera wrote:
> 
>> diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host
>> index c5c3f05..e9b944b 100644
>> --- a/package/qemu/Config.in.host
>> +++ b/package/qemu/Config.in.host
>> @@ -3,15 +3,16 @@ config BR2_PACKAGE_HOST_QEMU
>>  	# So far, we only build the user mode emulation, so this list
>>  	# of architecture dependencies only takes into account this
>>  	# emulation mode.
>> -	depends on BR2_arm       || BR2_armeb       || BR2_aarch64      || \
>> -		BR2_i386         || BR2_m68k        || BR2_microblazeel || \
>> -		BR2_microblazebe || BR2_mips        || BR2_mipsel       || \
>> -		BR2_mips64       || BR2_mips64el    || BR2_powerpc      || \
>> -		BR2_powerpc64    || BR2_powerpc64le || BR2_sh           || \
>> -		BR2_sparc        || BR2_x86_64
>> +	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || \
>> +		BR2_m68k || BR2_microblazeel || BR2_microblazebe || \
>> +		BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \
>> +		|| BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
>> +		BR2_sh || BR2_sparc || BR2_x86_64
> 
> Why are you doing this? The original version is much more readable.

Ok, no problem. You can apply the patch with that part removed. Or do
you prefer a v2?

Regards,

Vincent.

> Thomas
> 

[Buildroot] [PATCH 3/3] qemu: fix project's URL

[Thomas Petazzoni]

Vicente,

On Thu, 17 Dec 2015 12:29:44 +0000, Vicente Olivert Riera wrote:
> No problem, I will mark this patch as rejected if you haven't done it
> already.

Already done.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com