Skip to contentSkip to conversation

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

PATCH In review Richard Purdie 2 participants 3 messages Oct 6, 2011

lore
Share & tools
lore

Richard Purdie

author
#0 lore raw

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

Signed-off-by Richard Purdie <[email protected]>

---

meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc +5 -0
index 000aea3..4c8b732 100644
@@ -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"
+
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc +1 -2
index 3aca760..6b13873 100644
@@ -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)'
-
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb +1 -1
index 035e39c..b797f97 100644
@@ -7,7 +7,7 @@ PROTO_DEPS += "xf86driproto dri2proto"
 DEPENDS += "font-util"
 
 PE = "1"
-PR = "r1"
+PR = "r3"
 
 SRC_URI += "file://crosscompile.patch"
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb +1 -1
index 066ff13..87ba040 100644
@@ -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"
meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc +1 -1
index 5447058..131c258 100644
@@ -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 "
meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb +1 -1
index 5575c0f..e42f27d 100644
@@ -2,7 +2,7 @@ require xserver-xf86-lite.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
 
-PR = "r1"
+PR = "r3"
 
 DEPENDS += "font-util"
#1 lore raw
Quoted 7 lines · Richard Purdie
Signed-off-by Richard Purdie <[email protected]>

---

meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc +0 -0
index 000aea3..4c8b732 100644

meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ · line 41

Quoted 7 lines
meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc +4 -0
@@ -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,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#2 lore raw
Quoted 20 lines · Martin Jansa
Quoted 7 lines · Richard Purdie
Signed-off-by Richard Purdie <[email protected]>

---

meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc +0 -0
index 000aea3..4c8b732 100644

meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ · line 41

Quoted 7 lines
meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc +4 -0
@@ -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

(quoted diff) +2 -0
+PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal"
+PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev,"
Quoted 1 line

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.

Quoted 2 lines

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