From c7530eed1a0f1b21ce0feb32ea8211cb1e8fd522 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 23 May 2013 10:55:03 +0200 Subject: [PATCH] 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/drm/libdrm.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc index e395e03..497220f 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.*" -- 2.7.4