* [PATCH v2] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup
@ 2013-11-06 2:17 Philip Tricca
2013-11-06 2:36 ` Chris Patterson
2013-11-07 20:33 ` Bruce Ashfield
0 siblings, 2 replies; 5+ messages in thread
From: Philip Tricca @ 2013-11-06 2:17 UTC (permalink / raw)
To: meta-virtualization
This patch moves the optional SDL dependency to a PACKAGECONFIG
entry. It also cleans up dependencies on both the virtual libsdl
and libsdl. The dependency on libgl is also removed. libGL support
should be enabled with the 'opengl' distro feature instead. The
dependency on glib-2.0 is now explicit as well.
Signed-off-by: Philip Tricca <flihp@twobit.us>
---
recipes-extended/xen/xen_4.3.0.bb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/recipes-extended/xen/xen_4.3.0.bb b/recipes-extended/xen/xen_4.3.0.bb
index 09c25aa..283da28 100644
--- a/recipes-extended/xen/xen_4.3.0.bb
+++ b/recipes-extended/xen/xen_4.3.0.bb
@@ -21,17 +21,19 @@ COMPATIBLE_HOST = '(x86_64.*).*-linux'
inherit autotools gettext setuptools update-rc.d
PACKAGECONFIG ??= " \
+ sdl \
xsm \
"
+PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl,"
PACKAGECONFIG[xsm] = "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native,"
-DEPENDS = "util-linux util-linux-native file-native zlib ncurses openssl bison-native flex-native gettext dev86-native iasl-native pciutils virtual/libgl virtual/libsdl bridge-utils iproute2 procps yajl pixman python python-setuptools-native xz xz-native libsdl"
+DEPENDS = "util-linux util-linux-native file-native zlib ncurses openssl bison-native flex-native gettext dev86-native iasl-native pciutils bridge-utils iproute2 procps yajl pixman python python-setuptools-native xz xz-native glib-2.0"
# inherit setuptools adds python to RDEPENDS, override it
RDEPENDS_${PN} = ""
RDEPENDS_${PN}-base = "\
- libgcc libsdl udev bash perl xz \
+ libgcc udev bash perl xz \
${PN}-blktap \
${PN}-console \
${PN}-libblktapctl \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup
2013-11-06 2:17 [PATCH v2] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup Philip Tricca
@ 2013-11-06 2:36 ` Chris Patterson
2013-11-06 13:13 ` Philip Tricca
2013-11-07 20:33 ` Bruce Ashfield
1 sibling, 1 reply; 5+ messages in thread
From: Chris Patterson @ 2013-11-06 2:36 UTC (permalink / raw)
To: Philip Tricca; +Cc: meta-virtualization@yoctoproject.org
[-- Attachment #1: Type: text/plain, Size: 2652 bytes --]
FYI - removing libgl as a dependency exposes another hardcoded
dependency/check/path (in this case adding /usr/include/GL to the include
path for qemu-xen-traditional). Probably won't hit it unless you have the
opengl or libsdl dev bits on your host (as I do).
WARNING: QA Issue: xen: The compile log indicates that host include and/or
library paths were used.
...
CC audio/sdlaudio.o
cc1: warning: include location "/usr/include/GL" is unsafe for
cross-compilation [-Wpoison-system-directories]
....
On Tue, Nov 5, 2013 at 9:17 PM, Philip Tricca <flihp@twobit.us> wrote:
> This patch moves the optional SDL dependency to a PACKAGECONFIG
> entry. It also cleans up dependencies on both the virtual libsdl
> and libsdl. The dependency on libgl is also removed. libGL support
> should be enabled with the 'opengl' distro feature instead. The
> dependency on glib-2.0 is now explicit as well.
>
> Signed-off-by: Philip Tricca <flihp@twobit.us>
> ---
> recipes-extended/xen/xen_4.3.0.bb | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-extended/xen/xen_4.3.0.bb b/recipes-extended/xen/
> xen_4.3.0.bb
> index 09c25aa..283da28 100644
> --- a/recipes-extended/xen/xen_4.3.0.bb
> +++ b/recipes-extended/xen/xen_4.3.0.bb
> @@ -21,17 +21,19 @@ COMPATIBLE_HOST = '(x86_64.*).*-linux'
> inherit autotools gettext setuptools update-rc.d
>
> PACKAGECONFIG ??= " \
> + sdl \
> xsm \
> "
> +PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl,"
> PACKAGECONFIG[xsm] =
> "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native,"
>
> -DEPENDS = "util-linux util-linux-native file-native zlib ncurses openssl
> bison-native flex-native gettext dev86-native iasl-native pciutils
> virtual/libgl virtual/libsdl bridge-utils iproute2 procps yajl pixman
> python python-setuptools-native xz xz-native libsdl"
> +DEPENDS = "util-linux util-linux-native file-native zlib ncurses openssl
> bison-native flex-native gettext dev86-native iasl-native pciutils
> bridge-utils iproute2 procps yajl pixman python python-setuptools-native xz
> xz-native glib-2.0"
>
> # inherit setuptools adds python to RDEPENDS, override it
> RDEPENDS_${PN} = ""
>
> RDEPENDS_${PN}-base = "\
> - libgcc libsdl udev bash perl xz \
> + libgcc udev bash perl xz \
> ${PN}-blktap \
> ${PN}-console \
> ${PN}-libblktapctl \
> --
> 1.7.10.4
>
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>
[-- Attachment #2: Type: text/html, Size: 3645 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup
2013-11-06 2:36 ` Chris Patterson
@ 2013-11-06 13:13 ` Philip Tricca
2013-11-07 3:20 ` Chris Patterson
0 siblings, 1 reply; 5+ messages in thread
From: Philip Tricca @ 2013-11-06 13:13 UTC (permalink / raw)
To: Chris Patterson; +Cc: meta-virtualization@yoctoproject.org
On 11/05/2013 09:36 PM, Chris Patterson wrote:
> FYI - removing libgl as a dependency exposes another hardcoded
> dependency/check/path (in this case adding /usr/include/GL to the
> include path for qemu-xen-traditional). Probably won't hit it unless
> you have the opengl or libsdl dev bits on your host (as I do).
>
> WARNING: QA Issue: xen: The compile log indicates that host include
> and/or library paths were used.
> ...
> CC audio/sdlaudio.o
> cc1: warning: include location "/usr/include/GL" is unsafe for
> cross-compilation [-Wpoison-system-directories]
> ....
Yuck. I'm seeing this in the qemu-xen-traditional configure script. It's
a separate issue from this patch though no?
- Philip
> On Tue, Nov 5, 2013 at 9:17 PM, Philip Tricca <flihp@twobit.us
> <mailto:flihp@twobit.us>> wrote:
>
> This patch moves the optional SDL dependency to a PACKAGECONFIG
> entry. It also cleans up dependencies on both the virtual libsdl
> and libsdl. The dependency on libgl is also removed. libGL support
> should be enabled with the 'opengl' distro feature instead. The
> dependency on glib-2.0 is now explicit as well.
>
> Signed-off-by: Philip Tricca <flihp@twobit.us <mailto:flihp@twobit.us>>
> ---
> recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb> | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb>
> b/recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb>
> index 09c25aa..283da28 100644
> --- a/recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb>
> +++ b/recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb>
> @@ -21,17 +21,19 @@ COMPATIBLE_HOST = '(x86_64.*).*-linux'
> inherit autotools gettext setuptools update-rc.d
>
> PACKAGECONFIG ??= " \
> + sdl \
> xsm \
> "
> +PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl,"
> PACKAGECONFIG[xsm] =
> "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native,"
>
> -DEPENDS = "util-linux util-linux-native file-native zlib ncurses
> openssl bison-native flex-native gettext dev86-native iasl-native
> pciutils virtual/libgl virtual/libsdl bridge-utils iproute2 procps
> yajl pixman python python-setuptools-native xz xz-native libsdl"
> +DEPENDS = "util-linux util-linux-native file-native zlib ncurses
> openssl bison-native flex-native gettext dev86-native iasl-native
> pciutils bridge-utils iproute2 procps yajl pixman python
> python-setuptools-native xz xz-native glib-2.0"
>
> # inherit setuptools adds python to RDEPENDS, override it
> RDEPENDS_${PN} = ""
>
> RDEPENDS_${PN}-base = "\
> - libgcc libsdl udev bash perl xz \
> + libgcc udev bash perl xz \
> ${PN}-blktap \
> ${PN}-console \
> ${PN}-libblktapctl \
> --
> 1.7.10.4
>
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> <mailto:meta-virtualization@yoctoproject.org>
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup
2013-11-06 13:13 ` Philip Tricca
@ 2013-11-07 3:20 ` Chris Patterson
0 siblings, 0 replies; 5+ messages in thread
From: Chris Patterson @ 2013-11-07 3:20 UTC (permalink / raw)
To: Philip Tricca; +Cc: meta-virtualization@yoctoproject.org
[-- Attachment #1: Type: text/plain, Size: 3679 bytes --]
On Wed, Nov 6, 2013 at 8:13 AM, Philip Tricca <flihp@twobit.us> wrote:
> On 11/05/2013 09:36 PM, Chris Patterson wrote:
> > FYI - removing libgl as a dependency exposes another hardcoded
> > dependency/check/path (in this case adding /usr/include/GL to the
> > include path for qemu-xen-traditional). Probably won't hit it unless
> > you have the opengl or libsdl dev bits on your host (as I do).
> >
> > WARNING: QA Issue: xen: The compile log indicates that host include
> > and/or library paths were used.
> > ...
> > CC audio/sdlaudio.o
> > cc1: warning: include location "/usr/include/GL" is unsafe for
> > cross-compilation [-Wpoison-system-directories]
> > ....
>
> Yuck. I'm seeing this in the qemu-xen-traditional configure script. It's
> a separate issue from this patch though no?
>
>
Yeah, I though the removal of libgl triggered it, but I guess not. I'm
looking at some of the trouble points, seeing what could be cleaned up for
future revs.
Cheers,
-Chris
> - Philip
>
> > On Tue, Nov 5, 2013 at 9:17 PM, Philip Tricca <flihp@twobit.us
> > <mailto:flihp@twobit.us>> wrote:
> >
> > This patch moves the optional SDL dependency to a PACKAGECONFIG
> > entry. It also cleans up dependencies on both the virtual libsdl
> > and libsdl. The dependency on libgl is also removed. libGL support
> > should be enabled with the 'opengl' distro feature instead. The
> > dependency on glib-2.0 is now explicit as well.
> >
> > Signed-off-by: Philip Tricca <flihp@twobit.us <mailto:
> flihp@twobit.us>>
> > ---
> > recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb> | 6
> ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb>
> > b/recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb>
> > index 09c25aa..283da28 100644
> > --- a/recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb>
> > +++ b/recipes-extended/xen/xen_4.3.0.bb <http://xen_4.3.0.bb>
> > @@ -21,17 +21,19 @@ COMPATIBLE_HOST = '(x86_64.*).*-linux'
> > inherit autotools gettext setuptools update-rc.d
> >
> > PACKAGECONFIG ??= " \
> > + sdl \
> > xsm \
> > "
> > +PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl,"
> > PACKAGECONFIG[xsm] =
> > "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native,"
> >
> > -DEPENDS = "util-linux util-linux-native file-native zlib ncurses
> > openssl bison-native flex-native gettext dev86-native iasl-native
> > pciutils virtual/libgl virtual/libsdl bridge-utils iproute2 procps
> > yajl pixman python python-setuptools-native xz xz-native libsdl"
> > +DEPENDS = "util-linux util-linux-native file-native zlib ncurses
> > openssl bison-native flex-native gettext dev86-native iasl-native
> > pciutils bridge-utils iproute2 procps yajl pixman python
> > python-setuptools-native xz xz-native glib-2.0"
> >
> > # inherit setuptools adds python to RDEPENDS, override it
> > RDEPENDS_${PN} = ""
> >
> > RDEPENDS_${PN}-base = "\
> > - libgcc libsdl udev bash perl xz \
> > + libgcc udev bash perl xz \
> > ${PN}-blktap \
> > ${PN}-console \
> > ${PN}-libblktapctl \
> > --
> > 1.7.10.4
> >
> > _______________________________________________
> > meta-virtualization mailing list
> > meta-virtualization@yoctoproject.org
> > <mailto:meta-virtualization@yoctoproject.org>
> > https://lists.yoctoproject.org/listinfo/meta-virtualization
> >
> >
>
>
[-- Attachment #2: Type: text/html, Size: 5698 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup
2013-11-06 2:17 [PATCH v2] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup Philip Tricca
2013-11-06 2:36 ` Chris Patterson
@ 2013-11-07 20:33 ` Bruce Ashfield
1 sibling, 0 replies; 5+ messages in thread
From: Bruce Ashfield @ 2013-11-07 20:33 UTC (permalink / raw)
To: Philip Tricca; +Cc: meta-virtualization@yoctoproject.org
On Tue, Nov 5, 2013 at 9:17 PM, Philip Tricca <flihp@twobit.us> wrote:
> This patch moves the optional SDL dependency to a PACKAGECONFIG
> entry. It also cleans up dependencies on both the virtual libsdl
> and libsdl. The dependency on libgl is also removed. libGL support
> should be enabled with the 'opengl' distro feature instead. The
> dependency on glib-2.0 is now explicit as well.
Merged. We'll worry about the other issues mentioned in this thread in future
patches.
Phillip: this should be all your pending patches merged, let me know if I've
missed anything.
Bruce
>
> Signed-off-by: Philip Tricca <flihp@twobit.us>
> ---
> recipes-extended/xen/xen_4.3.0.bb | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-extended/xen/xen_4.3.0.bb b/recipes-extended/xen/xen_4.3.0.bb
> index 09c25aa..283da28 100644
> --- a/recipes-extended/xen/xen_4.3.0.bb
> +++ b/recipes-extended/xen/xen_4.3.0.bb
> @@ -21,17 +21,19 @@ COMPATIBLE_HOST = '(x86_64.*).*-linux'
> inherit autotools gettext setuptools update-rc.d
>
> PACKAGECONFIG ??= " \
> + sdl \
> xsm \
> "
> +PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl,"
> PACKAGECONFIG[xsm] = "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native,"
>
> -DEPENDS = "util-linux util-linux-native file-native zlib ncurses openssl bison-native flex-native gettext dev86-native iasl-native pciutils virtual/libgl virtual/libsdl bridge-utils iproute2 procps yajl pixman python python-setuptools-native xz xz-native libsdl"
> +DEPENDS = "util-linux util-linux-native file-native zlib ncurses openssl bison-native flex-native gettext dev86-native iasl-native pciutils bridge-utils iproute2 procps yajl pixman python python-setuptools-native xz xz-native glib-2.0"
>
> # inherit setuptools adds python to RDEPENDS, override it
> RDEPENDS_${PN} = ""
>
> RDEPENDS_${PN}-base = "\
> - libgcc libsdl udev bash perl xz \
> + libgcc udev bash perl xz \
> ${PN}-blktap \
> ${PN}-console \
> ${PN}-libblktapctl \
> --
> 1.7.10.4
>
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-11-07 20:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-06 2:17 [PATCH v2] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup Philip Tricca
2013-11-06 2:36 ` Chris Patterson
2013-11-06 13:13 ` Philip Tricca
2013-11-07 3:20 ` Chris Patterson
2013-11-07 20:33 ` Bruce Ashfield
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.