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:22 +0100 |
| commit | 2c39ca5a6744de58013e9e43b9f6cc4efa66ece9 (patch) | |
| tree | 951878c29f08e36fd3ef26c3f891654924055ee9 | |
| parent | 2bd4982a466d913767318a961b0c70bb453f7018 (diff) | |
| download | openembedded-core-contrib-2c39ca5a6744de58013e9e43b9f6cc4efa66ece9.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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -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 e395e0324a9..497220f1e2c 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" PROVIDES = "drm" DEPENDS = "libpthread-stubs udev" +# be aware that libdrm_2.4.44.bb ignores this INC_PR = "r4" #libpciaccess is required starting from libdrm 2.4.26 @@ -29,7 +30,7 @@ PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ RDEPENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ ${PN}-exynos" -FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*" +FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*" |