[oe-commits] Richard Purdie : xserver-xf86: Use PACKAGECONFIG for udev/ hal choice and default to udev
git version control
git at git.openembedded.org
Fri Oct 7 10:35:58 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 55fe7a29e059a3e09e04896b18bb751da3cd8530
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=55fe7a29e059a3e09e04896b18bb751da3cd8530
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Thu Oct 6 23:16:14 2011 +0100
xserver-xf86: Use PACKAGECONFIG for udev/hal choice and default to udev
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../xorg-xserver/xserver-xf86-common.inc | 5 +++++
.../xorg-xserver/xserver-xf86-dri-lite.inc | 3 +--
.../xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb | 2 +-
.../xorg-xserver/xserver-xf86-dri-lite_git.bb | 2 +-
.../xorg-xserver/xserver-xf86-lite.inc | 2 +-
.../xorg-xserver/xserver-xf86-lite_1.10.1.bb | 2 +-
6 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
index 000aea3..17d456c 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"
More information about the Openembedded-commits
mailing list