* [Buildroot] [PATCH 1/2] qemu: bump to 2.12.0
@ 2018-04-27 15:40 Adam Duskett
2018-04-27 15:40 ` [Buildroot] [PATCH 2/2] qemu: add support for python 3.6 Adam Duskett
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Adam Duskett @ 2018-04-27 15:40 UTC (permalink / raw)
To: buildroot
In addition:
- Update 0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
with new line numbers and file location.
- Remove upstream 0002-memfd-fix-configure-test.patch
- Add new options found in 2.12.0 in qemu.mk as disabled.
- Remove --with-system-pixman as it's no longer optional.
Tested with test-pkg:
./utils/test-pkg -p qemu -c configs/qemu_min_defconfig
br-arm-full [1/6]: OK
br-arm-cortex-a9-glibc [2/6]: OK
br-arm-cortex-m4-full [3/6]: SKIPPED
br-x86-64-musl [4/6]: OK
br-arm-full-static [5/6]: OK
armv5-ctng-linux-gnueabi [6/6]: OK
6 builds, 1 skipped, 0 build failed, 0 legal-info failed
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
...ix-usage-of-mcontext-structure-on-ARM-uCl.patch | 10 ++--
package/qemu/0002-memfd-fix-configure-test.patch | 58 ----------------------
package/qemu/qemu.hash | 2 +-
package/qemu/qemu.mk | 13 ++++-
4 files changed, 18 insertions(+), 65 deletions(-)
delete mode 100644 package/qemu/0002-memfd-fix-configure-test.patch
diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
index 6d6d024d9d..2763737fe6 100644
--- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
+++ b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
@@ -13,15 +13,17 @@ general case of using uc_mcontext.arm_pc, which works fine with
uClibc.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[aduskett at gmail.com: Update for 2.12.0]
+Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
user-exec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/user-exec.c b/user-exec.c
+diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index 6db0758..2b3d116 100644
---- a/user-exec.c
-+++ b/user-exec.c
-@@ -409,7 +409,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
+--- a/accel/tcg/user-exec.c
++++ b/accel/tcg/user-exec.c
+@@ -463,7 +463,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
#if defined(__NetBSD__)
pc = uc->uc_mcontext.__gregs[_REG_R15];
diff --git a/package/qemu/0002-memfd-fix-configure-test.patch b/package/qemu/0002-memfd-fix-configure-test.patch
deleted file mode 100644
index 3e06c0e932..0000000000
--- a/package/qemu/0002-memfd-fix-configure-test.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Tue, 28 Nov 2017 11:51:27 +0100
-Subject: [PATCH] memfd: fix configure test
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Recent glibc added memfd_create in sys/mman.h. This conflicts with
-the definition in util/memfd.c:
-
- /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
-
-Fix the configure test, and remove the sys/memfd.h inclusion since the
-file actually does not exist---it is a typo in the memfd_create(2) man
-page.
-
-Cc: Marc-Andr? Lureau <marcandre.lureau@redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: commit 75e5b70e6b5
-
- configure | 2 +-
- util/memfd.c | 4 +---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index 9c8aa5a98bd4..99ccc1725ace 100755
---- a/configure
-+++ b/configure
-@@ -3923,7 +3923,7 @@ fi
- # check if memfd is supported
- memfd=no
- cat > $TMPC << EOF
--#include <sys/memfd.h>
-+#include <sys/mman.h>
-
- int main(void)
- {
-diff --git a/util/memfd.c b/util/memfd.c
-index 4571d1aba866..412e94a405fc 100644
---- a/util/memfd.c
-+++ b/util/memfd.c
-@@ -31,9 +31,7 @@
-
- #include "qemu/memfd.h"
-
--#ifdef CONFIG_MEMFD
--#include <sys/memfd.h>
--#elif defined CONFIG_LINUX
-+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
- #include <sys/syscall.h>
- #include <asm/unistd.h>
-
---
-2.16.2
-
diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash
index 1173c1bf3d..fc0b4e87bf 100644
--- a/package/qemu/qemu.hash
+++ b/package/qemu/qemu.hash
@@ -1,4 +1,4 @@
# Locally computed, tarball verified with GPG signature
-sha256 fcfdaa1ecdaac8aead616fe811bfb8fe4a8f2cd59796aa446c5175b5af0e829f qemu-2.10.2.tar.xz
+sha256 e69301f361ff65bf5dabd8a19196aeaa5613c1b5ae1678f0823bdf50e7d5c6fc qemu-2.12.0.tar.xz
sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING
sha256 48ffe9fc7f1d5462dbd19340bc4dd1d8a9e37c61ed535813e614cbe4a5f0d4df COPYING.LIB
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index f6f4a2b870..975dfba490 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -4,7 +4,7 @@
#
################################################################################
-QEMU_VERSION = 2.10.2
+QEMU_VERSION = 2.12.0
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
QEMU_SITE = http://download.qemu.org
QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
@@ -230,7 +230,6 @@ define QEMU_CONFIGURE_CMDS
./configure \
--prefix=/usr \
--cross-prefix=$(TARGET_CROSS) \
- --with-system-pixman \
--audio-drv-list= \
--enable-kvm \
--enable-attr \
@@ -255,6 +254,16 @@ define QEMU_CONFIGURE_CMDS
--disable-strip \
--disable-seccomp \
--disable-sparse \
+ --disable-mpath \
+ --disable-sanitizers \
+ --disable-hvf \
+ --disable-whpx \
+ --disable-malloc-trim \
+ --disable-membarrier \
+ --disable-vhost-crypto \
+ --disable-libxml2 \
+ --disable-capstone \
+ --disable-git-update \
$(QEMU_OPTS) \
)
endef
--
2.14.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] qemu: add support for python 3.6
2018-04-27 15:40 [Buildroot] [PATCH 1/2] qemu: bump to 2.12.0 Adam Duskett
@ 2018-04-27 15:40 ` Adam Duskett
2018-05-01 15:01 ` Romain Naour
2018-08-20 22:31 ` Thomas Petazzoni
2018-05-01 14:58 ` [Buildroot] [PATCH 1/2] qemu: bump to 2.12.0 Romain Naour
2018-08-10 21:59 ` Thomas Petazzoni
2 siblings, 2 replies; 8+ messages in thread
From: Adam Duskett @ 2018-04-27 15:40 UTC (permalink / raw)
To: buildroot
qemu 2.12.0 now supports building against python3.
see: https://wiki.qemu.org/ChangeLog/2.12#Build_Dependencies
Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
package/qemu/qemu.mk | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 975dfba490..6a24e2848d 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -16,7 +16,7 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB
#-------------------------------------------------------------
# Host-qemu
-HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-pixman
+HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman
# BR ARCH qemu
# ------- ----
@@ -119,6 +119,16 @@ HOST_QEMU_OPTS += --enable-vde
HOST_QEMU_DEPENDENCIES += host-vde2
endif
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+HOST_QEMU_DEPENDENCIES += host-python3
+QEMU_DEPENDENCIES += host-python3
+QEMU_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
+else
+HOST_QEMU_DEPENDENCIES += host-python
+QEMU_DEPENDENCIES += host-python
+QEMU_PYLIBVER = python$(PYTHON_VERSION_MAJOR)
+endif
+
# Override CPP, as it expects to be able to call it like it'd
# call the compiler.
define HOST_QEMU_CONFIGURE_CMDS
@@ -129,7 +139,7 @@ define HOST_QEMU_CONFIGURE_CMDS
--interp-prefix=$(STAGING_DIR) \
--cc="$(HOSTCC)" \
--host-cc="$(HOSTCC)" \
- --python=$(HOST_DIR)/bin/python2 \
+ --python=$(HOST_DIR)/bin/$(QEMU_PYLIBVER) \
--extra-cflags="$(HOST_CFLAGS)" \
--extra-ldflags="$(HOST_LDFLAGS)" \
$(HOST_QEMU_OPTS)
@@ -151,7 +161,7 @@ QEMU_USER = $(HOST_DIR)/bin/qemu-$(HOST_QEMU_ARCH)
#-------------------------------------------------------------
# Target-qemu
-QEMU_DEPENDENCIES = host-pkgconf host-python libglib2 zlib pixman
+QEMU_DEPENDENCIES = host-pkgconf libglib2 zlib pixman
# Need the LIBS variable because librt and libm are
# not automatically pulled. :-(
@@ -161,8 +171,8 @@ QEMU_OPTS =
QEMU_VARS = \
LIBTOOL=$(HOST_DIR)/bin/libtool \
- PYTHON=$(HOST_DIR)/bin/python2 \
- PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
+ PYTHON=$(HOST_DIR)/bin/$(QEMU_PYLIBVER) \
+ PYTHONPATH=$(TARGET_DIR)/usr/lib/$(QEMU_PYLIBVER)/site-packages
# If we want to specify only a subset of targets, we must still enable all
# of them, so that QEMU properly builds its list of default targets, from
--
2.14.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] qemu: bump to 2.12.0
2018-04-27 15:40 [Buildroot] [PATCH 1/2] qemu: bump to 2.12.0 Adam Duskett
2018-04-27 15:40 ` [Buildroot] [PATCH 2/2] qemu: add support for python 3.6 Adam Duskett
@ 2018-05-01 14:58 ` Romain Naour
2018-05-02 13:21 ` Adam Duskett
2018-08-10 21:59 ` Thomas Petazzoni
2 siblings, 1 reply; 8+ messages in thread
From: Romain Naour @ 2018-05-01 14:58 UTC (permalink / raw)
To: buildroot
Hi Adam,
Thanks for this new version.
Le 27/04/2018 ? 17:40, Adam Duskett a ?crit?:
> In addition:
> - Update 0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
> with new line numbers and file location.
> - Remove upstream 0002-memfd-fix-configure-test.patch
> - Add new options found in 2.12.0 in qemu.mk as disabled.
> - Remove --with-system-pixman as it's no longer optional.
>
> Tested with test-pkg:
>
> ./utils/test-pkg -p qemu -c configs/qemu_min_defconfig
> br-arm-full [1/6]: OK
> br-arm-cortex-a9-glibc [2/6]: OK
> br-arm-cortex-m4-full [3/6]: SKIPPED
> br-x86-64-musl [4/6]: OK
> br-arm-full-static [5/6]: OK
> armv5-ctng-linux-gnueabi [6/6]: OK
> 6 builds, 1 skipped, 0 build failed, 0 legal-info failed
Maybe you can complete the test-pkg result with a runtime test with qemu
configs? see [1] for example.
Note that Qemu 2.12 has deprecated SDL support in favor of 2.0 series [2].
Maybe it's time to switch to SDL2.
Best regards,
Romain
[1]
https://git.buildroot.net/buildroot/commit/?id=477756b257c4b72e03679b9142104860e1d4dabc
[2] https://git.qemu.org/?p=qemu.git;h=e52c6ba34149b4f39c3fd60e59ee32b809db2bfa
>
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
> ...ix-usage-of-mcontext-structure-on-ARM-uCl.patch | 10 ++--
> package/qemu/0002-memfd-fix-configure-test.patch | 58 ----------------------
> package/qemu/qemu.hash | 2 +-
> package/qemu/qemu.mk | 13 ++++-
> 4 files changed, 18 insertions(+), 65 deletions(-)
> delete mode 100644 package/qemu/0002-memfd-fix-configure-test.patch
>
> diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
> index 6d6d024d9d..2763737fe6 100644
> --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
> +++ b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
> @@ -13,15 +13,17 @@ general case of using uc_mcontext.arm_pc, which works fine with
> uClibc.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> +[aduskett at gmail.com: Update for 2.12.0]
> +Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
> ---
> user-exec.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> -diff --git a/user-exec.c b/user-exec.c
> +diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
> index 6db0758..2b3d116 100644
> ---- a/user-exec.c
> -+++ b/user-exec.c
> -@@ -409,7 +409,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
> +--- a/accel/tcg/user-exec.c
> ++++ b/accel/tcg/user-exec.c
> +@@ -463,7 +463,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
>
> #if defined(__NetBSD__)
> pc = uc->uc_mcontext.__gregs[_REG_R15];
> diff --git a/package/qemu/0002-memfd-fix-configure-test.patch b/package/qemu/0002-memfd-fix-configure-test.patch
> deleted file mode 100644
> index 3e06c0e932..0000000000
> --- a/package/qemu/0002-memfd-fix-configure-test.patch
> +++ /dev/null
> @@ -1,58 +0,0 @@
> -From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
> -From: Paolo Bonzini <pbonzini@redhat.com>
> -Date: Tue, 28 Nov 2017 11:51:27 +0100
> -Subject: [PATCH] memfd: fix configure test
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Recent glibc added memfd_create in sys/mman.h. This conflicts with
> -the definition in util/memfd.c:
> -
> - /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
> -
> -Fix the configure test, and remove the sys/memfd.h inclusion since the
> -file actually does not exist---it is a typo in the memfd_create(2) man
> -page.
> -
> -Cc: Marc-Andr? Lureau <marcandre.lureau@redhat.com>
> -Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> -Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ----
> -Upstream status: commit 75e5b70e6b5
> -
> - configure | 2 +-
> - util/memfd.c | 4 +---
> - 2 files changed, 2 insertions(+), 4 deletions(-)
> -
> -diff --git a/configure b/configure
> -index 9c8aa5a98bd4..99ccc1725ace 100755
> ---- a/configure
> -+++ b/configure
> -@@ -3923,7 +3923,7 @@ fi
> - # check if memfd is supported
> - memfd=no
> - cat > $TMPC << EOF
> --#include <sys/memfd.h>
> -+#include <sys/mman.h>
> -
> - int main(void)
> - {
> -diff --git a/util/memfd.c b/util/memfd.c
> -index 4571d1aba866..412e94a405fc 100644
> ---- a/util/memfd.c
> -+++ b/util/memfd.c
> -@@ -31,9 +31,7 @@
> -
> - #include "qemu/memfd.h"
> -
> --#ifdef CONFIG_MEMFD
> --#include <sys/memfd.h>
> --#elif defined CONFIG_LINUX
> -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
> - #include <sys/syscall.h>
> - #include <asm/unistd.h>
> -
> ---
> -2.16.2
> -
> diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash
> index 1173c1bf3d..fc0b4e87bf 100644
> --- a/package/qemu/qemu.hash
> +++ b/package/qemu/qemu.hash
> @@ -1,4 +1,4 @@
> # Locally computed, tarball verified with GPG signature
> -sha256 fcfdaa1ecdaac8aead616fe811bfb8fe4a8f2cd59796aa446c5175b5af0e829f qemu-2.10.2.tar.xz
> +sha256 e69301f361ff65bf5dabd8a19196aeaa5613c1b5ae1678f0823bdf50e7d5c6fc qemu-2.12.0.tar.xz
> sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING
> sha256 48ffe9fc7f1d5462dbd19340bc4dd1d8a9e37c61ed535813e614cbe4a5f0d4df COPYING.LIB
> diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
> index f6f4a2b870..975dfba490 100644
> --- a/package/qemu/qemu.mk
> +++ b/package/qemu/qemu.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -QEMU_VERSION = 2.10.2
> +QEMU_VERSION = 2.12.0
> QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
> QEMU_SITE = http://download.qemu.org
> QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
> @@ -230,7 +230,6 @@ define QEMU_CONFIGURE_CMDS
> ./configure \
> --prefix=/usr \
> --cross-prefix=$(TARGET_CROSS) \
> - --with-system-pixman \
> --audio-drv-list= \
> --enable-kvm \
> --enable-attr \
> @@ -255,6 +254,16 @@ define QEMU_CONFIGURE_CMDS
> --disable-strip \
> --disable-seccomp \
> --disable-sparse \
> + --disable-mpath \
> + --disable-sanitizers \
> + --disable-hvf \
> + --disable-whpx \
> + --disable-malloc-trim \
> + --disable-membarrier \
> + --disable-vhost-crypto \
> + --disable-libxml2 \
> + --disable-capstone \
> + --disable-git-update \
> $(QEMU_OPTS) \
> )
> endef
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] qemu: add support for python 3.6
2018-04-27 15:40 ` [Buildroot] [PATCH 2/2] qemu: add support for python 3.6 Adam Duskett
@ 2018-05-01 15:01 ` Romain Naour
2018-08-20 22:31 ` Thomas Petazzoni
1 sibling, 0 replies; 8+ messages in thread
From: Romain Naour @ 2018-05-01 15:01 UTC (permalink / raw)
To: buildroot
Hi Adam,
Le 27/04/2018 ? 17:40, Adam Duskett a ?crit?:
> qemu 2.12.0 now supports building against python3.
> see: https://wiki.qemu.org/ChangeLog/2.12#Build_Dependencies
>
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
> package/qemu/qemu.mk | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
> index 975dfba490..6a24e2848d 100644
> --- a/package/qemu/qemu.mk
> +++ b/package/qemu/qemu.mk
> @@ -16,7 +16,7 @@ QEMU_LICENSE_FILES = COPYING COPYING.LIB
> #-------------------------------------------------------------
> # Host-qemu
>
> -HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-pixman
> +HOST_QEMU_DEPENDENCIES = host-pkgconf host-zlib host-libglib2 host-pixman
>
> # BR ARCH qemu
> # ------- ----
> @@ -119,6 +119,16 @@ HOST_QEMU_OPTS += --enable-vde
> HOST_QEMU_DEPENDENCIES += host-vde2
> endif
>
> +ifeq ($(BR2_PACKAGE_PYTHON3),y)
> +HOST_QEMU_DEPENDENCIES += host-python3
> +QEMU_DEPENDENCIES += host-python3
> +QEMU_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
> +else
> +HOST_QEMU_DEPENDENCIES += host-python
> +QEMU_DEPENDENCIES += host-python
This doesn't work since you're using QEMU_DEPENDENCIES bellow $(eval
$(generic-package)).
host-python is missing from qemu (target) dependencies.
I had a build issue with make qemu.
Best regards,
Romain
> +QEMU_PYLIBVER = python$(PYTHON_VERSION_MAJOR)
> +endif
> +
> # Override CPP, as it expects to be able to call it like it'd
> # call the compiler.
> define HOST_QEMU_CONFIGURE_CMDS
> @@ -129,7 +139,7 @@ define HOST_QEMU_CONFIGURE_CMDS
> --interp-prefix=$(STAGING_DIR) \
> --cc="$(HOSTCC)" \
> --host-cc="$(HOSTCC)" \
> - --python=$(HOST_DIR)/bin/python2 \
> + --python=$(HOST_DIR)/bin/$(QEMU_PYLIBVER) \
> --extra-cflags="$(HOST_CFLAGS)" \
> --extra-ldflags="$(HOST_LDFLAGS)" \
> $(HOST_QEMU_OPTS)
> @@ -151,7 +161,7 @@ QEMU_USER = $(HOST_DIR)/bin/qemu-$(HOST_QEMU_ARCH)
> #-------------------------------------------------------------
> # Target-qemu
>
> -QEMU_DEPENDENCIES = host-pkgconf host-python libglib2 zlib pixman
> +QEMU_DEPENDENCIES = host-pkgconf libglib2 zlib pixman
>
> # Need the LIBS variable because librt and libm are
> # not automatically pulled. :-(
> @@ -161,8 +171,8 @@ QEMU_OPTS =
>
> QEMU_VARS = \
> LIBTOOL=$(HOST_DIR)/bin/libtool \
> - PYTHON=$(HOST_DIR)/bin/python2 \
> - PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
> + PYTHON=$(HOST_DIR)/bin/$(QEMU_PYLIBVER) \
> + PYTHONPATH=$(TARGET_DIR)/usr/lib/$(QEMU_PYLIBVER)/site-packages
>
> # If we want to specify only a subset of targets, we must still enable all
> # of them, so that QEMU properly builds its list of default targets, from
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] qemu: bump to 2.12.0
2018-05-01 14:58 ` [Buildroot] [PATCH 1/2] qemu: bump to 2.12.0 Romain Naour
@ 2018-05-02 13:21 ` Adam Duskett
2018-05-04 19:58 ` Romain Naour
0 siblings, 1 reply; 8+ messages in thread
From: Adam Duskett @ 2018-05-02 13:21 UTC (permalink / raw)
To: buildroot
Hey Romain;
On Tue, May 1, 2018 at 10:58 AM Romain Naour <romain.naour@gmail.com> wrote:
> Hi Adam,
> Thanks for this new version.
> Le 27/04/2018 ? 17:40, Adam Duskett a ?crit :
> > In addition:
> > - Update
0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
> > with new line numbers and file location.
> > - Remove upstream 0002-memfd-fix-configure-test.patch
> > - Add new options found in 2.12.0 in qemu.mk as disabled.
> > - Remove --with-system-pixman as it's no longer optional.
> >
> > Tested with test-pkg:
> >
> > ./utils/test-pkg -p qemu -c configs/qemu_min_defconfig
> > br-arm-full [1/6]: OK
> > br-arm-cortex-a9-glibc [2/6]: OK
> > br-arm-cortex-m4-full [3/6]: SKIPPED
> > br-x86-64-musl [4/6]: OK
> > br-arm-full-static [5/6]: OK
> > armv5-ctng-linux-gnueabi [6/6]: OK
> > 6 builds, 1 skipped, 0 build failed, 0 legal-info failed
> Maybe you can complete the test-pkg result with a runtime test with qemu
> configs? see [1] for example.
> Note that Qemu 2.12 has deprecated SDL support in favor of 2.0 series [2].
> Maybe it's time to switch to SDL2.
> Best regards,
> Romain
While it's true that it deprecated support for SDL in favor of 2.0, I would
disagree with removing
SDL support AND updating in a single patch. Also, even though it's
deprecated, it still works.
Thanks!
Adam
> [1]
https://git.buildroot.net/buildroot/commit/?id=477756b257c4b72e03679b9142104860e1d4dabc
> [2]
https://git.qemu.org/?p=qemu.git;h=e52c6ba34149b4f39c3fd60e59ee32b809db2bfa
> >
> > Signed-off-by: Adam Duskett <aduskett@gmail.com>
> > ---
> > ...ix-usage-of-mcontext-structure-on-ARM-uCl.patch | 10 ++--
> > package/qemu/0002-memfd-fix-configure-test.patch | 58
----------------------
> > package/qemu/qemu.hash | 2 +-
> > package/qemu/qemu.mk | 13 ++++-
> > 4 files changed, 18 insertions(+), 65 deletions(-)
> > delete mode 100644 package/qemu/0002-memfd-fix-configure-test.patch
> >
> > diff --git
a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
> > index 6d6d024d9d..2763737fe6 100644
> > ---
a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
> > +++
b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
> > @@ -13,15 +13,17 @@ general case of using uc_mcontext.arm_pc, which
works fine with
> > uClibc.
> >
> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > +[aduskett at gmail.com: Update for 2.12.0]
> > +Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
> > ---
> > user-exec.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > -diff --git a/user-exec.c b/user-exec.c
> > +diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
> > index 6db0758..2b3d116 100644
> > ---- a/user-exec.c
> > -+++ b/user-exec.c
> > -@@ -409,7 +409,7 @@ int cpu_signal_handler(int host_signum, void
*pinfo,
> > +--- a/accel/tcg/user-exec.c
> > ++++ b/accel/tcg/user-exec.c
> > +@@ -463,7 +463,7 @@ int cpu_signal_handler(int host_signum, void
*pinfo,
> >
> > #if defined(__NetBSD__)
> > pc = uc->uc_mcontext.__gregs[_REG_R15];
> > diff --git a/package/qemu/0002-memfd-fix-configure-test.patch
b/package/qemu/0002-memfd-fix-configure-test.patch
> > deleted file mode 100644
> > index 3e06c0e932..0000000000
> > --- a/package/qemu/0002-memfd-fix-configure-test.patch
> > +++ /dev/null
> > @@ -1,58 +0,0 @@
> > -From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
> > -From: Paolo Bonzini <pbonzini@redhat.com>
> > -Date: Tue, 28 Nov 2017 11:51:27 +0100
> > -Subject: [PATCH] memfd: fix configure test
> > -MIME-Version: 1.0
> > -Content-Type: text/plain; charset=UTF-8
> > -Content-Transfer-Encoding: 8bit
> > -
> > -Recent glibc added memfd_create in sys/mman.h. This conflicts with
> > -the definition in util/memfd.c:
> > -
> > - /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error:
static declaration of memfd_create follows non-static declaration
> > -
> > -Fix the configure test, and remove the sys/memfd.h inclusion since the
> > -file actually does not exist---it is a typo in the memfd_create(2) man
> > -page.
> > -
> > -Cc: Marc-Andr? Lureau <marcandre.lureau@redhat.com>
> > -Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > -Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > ----
> > -Upstream status: commit 75e5b70e6b5
> > -
> > - configure | 2 +-
> > - util/memfd.c | 4 +---
> > - 2 files changed, 2 insertions(+), 4 deletions(-)
> > -
> > -diff --git a/configure b/configure
> > -index 9c8aa5a98bd4..99ccc1725ace 100755
> > ---- a/configure
> > -+++ b/configure
> > -@@ -3923,7 +3923,7 @@ fi
> > - # check if memfd is supported
> > - memfd=no
> > - cat > $TMPC << EOF
> > --#include <sys/memfd.h>
> > -+#include <sys/mman.h>
> > -
> > - int main(void)
> > - {
> > -diff --git a/util/memfd.c b/util/memfd.c
> > -index 4571d1aba866..412e94a405fc 100644
> > ---- a/util/memfd.c
> > -+++ b/util/memfd.c
> > -@@ -31,9 +31,7 @@
> > -
> > - #include "qemu/memfd.h"
> > -
> > --#ifdef CONFIG_MEMFD
> > --#include <sys/memfd.h>
> > --#elif defined CONFIG_LINUX
> > -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
> > - #include <sys/syscall.h>
> > - #include <asm/unistd.h>
> > -
> > ---
> > -2.16.2
> > -
> > diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash
> > index 1173c1bf3d..fc0b4e87bf 100644
> > --- a/package/qemu/qemu.hash
> > +++ b/package/qemu/qemu.hash
> > @@ -1,4 +1,4 @@
> > # Locally computed, tarball verified with GPG signature
> > -sha256
fcfdaa1ecdaac8aead616fe811bfb8fe4a8f2cd59796aa446c5175b5af0e829f
qemu-2.10.2.tar.xz
> > +sha256
e69301f361ff65bf5dabd8a19196aeaa5613c1b5ae1678f0823bdf50e7d5c6fc
qemu-2.12.0.tar.xz
> > sha256
6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING
> > sha256
48ffe9fc7f1d5462dbd19340bc4dd1d8a9e37c61ed535813e614cbe4a5f0d4df
COPYING.LIB
> > diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
> > index f6f4a2b870..975dfba490 100644
> > --- a/package/qemu/qemu.mk
> > +++ b/package/qemu/qemu.mk
> > @@ -4,7 +4,7 @@
> > #
> >
################################################################################
> >
> > -QEMU_VERSION = 2.10.2
> > +QEMU_VERSION = 2.12.0
> > QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
> > QEMU_SITE = http://download.qemu.org
> > QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause,
Others/BSD-1c
> > @@ -230,7 +230,6 @@ define QEMU_CONFIGURE_CMDS
> > ./configure \
> > --prefix=/usr \
> > --cross-prefix=$(TARGET_CROSS) \
> > - --with-system-pixman \
> > --audio-drv-list= \
> > --enable-kvm \
> > --enable-attr \
> > @@ -255,6 +254,16 @@ define QEMU_CONFIGURE_CMDS
> > --disable-strip \
> > --disable-seccomp \
> > --disable-sparse \
> > + --disable-mpath \
> > + --disable-sanitizers \
> > + --disable-hvf \
> > + --disable-whpx \
> > + --disable-malloc-trim \
> > + --disable-membarrier \
> > + --disable-vhost-crypto \
> > + --disable-libxml2 \
> > + --disable-capstone \
> > + --disable-git-update \
> > $(QEMU_OPTS) \
> > )
> > endef
> >
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] qemu: bump to 2.12.0
2018-05-02 13:21 ` Adam Duskett
@ 2018-05-04 19:58 ` Romain Naour
0 siblings, 0 replies; 8+ messages in thread
From: Romain Naour @ 2018-05-04 19:58 UTC (permalink / raw)
To: buildroot
Hi Adam,
Le 02/05/2018 ? 15:21, Adam Duskett a ?crit?:
> Hey Romain;
>
> On Tue, May 1, 2018 at 10:58 AM Romain Naour <romain.naour@gmail.com> wrote:
>
[...]
>
>> Note that Qemu 2.12 has deprecated SDL support in favor of 2.0 series [2].
>> Maybe it's time to switch to SDL2.
>
>> Best regards,
>> Romain
>
> While it's true that it deprecated support for SDL in favor of 2.0, I would
> disagree with removing
> SDL support AND updating in a single patch. Also, even though it's
> deprecated, it still works.
Agree, the SDL support must be updated in a followup patch if you want to do
that in this series.
Best regards,
Romain
>
> Thanks!
> Adam
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] qemu: bump to 2.12.0
2018-04-27 15:40 [Buildroot] [PATCH 1/2] qemu: bump to 2.12.0 Adam Duskett
2018-04-27 15:40 ` [Buildroot] [PATCH 2/2] qemu: add support for python 3.6 Adam Duskett
2018-05-01 14:58 ` [Buildroot] [PATCH 1/2] qemu: bump to 2.12.0 Romain Naour
@ 2018-08-10 21:59 ` Thomas Petazzoni
2 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2018-08-10 21:59 UTC (permalink / raw)
To: buildroot
Hello Adam,
On Fri, 27 Apr 2018 11:40:54 -0400, Adam Duskett wrote:
> In addition:
> - Update 0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
> with new line numbers and file location.
> - Remove upstream 0002-memfd-fix-configure-test.patch
> - Add new options found in 2.12.0 in qemu.mk as disabled.
> - Remove --with-system-pixman as it's no longer optional.
>
> Tested with test-pkg:
>
> ./utils/test-pkg -p qemu -c configs/qemu_min_defconfig
> br-arm-full [1/6]: OK
> br-arm-cortex-a9-glibc [2/6]: OK
> br-arm-cortex-m4-full [3/6]: SKIPPED
> br-x86-64-musl [4/6]: OK
> br-arm-full-static [5/6]: OK
> armv5-ctng-linux-gnueabi [6/6]: OK
> 6 builds, 1 skipped, 0 build failed, 0 legal-info failed
>
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
Thanks, I've applied to next. One comment below, though.
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> +[aduskett at gmail.com: Update for 2.12.0]
> +Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
Once again, please stop adding your SoB and an "Update" comment when
all what is happening is changing line numbers/adjusting to minor
conflicts.
Thanks!
Thoams
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] qemu: add support for python 3.6
2018-04-27 15:40 ` [Buildroot] [PATCH 2/2] qemu: add support for python 3.6 Adam Duskett
2018-05-01 15:01 ` Romain Naour
@ 2018-08-20 22:31 ` Thomas Petazzoni
1 sibling, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2018-08-20 22:31 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 27 Apr 2018 11:40:55 -0400, Adam Duskett wrote:
> qemu 2.12.0 now supports building against python3.
> see: https://wiki.qemu.org/ChangeLog/2.12#Build_Dependencies
>
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
> package/qemu/qemu.mk | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
You posted this patch on April 27, and got some review on May 1 from
Romain, but never replied. I am marking this patch as Changes
Requested. Could you send an updated version when you have some time ?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-08-20 22:31 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-27 15:40 [Buildroot] [PATCH 1/2] qemu: bump to 2.12.0 Adam Duskett
2018-04-27 15:40 ` [Buildroot] [PATCH 2/2] qemu: add support for python 3.6 Adam Duskett
2018-05-01 15:01 ` Romain Naour
2018-08-20 22:31 ` Thomas Petazzoni
2018-05-01 14:58 ` [Buildroot] [PATCH 1/2] qemu: bump to 2.12.0 Romain Naour
2018-05-02 13:21 ` Adam Duskett
2018-05-04 19:58 ` Romain Naour
2018-08-10 21:59 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.