diff mbox series

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

Message ID 20180118185548.8994-1-alistair.francis@xilinx.com
State Changes Requested
Headers show
Series [1/2] package/xen: Force disable SDL for xen-qemu build | expand

Commit Message

Alistair Francis Jan. 18, 2018, 6:55 p.m. UTC 
Fixes autobuilder issue:
http://autobuild.buildroot.net/results/8bcb80dc93d38bb38ca32ad93d52c22d1176d57e/

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
---
 ...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

Comments

Thomas Petazzoni Jan. 18, 2018, 9:02 p.m. UTC | #1 
Hello,

On Thu, 18 Jan 2018 10:55:47 -0800, Alistair Francis wrote:

> diff --git a/package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch b/package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch
> new file mode 100644
> index 0000000000..fdb9d9c39d
> --- /dev/null
> +++ b/package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch
> @@ -0,0 +1,30 @@
> +From d3b633ee4d7d7a9ae0f99da4720d637d5fbeb007 Mon Sep 17 00:00:00 2001
> +From: Alistair Francis <alistair.francis@xilinx.com>
> +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 <alistair.francis@xilinx.com>
> +---
> + 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 \

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
Matt Weber Jan. 18, 2018, 9:11 p.m. UTC | #2 
Alistair,

On Thu, Jan 18, 2018 at 12:55 PM, Alistair Francis
<alistair.francis@xilinx.com> wrote:
> Fixes autobuilder issue:
> http://autobuild.buildroot.net/results/8bcb80dc93d38bb38ca32ad93d52c22d1176d57e/
>
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> ---
>  ...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
>
> diff --git a/package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch b/package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch
> new file mode 100644
> index 0000000000..fdb9d9c39d
> --- /dev/null
> +++ b/package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch
> @@ -0,0 +1,30 @@
> +From d3b633ee4d7d7a9ae0f99da4720d637d5fbeb007 Mon Sep 17 00:00:00 2001
> +From: Alistair Francis <alistair.francis@xilinx.com>
> +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 <alistair.francis@xilinx.com>
> +---
> + 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 \

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.

--- a/package/xen/xen.mk
+++ b/package/xen/xen.mk
@@ -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 = \
Matt Weber Jan. 18, 2018, 9:13 p.m. UTC | #3 
Alistair,

On Thu, Jan 18, 2018 at 3:11 PM, Matthew Weber
<matthew.weber@rockwellcollins.com> wrote:
> Alistair,
>
> On Thu, Jan 18, 2018 at 12:55 PM, Alistair Francis
> <alistair.francis@xilinx.com> wrote:
>> Fixes autobuilder issue:
>> http://autobuild.buildroot.net/results/8bcb80dc93d38bb38ca32ad93d52c22d1176d57e/
>>
>> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
>> ---
>>  ...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
>>
>> diff --git a/package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch b/package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch
>> new file mode 100644
>> index 0000000000..fdb9d9c39d
>> --- /dev/null
>> +++ b/package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch
>> @@ -0,0 +1,30 @@
>> +From d3b633ee4d7d7a9ae0f99da4720d637d5fbeb007 Mon Sep 17 00:00:00 2001
>> +From: Alistair Francis <alistair.francis@xilinx.com>
>> +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 <alistair.francis@xilinx.com>
>> +---
>> + 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 \
>
> 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.
>
> --- a/package/xen/xen.mk
> +++ b/package/xen/xen.mk
> @@ -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.

--- a/package/xen/xen.mk
+++ b/package/xen/xen.mk
@@ -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 Jan. 18, 2018, 9:27 p.m. UTC | #4 
>>>>> "Matthew" == Matthew Weber <matthew.weber@rockwellcollins.com> writes:

Hi,

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

 > --- a/package/xen/xen.mk
 > +++ b/package/xen/xen.mk
 > @@ -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.
Matt Weber Jan. 18, 2018, 9:31 p.m. UTC | #5 
Peter,

On Thu, Jan 18, 2018 at 3:27 PM, Peter Korsgaard <peter@korsgaard.com> wrote:
>>>>>> "Matthew" == Matthew Weber <matthew.weber@rockwellcollins.com> writes:
>
> Hi,
>
>  > Actually this is cleaner and only sets when the tools build occurs.
>
>  > --- a/package/xen/xen.mk
>  > +++ b/package/xen/xen.mk
>  > @@ -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 Jan. 18, 2018, 9:38 p.m. UTC | #6 
On Thu, Jan 18, 2018 at 1:31 PM, Matthew Weber
<matthew.weber@rockwellcollins.com> wrote:
> Peter,
>
> On Thu, Jan 18, 2018 at 3:27 PM, Peter Korsgaard <peter@korsgaard.com> wrote:
>>>>>>> "Matthew" == Matthew Weber <matthew.weber@rockwellcollins.com> writes:
>>
>> Hi,
>>
>>  > Actually this is cleaner and only sets when the tools build occurs.
>>
>>  > --- a/package/xen/xen.mk
>>  > +++ b/package/xen/xen.mk
>>  > @@ -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.

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

Alistair
diff mbox series

Patch

diff --git a/package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch b/package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch
new file mode 100644
index 0000000000..fdb9d9c39d
--- /dev/null
+++ b/package/xen/003-tools-Makefile-Force-disable-SDL-QEMU-build.patch
@@ -0,0 +1,30 @@ 
+From d3b633ee4d7d7a9ae0f99da4720d637d5fbeb007 Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair.francis@xilinx.com>
+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 <alistair.francis@xilinx.com>
+---
+ 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
+