xserver-xf86: Use PACKAGECONFIG for udev/hal choice and default to udev

Submitted by Richard Purdie on Oct. 6, 2011, 2:21 p.m.

Details

Message ID 1317910901.6398.88.camel@ted
State New, archived
Headers show

Commit Message

Richard Purdie Oct. 6, 2011, 2:21 p.m.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch hide | download patch | download mbox

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
index 000aea3..4c8b732 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
@@ -35,3 +35,8 @@  FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
 SRC_URI += "file://macro_tweak.patch"
 
 EXTRA_OECONF = "--with-fop=no"
+
+PACKAGECONFIG ??= "udev"
+PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal"
+PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,,udev"
+
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
index 3aca760..6b13873 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
@@ -6,7 +6,7 @@  LIB_DEPS = "pixman virtual/libgl libxfont xtrans libxau libxext libxdmcp libdrm
 
 DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
 
-RDEPENDS_${PN} += "hal xorg-minimal-fonts"
+RDEPENDS_${PN} += "xorg-minimal-fonts"
 
 FILES_${PN} += "${bindir}/Xorg "
 
@@ -34,4 +34,3 @@  EXTRA_OECONF += "--disable-static \
 
 # Due to mesa-dri
 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
index 035e39c..b797f97 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
@@ -7,7 +7,7 @@  PROTO_DEPS += "xf86driproto dri2proto"
 DEPENDS += "font-util"
 
 PE = "1"
-PR = "r1"
+PR = "r3"
 
 SRC_URI += "file://crosscompile.patch"
 
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
index 066ff13..87ba040 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -4,7 +4,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
 
 SRCREV = "6689e8add183835274a70ee013e5d3bc8023681f"
 PE = "1"
-PR = "r1"
+PR = "r3"
 PV = "1.10+git${SRCPV}"
 
 PROTO_DEPS += "xf86driproto dri2proto"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
index 5447058..131c258 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
@@ -8,7 +8,7 @@  LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile lib
 
 DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
 
-RDEPENDS_${PN} += "hal xorg-minimal-fonts"
+RDEPENDS_${PN} += "xorg-minimal-fonts"
 
 FILES_${PN} += "${bindir}/Xorg "
 
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
index 5575c0f..e42f27d 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
@@ -2,7 +2,7 @@  require xserver-xf86-lite.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
 
-PR = "r1"
+PR = "r3"
 
 DEPENDS += "font-util"
 

Comments

Martin Jansa Oct. 6, 2011, 2:29 p.m.
On Thu, Oct 06, 2011 at 03:21:33PM +0100, Richard Purdie wrote:
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> index 000aea3..4c8b732 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> @@ -35,3 +35,8 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
>  SRC_URI += "file://macro_tweak.patch"
>  
>  EXTRA_OECONF = "--with-fop=no"
> +
> +PACKAGECONFIG ??= "udev"
> +PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal"
> +PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,,udev"

This should probably be 
+PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal"
+PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev,"

as we don't want udev in RDEPENDS (libudev is enough).

And can we apply this after my Xorg patchset? Because I don't want to
rebase it for 4th time ;).

Regards,
Richard Purdie Oct. 6, 2011, 2:51 p.m.
On Thu, 2011-10-06 at 16:29 +0200, Martin Jansa wrote:
> On Thu, Oct 06, 2011 at 03:21:33PM +0100, Richard Purdie wrote:
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> > index 000aea3..4c8b732 100644
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> > @@ -35,3 +35,8 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
> >  SRC_URI += "file://macro_tweak.patch"
> >  
> >  EXTRA_OECONF = "--with-fop=no"
> > +
> > +PACKAGECONFIG ??= "udev"
> > +PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal"
> > +PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,,udev"
> 
> This should probably be 
> +PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal"
> +PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev,"
> 
> as we don't want udev in RDEPENDS (libudev is enough).

Does it need udev to build? I suspect you're right. I found it a little
odd it didn't seem to need hal as a build dependency.

> And can we apply this after my Xorg patchset? Because I don't want to
> rebase it for 4th time ;).

What I'm trying to avoid is introducing config options which we're not
going to use. Looking at the xserver patches in your xorg series, they
still do too many things in one patch so I think they're going to need
to be split down further. I'm reluctant to ask you to do it so I'm
poking around some of this area myself too...

Cheers,

Richard