[OE-core] [PATCH 2/2] xorg-driver: use PACKAGEFUNCS instead of populate_packages_prepend
Ross Burton
ross.burton at intel.com
Mon Jul 14 14:31:27 UTC 2014
The dependency adding function has nothing to do with package splitting, so move
it to a PACKAGEFUNC.
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 4 ++--
meta/recipes-graphics/xorg-driver/xorg-driver-input.inc | 5 +++--
meta/recipes-graphics/xorg-driver/xorg-driver-video.inc | 5 +++--
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 b46974b..17fac8b 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 a544d71..fbec064 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 4fe3349..38281e0 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"
--
1.7.10.4
More information about the Openembedded-core
mailing list