diff options
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. |
29 | def add_abi_depends(d, name): | 29 | def _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 | ||
3 | DEPENDS += "inputproto kbproto " | 3 | DEPENDS += "inputproto kbproto " |
4 | 4 | ||
5 | python populate_packages_prepend() { | 5 | python add_xorg_abi_depends() { |
6 | add_abi_depends(d, "input") | 6 | _add_xorg_abi_depends(d, "input") |
7 | } | 7 | } |
8 | PACKAGEFUNCS =+ "add_xorg_abi_depends" | ||
8 | 9 | ||
9 | FILES_${PN} += " ${libdir}/xorg/modules/input/*.so" | 10 | FILES_${PN} += " ${libdir}/xorg/modules/input/*.so" |
10 | FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug" | 11 | 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 | |||
2 | 2 | ||
3 | DEPENDS =+ "renderproto videoproto xextproto fontsproto" | 3 | DEPENDS =+ "renderproto videoproto xextproto fontsproto" |
4 | 4 | ||
5 | python populate_packages_prepend() { | 5 | python add_xorg_abi_depends() { |
6 | add_abi_depends(d, "video") | 6 | _add_xorg_abi_depends(d, "video") |
7 | } | 7 | } |
8 | PACKAGEFUNCS =+ "add_xorg_abi_depends" | ||