[PATCH] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup

[PATCH] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup

[Philip Tricca]

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.

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..1fad48d 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"
 
 # 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

Re: [PATCH] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup

[Chris Patterson]

[-- Attachment #1: Type: text/plain, Size: 2471 bytes --]

Hey Phil,

I would think that libsdl should be included as a runtime dependency if
enabled...?  Though looking through recipes, it would appear that many
PACKAGECONFIG users ignore the runtime dependencies (presumably assuming
that the image will include them if the functionality is desired - or
perhaps specifying only when the dependency is strictly required as a
result?).

Cheers,
-Chris


On Sun, Nov 3, 2013 at 11:10 AM, 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.
>
> 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..1fad48d 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"
>
>  # 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: 3440 bytes --]

Re: [PATCH] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup

[Philip Tricca]

Hi Chris,

On 11/04/2013 10:17 PM, Chris Patterson wrote:
> I would think that libsdl should be included as a runtime dependency if
> enabled...?  Though looking through recipes, it would appear that many
> PACKAGECONFIG users ignore the runtime dependencies (presumably assuming
> that the image will include them if the functionality is desired - or
> perhaps specifying only when the dependency is strictly required as a
> result?).

I left out the runtime dependency stuff because the xen-qemu package
will end up with a dependency on libsdl if it's enabled. I was under the
impression that this is sufficient though I'm not exactly sure how the
dependency is created. Honestly I was happy to write it off as
bitbake/OE magic. I've tested dom0 images with sdl enabled and disabled
and the xen-qemu package will pull the SDL library into the image if
it's enabled.

Are you seeing different behavior?

Regards,
- Philip

P.S. There's a dependency issue with this patch anyways so I'll send out
a v2 with a minor fix tonight.

> On Sun, Nov 3, 2013 at 11:10 AM, 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.
> 
>     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..1fad48d 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"
> 
>      # 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
> 
> 

Re: [PATCH] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup

[Chris Patterson]

[-- Attachment #1: Type: text/plain, Size: 1365 bytes --]

On Tue, Nov 5, 2013 at 12:35 PM, Philip Tricca <flihp@twobit.us> wrote:

> Hi Chris,
>
> On 11/04/2013 10:17 PM, Chris Patterson wrote:
> > I would think that libsdl should be included as a runtime dependency if
> > enabled...?  Though looking through recipes, it would appear that many
> > PACKAGECONFIG users ignore the runtime dependencies (presumably assuming
> > that the image will include them if the functionality is desired - or
> > perhaps specifying only when the dependency is strictly required as a
> > result?).
>
> I left out the runtime dependency stuff because the xen-qemu package
> will end up with a dependency on libsdl if it's enabled. I was under the
> impression that this is sufficient though I'm not exactly sure how the
> dependency is created. Honestly I was happy to write it off as
> bitbake/OE magic. I've tested dom0 images with sdl enabled and disabled
> and the xen-qemu package will pull the SDL library into the image if
> it's enabled.
>
> Are you seeing different behavior?
>

My mistake - my grep foo was weak - the libSDL shared objects are special
enough to deserve capitalization. :)

Coincidentally, after sending that email, a few minutes later I read a
thread on oe-core that explained that RDEPENDS wasn't needed if it matches
DEPENDS (and vice versa). And now I know...

Cheers,
-Chris

[-- Attachment #2: Type: text/html, Size: 1845 bytes --]

Re: [PATCH] xen: use PACKAGECONFIG for SDL and a bit of dependency cleanup

[Philip Tricca]

On 11/05/2013 08:08 PM, Chris Patterson wrote:
> 
> 
> 
> On Tue, Nov 5, 2013 at 12:35 PM, Philip Tricca <flihp@twobit.us
> <mailto:flihp@twobit.us>> wrote:
> 
>     Hi Chris,
> 
>     On 11/04/2013 10:17 PM, Chris Patterson wrote:
>     > I would think that libsdl should be included as a runtime
>     dependency if
>     > enabled...?  Though looking through recipes, it would appear that many
>     > PACKAGECONFIG users ignore the runtime dependencies (presumably
>     assuming
>     > that the image will include them if the functionality is desired - or
>     > perhaps specifying only when the dependency is strictly required as a
>     > result?).
> 
>     I left out the runtime dependency stuff because the xen-qemu package
>     will end up with a dependency on libsdl if it's enabled. I was under the
>     impression that this is sufficient though I'm not exactly sure how the
>     dependency is created. Honestly I was happy to write it off as
>     bitbake/OE magic. I've tested dom0 images with sdl enabled and disabled
>     and the xen-qemu package will pull the SDL library into the image if
>     it's enabled.
> 
>     Are you seeing different behavior?
> 
> 
> My mistake - my grep foo was weak - the libSDL shared objects are
> special enough to deserve capitalization. :)

I did the same thing. No worries.

Just sent out a v2 to get the glib-2.0 dependency I missed. Should be ok
from here but another set of eyes to test would be much appreciated. Any
progress on the update to Xen 4.3.1? ;)

- Philip