* [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build
@ 2018-01-18 18:55 Alistair Francis
2018-01-18 18:55 ` [Buildroot] [PATCH 2/2] package/xen: Bump to latest 4.10.0 release Alistair Francis
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Alistair Francis @ 2018-01-18 18:55 UTC (permalink / raw)
To: buildroot
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 \
+ --disable-docs \
+ --disable-guest-agent \
+ --python=$(PYTHON) \
+--
+2.14.1
+
--
2.14.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 2/2] package/xen: Bump to latest 4.10.0 release 2018-01-18 18:55 [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build Alistair Francis @ 2018-01-18 18:55 ` Alistair Francis 2018-01-18 21:08 ` Thomas Petazzoni 2018-01-18 21:02 ` [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build Thomas Petazzoni 2018-01-18 21:11 ` Matthew Weber 2 siblings, 1 reply; 9+ messages in thread From: Alistair Francis @ 2018-01-18 18:55 UTC (permalink / raw) To: buildroot Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> --- package/xen/xen.hash | 2 +- package/xen/xen.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xen/xen.hash b/package/xen/xen.hash index fcd4e85f45..fa4d25bab2 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 ecf88b01f44cd8f4ef208af3f999dceb69bdd2a316d88dd9a9535ea7b49ed356 xen-4.9.1.tar.gz +sha256 0262a7023f8b12bcacfb0b25e69b2a63291f944f7683d54d8f33d4b2ca556844 xen-4.10.0.tar.gz diff --git a/package/xen/xen.mk b/package/xen/xen.mk index d31185914c..6aa066e4e2 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -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 -- 2.14.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] package/xen: Bump to latest 4.10.0 release 2018-01-18 18:55 ` [Buildroot] [PATCH 2/2] package/xen: Bump to latest 4.10.0 release Alistair Francis @ 2018-01-18 21:08 ` Thomas Petazzoni 0 siblings, 0 replies; 9+ messages in thread From: Thomas Petazzoni @ 2018-01-18 21:08 UTC (permalink / raw) To: buildroot Hello, On Thu, 18 Jan 2018 10:55:48 -0800, Alistair Francis wrote: > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> > --- > package/xen/xen.hash | 2 +- > package/xen/xen.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build 2018-01-18 18:55 [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build Alistair Francis 2018-01-18 18:55 ` [Buildroot] [PATCH 2/2] package/xen: Bump to latest 4.10.0 release Alistair Francis @ 2018-01-18 21:02 ` Thomas Petazzoni 2018-01-18 21:11 ` Matthew Weber 2 siblings, 0 replies; 9+ messages in thread From: Thomas Petazzoni @ 2018-01-18 21:02 UTC (permalink / raw) To: buildroot 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 -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build 2018-01-18 18:55 [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build Alistair Francis 2018-01-18 18:55 ` [Buildroot] [PATCH 2/2] package/xen: Bump to latest 4.10.0 release Alistair Francis 2018-01-18 21:02 ` [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build Thomas Petazzoni @ 2018-01-18 21:11 ` Matthew Weber 2018-01-18 21:13 ` Matthew Weber 2 siblings, 1 reply; 9+ messages in thread From: Matthew Weber @ 2018-01-18 21:11 UTC (permalink / raw) To: buildroot 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 = \ ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build 2018-01-18 21:11 ` Matthew Weber @ 2018-01-18 21:13 ` Matthew Weber 2018-01-18 21:27 ` Peter Korsgaard 0 siblings, 1 reply; 9+ messages in thread From: Matthew Weber @ 2018-01-18 21:13 UTC (permalink / raw) To: buildroot 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 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build 2018-01-18 21:13 ` Matthew Weber @ 2018-01-18 21:27 ` Peter Korsgaard 2018-01-18 21:31 ` Matthew Weber 0 siblings, 1 reply; 9+ messages in thread From: Peter Korsgaard @ 2018-01-18 21:27 UTC (permalink / raw) To: buildroot >>>>> "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. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build 2018-01-18 21:27 ` Peter Korsgaard @ 2018-01-18 21:31 ` Matthew Weber 2018-01-18 21:38 ` Alistair Francis 0 siblings, 1 reply; 9+ messages in thread From: Matthew Weber @ 2018-01-18 21:31 UTC (permalink / raw) To: buildroot 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. ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build 2018-01-18 21:31 ` Matthew Weber @ 2018-01-18 21:38 ` Alistair Francis 0 siblings, 0 replies; 9+ messages in thread From: Alistair Francis @ 2018-01-18 21:38 UTC (permalink / raw) To: buildroot 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 ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-01-18 21:38 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-01-18 18:55 [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build Alistair Francis 2018-01-18 18:55 ` [Buildroot] [PATCH 2/2] package/xen: Bump to latest 4.10.0 release Alistair Francis 2018-01-18 21:08 ` Thomas Petazzoni 2018-01-18 21:02 ` [Buildroot] [PATCH 1/2] package/xen: Force disable SDL for xen-qemu build Thomas Petazzoni 2018-01-18 21:11 ` Matthew Weber 2018-01-18 21:13 ` Matthew Weber 2018-01-18 21:27 ` Peter Korsgaard 2018-01-18 21:31 ` Matthew Weber 2018-01-18 21:38 ` Alistair Francis
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox