diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2013-05-23 10:55:03 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-29 22:07:55 +0100 |
commit | 7ba36158523ea96a6d506b91f5215f05123ba86c (patch) | |
tree | 14386d52f69c1333615fd5da3c9d32689944b387 | |
parent | dad870937aa92284a16b0671459ad8ed37fe0a11 (diff) | |
download | poky-7ba36158523ea96a6d506b91f5215f05123ba86c.tar.gz |
libdrm: fix packaging after last upgrade
* 2.4.44 adds 2 more tests kmstest and vbltest which got packaged
to PN, causing PKG rename and breaking upgrade path
* check_data_file_clashes: Package libdrm wants to install file /usr/lib/libdrm.so.2
But that file is already provided by package * libdrm2
* check_data_file_clashes: Package libdrm wants to install file /usr/lib/libdrm.so.2.4.0
But that file is already provided by package * libdrm2
put them to PN-tests where they belong
(From OE-Core rev: 2c39ca5a6744de58013e9e43b9f6cc4efa66ece9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.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/drm/libdrm.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc index e395e0324a..497220f1e2 100644 --- a/meta/recipes-graphics/drm/libdrm.inc +++ b/meta/recipes-graphics/drm/libdrm.inc | |||
@@ -11,6 +11,7 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" | |||
11 | PROVIDES = "drm" | 11 | PROVIDES = "drm" |
12 | DEPENDS = "libpthread-stubs udev" | 12 | DEPENDS = "libpthread-stubs udev" |
13 | 13 | ||
14 | # be aware that libdrm_2.4.44.bb ignores this | ||
14 | INC_PR = "r4" | 15 | INC_PR = "r4" |
15 | 16 | ||
16 | #libpciaccess is required starting from libdrm 2.4.26 | 17 | #libpciaccess is required starting from libdrm 2.4.26 |
@@ -29,7 +30,7 @@ PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ | |||
29 | RDEPENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ | 30 | RDEPENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ |
30 | ${PN}-exynos" | 31 | ${PN}-exynos" |
31 | 32 | ||
32 | FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*" | 33 | FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" |
33 | FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" | 34 | FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" |
34 | FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" | 35 | FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" |
35 | FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*" | 36 | FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*" |