summaryrefslogtreecommitdiffstats
path: root/meta
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:20:49 +0100
commit562cc692389146641381899c152f64771a490a97 (patch)
tree864d7b58404838744580348cff1f0992176ea123 /meta
parent2db009d944a3a15091740d617137937b72e1a1eb (diff)
downloadpoky-562cc692389146641381899c152f64771a490a97.tar.gz
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. (From OE-Core rev: b8766acd26676f619e28e90417f09848c2da43fa) 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>
Diffstat (limited to 'meta')
-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 b46974bc2d..17fac8b8c0 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() {
25} 25}
26 26
27# Function to add the relevant ABI dependency to drivers, which should be called 27# Function to add the relevant ABI dependency to drivers, which should be called
28# from a populate_packages append/prepend. 28# from a PACKAGEFUNC.
29def add_abi_depends(d, name): 29def _add_xorg_abi_depends(d, name):
30 # Map of ABI names exposed in the dependencies to pkg-config variables 30 # Map of ABI names exposed in the dependencies to pkg-config variables
31 abis = { 31 abis = {
32 "video": "abi_videodrv", 32 "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 a544d71bf2..fbec0643ff 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
2 2
3DEPENDS += "inputproto kbproto " 3DEPENDS += "inputproto kbproto "
4 4
5python populate_packages_prepend() { 5python add_xorg_abi_depends() {
6 add_abi_depends(d, "input") 6 _add_xorg_abi_depends(d, "input")
7} 7}
8PACKAGEFUNCS =+ "add_xorg_abi_depends"
8 9
9FILES_${PN} += " ${libdir}/xorg/modules/input/*.so" 10FILES_${PN} += " ${libdir}/xorg/modules/input/*.so"
10FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug" 11FILES_${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 4fe33491b7..38281e0f23 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
2 2
3DEPENDS =+ "renderproto videoproto xextproto fontsproto" 3DEPENDS =+ "renderproto videoproto xextproto fontsproto"
4 4
5python populate_packages_prepend() { 5python add_xorg_abi_depends() {
6 add_abi_depends(d, "video") 6 _add_xorg_abi_depends(d, "video")
7} 7}
8PACKAGEFUNCS =+ "add_xorg_abi_depends"