package/xen: Force disable SDL for xen-qemu build

PATCH New Alistair Francis 5 participants 9 messages Jan 18, 2018

lore

Share & tools

lore

Alistair Francis

author

2018-01-18 18:55 UTC #0 lore raw

PATCH 1/2 package/xen: Force disable SDL for xen-qemu build

Fixes autobuilder issue:
http://autobuild.buildroot.net/results/8bcb80dc93d38bb38ca32ad93d52c22d1176d57e/

Signed-off-by Alistair Francis <[email protected]>

---
 ...ols-Makefile-Force-disable-SDL-QEMU-build.patch | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch

package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch new file +30 -0

new file mode 100644
index 0000000000..fdb9d9c39d
@@ -0,0 +1,30 @@
+From d3b633ee4d7d7a9ae0f99da4720d637d5fbeb007 Mon Sep 17 00:00:00 2001
+From: Alistair Francis <[email protected]>
+Date: Thu, 18 Jan 2018 09:51:35 -0800
+Subject: [PATCH] tools/Makefile: Force disable SDL QEMU build
+
+This patch fixes this compile issue when building xen-qemu with SDL
+
+/output/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/include/SDL2/SDL_syswm.h:83:22: fatal error: directfb.h: No such file or directory
+ #include <directfb.h>
+
+Signed-off-by: Alistair Francis <[email protected]>
+---
+ tools/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/Makefile b/tools/Makefile
+index ab7a01ee1b..4df6228fc5 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -274,6 +274,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
+ 		--datadir=$(SHAREDIR)/qemu-xen \
+ 		--localstatedir=$(localstatedir) \
+ 		--disable-kvm \
++		--disable-sdl \
+ 		--disable-docs \
+ 		--disable-guest-agent \
+ 		--python=$(PYTHON) \
+-- 
+2.14.1
+

Signature · 1 line

2.14.1

Alistair Francis

author

2018-01-18 18:55 UTC #1 lore raw

PATCH 2/2 package/xen: Bump to latest 4.10.0 release

Signed-off-by Alistair Francis <[email protected]>

---
 package/xen/xen.hash | 2 +-
 package/xen/xen.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/xen/xen.hash +1 -1

index fcd4e85f45..fa4d25bab2 100644
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 ecf88b01f44cd8f4ef208af3f999dceb69bdd2a316d88dd9a9535ea7b49ed356 xen-4.9.1.tar.gz
+sha256 0262a7023f8b12bcacfb0b25e69b2a63291f944f7683d54d8f33d4b2ca556844 xen-4.10.0.tar.gz

package/xen/xen.mk +1 -1

index d31185914c..6aa066e4e2 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XEN_VERSION = 4.9.1
+XEN_VERSION = 4.10.0
 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION)
 XEN_LICENSE = GPL-2.0
 XEN_LICENSE_FILES = COPYING

Signature · 1 line

2.14.1

Thomas Petazzoni

Applied

2018-01-18 21:08 UTC #2 lore raw

PATCH 2/2 package/xen: Bump to latest 4.10.0 release

Hello,

Quoted 5 lines · Alistair Francis

Signed-off-by Alistair Francis <[email protected]>
---
 package/xen/xen.hash | 2 +-
 package/xen/xen.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines

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

Thomas Petazzoni

2018-01-18 21:02 UTC #3 lore raw

PATCH 1/2 package/xen: Force disable SDL for xen-qemu build

In reply to Alistair Francis

Hello,

Quoted 20 lines · Alistair Francis

package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch new file +14 -0

new file mode 100644
index 0000000000..fdb9d9c39d
@@ -0,0 +1,30 @@
+From d3b633ee4d7d7a9ae0f99da4720d637d5fbeb007 Mon Sep 17 00:00:00 2001
+From: Alistair Francis <[email protected]>
+Date: Thu, 18 Jan 2018 09:51:35 -0800
+Subject: [PATCH] tools/Makefile: Force disable SDL QEMU build
+
+This patch fixes this compile issue when building xen-qemu with SDL
+
+/output/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/include/SDL2/SDL_syswm.h:83:22: fatal error: directfb.h: No such file or directory
+ #include <directfb.h>
+
+Signed-off-by: Alistair Francis <[email protected]>
+---
+ tools/Makefile | 1 +
+ 1 file changed, 1 insertion(+)

package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch line 24

Quoted 10 lines

package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch new file +10 -0

+
+diff --git a/tools/Makefile b/tools/Makefile
+index ab7a01ee1b..4df6228fc5 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -274,6 +274,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
+ 		--datadir=$(SHAREDIR)/qemu-xen \
+ 		--localstatedir=$(localstatedir) \
+ 		--disable-kvm \
++		--disable-sdl \

Instead of patching, could you try:

	----with-extra-qemuu-configure-args="--disable-sdl"

passed to the top-level configure script, from xen.mk ?

This should have the same effect, without requiring a patch.

Thanks!

Thomas

Signature · 3 lines

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

Matthew Weber

2018-01-18 21:11 UTC #4 lore raw

PATCH 1/2 package/xen: Force disable SDL for xen-qemu build

In reply to Alistair Francis

Alistair,

Quoted 29 lines · Alistair Francis

Fixes autobuilder issue:
http://autobuild.buildroot.net/results/8bcb80dc93d38bb38ca32ad93d52c22d1176d57e/

Signed-off-by Alistair Francis <[email protected]>

---
 ...ols-Makefile-Force-disable-SDL-QEMU-build.patch | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch

package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch new file +14 -0

new file mode 100644
index 0000000000..fdb9d9c39d
@@ -0,0 +1,30 @@
+From d3b633ee4d7d7a9ae0f99da4720d637d5fbeb007 Mon Sep 17 00:00:00 2001
+From: Alistair Francis <[email protected]>
+Date: Thu, 18 Jan 2018 09:51:35 -0800
+Subject: [PATCH] tools/Makefile: Force disable SDL QEMU build
+
+This patch fixes this compile issue when building xen-qemu with SDL
+
+/output/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/include/SDL2/SDL_syswm.h:83:22: fatal error: directfb.h: No such file or directory
+ #include <directfb.h>
+
+Signed-off-by: Alistair Francis <[email protected]>
+---
+ tools/Makefile | 1 +
+ 1 file changed, 1 insertion(+)

package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch line 24

Quoted 10 lines

package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch new file +10 -0

+
+diff --git a/tools/Makefile b/tools/Makefile
+index ab7a01ee1b..4df6228fc5 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -274,6 +274,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
+               --datadir=$(SHAREDIR)/qemu-xen \
+               --localstatedir=$(localstatedir) \
+               --disable-kvm \
++              --disable-sdl \

Agree that fixes it but it's another patch. Ah I see Thomas just sent a similar email while I was typing my update. I've just finished testing that exact approach below.

package/xen/xen.mk +1 -2

@@ -17,7 +17,7 @@ else ifeq ($(ARCH),arm)
 XEN_ARCH = arm32
 endif
 
-XEN_CONF_OPTS = --disable-ocamltools
+XEN_CONF_OPTS = --disable-ocamltools
--with-extra-qemuu-configure-args="--disable-sdl"
 
 XEN_CONF_ENV = PYTHON=$(HOST_DIR)/bin/python2

XEN_MAKE_ENV = \

Matthew Weber

2018-01-18 21:13 UTC #5 lore raw

PATCH 1/2 package/xen: Force disable SDL for xen-qemu build

Alistair,

Quoted 51 lines · Matthew Weber

Alistair,
Quoted 29 lines · Alistair Francis
Fixes autobuilder issue:
http://autobuild.buildroot.net/results/8bcb80dc93d38bb38ca32ad93d52c22d1176d57e/
Signed-off-by Alistair Francis <[email protected]>
---
 ...ols-Makefile-Force-disable-SDL-QEMU-build.patch | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch
package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch new file +14 -0
new file mode 100644
index 0000000000..fdb9d9c39d
@@ -0,0 +1,30 @@
+From d3b633ee4d7d7a9ae0f99da4720d637d5fbeb007 Mon Sep 17 00:00:00 2001
+From: Alistair Francis <[email protected]>
+Date: Thu, 18 Jan 2018 09:51:35 -0800
+Subject: [PATCH] tools/Makefile: Force disable SDL QEMU build
+
+This patch fixes this compile issue when building xen-qemu with SDL
+
+/output/host/bin/../arm-buildroot-linux-gnueabihf/sysroot/usr/include/SDL2/SDL_syswm.h:83:22: fatal error: directfb.h: No such file or directory
+ #include <directfb.h>
+
+Signed-off-by: Alistair Francis <[email protected]>
+---
+ tools/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch line 24
Quoted 10 lines
package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch new file +10 -0
+
+diff --git a/tools/Makefile b/tools/Makefile
+index ab7a01ee1b..4df6228fc5 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -274,6 +274,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
+               --datadir=$(SHAREDIR)/qemu-xen \
+               --localstatedir=$(localstatedir) \
+               --disable-kvm \
++              --disable-sdl \
Agree that fixes it but it's another patch. Ah I see Thomas just sent a similar email while I was typing my update. I've just finished testing that exact approach below.

package/xen/xen.mk else ifeq ($(ARCH),arm)

Quoted 9 lines

package/xen/xen.mk +1 -2

@@ -17,7 +17,7 @@ else ifeq ($(ARCH),arm)
 XEN_ARCH = arm32
 endif
 
-XEN_CONF_OPTS = --disable-ocamltools
+XEN_CONF_OPTS = --disable-ocamltools
--with-extra-qemuu-configure-args="--disable-sdl"
 
 XEN_CONF_ENV = PYTHON=$(HOST_DIR)/bin/python2
 XEN_MAKE_ENV = \

Actually this is cleaner and only sets when the tools build occurs.

package/xen/xen.mk +1 -0

@@ -43,6 +43,7 @@ XEN_DEPENDENCIES += argp-standalone
 endif
 XEN_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-tools
 XEN_MAKE_OPTS += dist-tools
+XEN_CONF_OPTS =  --with-extra-qemuu-configure-args="--disable-sdl"
 
 define XEN_INSTALL_INIT_SYSV
        mv $(TARGET_DIR)/etc/init.d/xencommons

$(TARGET_DIR)/etc/init.d/S50xencommons

Peter Korsgaard

2018-01-18 21:27 UTC #6 lore raw

PATCH 1/2 package/xen: Force disable SDL for xen-qemu build

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Matthew" == Matthew Weber <[email protected]> writes:

Hi,

package/xen/xen.mk XEN_DEPENDENCIES += argp-standalone · line 46

Quoted 9 lines

Actually this is cleaner and only sets when the tools build occurs.

package/xen/xen.mk +1 -0

@@ -43,6 +43,7 @@ XEN_DEPENDENCIES += argp-standalone
 endif
 XEN_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-tools
 XEN_MAKE_OPTS += dist-tools
+XEN_CONF_OPTS =  --with-extra-qemuu-configure-args="--disable-sdl"

Agreed, but lease make that += like the rest of the file.

Signature · 1 line

Bye, Peter Korsgaard

Matthew Weber

2018-01-18 21:31 UTC #7 lore raw

PATCH 1/2 package/xen: Force disable SDL for xen-qemu build

Peter,

Quoted 6 lines · Peter Korsgaard

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Matthew" == Matthew Weber <[email protected]> writes:
Hi,
Quoted 1 line
Actually this is cleaner and only sets when the tools build occurs.

Quoted 9 lines

package/xen/xen.mk XEN_DEPENDENCIES += argp-standalone · line 46
Quoted 7 lines
package/xen/xen.mk +1 -0
@@ -43,6 +43,7 @@ XEN_DEPENDENCIES += argp-standalone
 endif
 XEN_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-tools
 XEN_MAKE_OPTS += dist-tools
+XEN_CONF_OPTS =  --with-extra-qemuu-configure-args="--disable-sdl"
Agreed, but lease make that += like the rest of the file.

Good catch.

Alistair Francis

2018-01-18 21:38 UTC #8 lore raw

PATCH 1/2 package/xen: Force disable SDL for xen-qemu build

Quoted 17 lines · Matthew Weber

Peter,
Quoted 14 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Matthew" == Matthew Weber <[email protected]> writes:
Hi,
Quoted 9 lines
Actually this is cleaner and only sets when the tools build occurs.
package/xen/xen.mk +1 -0
@@ -43,6 +43,7 @@ XEN_DEPENDENCIES += argp-standalone
 endif
 XEN_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-tools
 XEN_MAKE_OPTS += dist-tools
+XEN_CONF_OPTS =  --with-extra-qemuu-configure-args="--disable-sdl"

Quoted 3 lines

Quoted 1 line
Agreed, but lease make that += like the rest of the file.
Good catch.

Ok, preparing a patch now. Thanks for the feedback.

Alistair