aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-07-15 17:40:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-16 10:12:25 +0100
commitb8766acd26676f619e28e90417f09848c2da43fa (patch)
treebdf80c9a4ff85a5e7b457124b201e19b91bd4fc4
parentc5941aa91655042d9d4df574a3e1ee33d5d3825a (diff)
downloadopenembedded-core-contrib-b8766acd26676f619e28e90417f09848c2da43fa.tar.gz
openembedded-core-contrib-b8766acd26676f619e28e90417f09848c2da43fa.tar.bz2
openembedded-core-contrib-b8766acd26676f619e28e90417f09848c2da43fa.zip
xorg-driver: use PACKAGEFUNCS instead of populate_packages_prepend
The dependency adding function has nothing to do with package splitting, so move it to a PACKAGEFUNC. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-common.inc4
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-input.inc5
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-video.inc5
3 files changed, 8 insertions, 6 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index b46974bc2db..17fac8b8c08 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -25,8 +25,8 @@ do_install_append() {
}
# Function to add the relevant ABI dependency to drivers, which should be called
-# from a populate_packages append/prepend.
-def add_abi_depends(d, name):
+# from a PACKAGEFUNC.
+def _add_xorg_abi_depends(d, name):
# Map of ABI names exposed in the dependencies to pkg-config variables
abis = {
"video": "abi_videodrv",
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
index a544d71bf25..fbec0643ff5 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
@@ -2,9 +2,10 @@ include xorg-driver-common.inc
DEPENDS += "inputproto kbproto "
-python populate_packages_prepend() {
- add_abi_depends(d, "input")
+python add_xorg_abi_depends() {
+ _add_xorg_abi_depends(d, "input")
}
+PACKAGEFUNCS =+ "add_xorg_abi_depends"
FILES_${PN} += " ${libdir}/xorg/modules/input/*.so"
FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug"
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
index 4fe33491b7a..38281e0f237 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
@@ -2,6 +2,7 @@ include xorg-driver-common.inc
DEPENDS =+ "renderproto videoproto xextproto fontsproto"
-python populate_packages_prepend() {
- add_abi_depends(d, "video")
+python add_xorg_abi_depends() {
+ _add_xorg_abi_depends(d, "video")
}
+PACKAGEFUNCS =+ "add_xorg_abi_depends"