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>

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() {
 }
 
 # 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 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
 
 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 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
 
 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"