summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-12-15 16:32:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-16 11:56:30 +0000
commit455ff3242627f6e3178e44b5d43468a9ae81584c (patch)
tree2fea42e96816cc76de21d2f10c45ec7aab73cd47 /meta/recipes-graphics
parente0890b662e590d18a4eb7229b469f0078f97b1e7 (diff)
downloadpoky-455ff3242627f6e3178e44b5d43468a9ae81584c.tar.gz
meta: more removals of redunant FILES_${PN}-dbg
In some recipes overly-split -dbg packages were merged into PN-dbg. Unless there's a very good reason, recipes should have a single -dev and -dbg package. (From OE-Core rev: a3b000643898d7402b9e57c02e8d10e677cc9722) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_1.1.2.bb3
-rw-r--r--meta/recipes-graphics/piglit/piglit_git.bb2
-rw-r--r--meta/recipes-graphics/tslib/tslib_1.1.bb1
-rw-r--r--meta/recipes-graphics/wayland/libinput_0.21.0.bb1
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-common.inc1
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-input.inc1
6 files changed, 1 insertions, 8 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.1.2.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_1.1.2.bb
index f34a647ecf..db1e578128 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.1.2.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.1.2.bb
@@ -25,10 +25,9 @@ EXTRA_OECONF = "--with-glib --with-freetype --with-cairo --without-graphite2"
25PACKAGECONFIG ??= "icu" 25PACKAGECONFIG ??= "icu"
26PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu" 26PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu"
27 27
28PACKAGES =+ "${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev" 28PACKAGES =+ "${PN}-icu ${PN}-icu-dev"
29 29
30FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" 30FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*"
31FILES_${PN}-icu-dbg = "${libdir}/.debug/libharfbuzz-icu.so*"
32FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ 31FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \
33 ${libdir}/libharfbuzz-icu.so \ 32 ${libdir}/libharfbuzz-icu.so \
34 ${libdir}/pkgconfig/harfbuzz-icu.pc \ 33 ${libdir}/pkgconfig/harfbuzz-icu.pc \
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 0d825c9818..e0bd1fe433 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -28,8 +28,6 @@ do_configure_prepend() {
28 fi 28 fi
29} 29}
30 30
31FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
32
33RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \ 31RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \
34 python-argparse python-importlib python-unixadmin \ 32 python-argparse python-importlib python-unixadmin \
35 python-multiprocessing python-textutils python-netserver python-shell \ 33 python-multiprocessing python-textutils python-netserver python-shell \
diff --git a/meta/recipes-graphics/tslib/tslib_1.1.bb b/meta/recipes-graphics/tslib/tslib_1.1.bb
index 8e304a6efd..b0264c3b38 100644
--- a/meta/recipes-graphics/tslib/tslib_1.1.bb
+++ b/meta/recipes-graphics/tslib/tslib_1.1.bb
@@ -46,7 +46,6 @@ DEBIAN_NOAUTONAME_tslib-calibrate = "1"
46RDEPENDS_${PN} = "tslib-conf" 46RDEPENDS_${PN} = "tslib-conf"
47RRECOMMENDS_${PN} = "pointercal" 47RRECOMMENDS_${PN} = "pointercal"
48 48
49FILES_${PN}-dbg += "${libdir}/ts/.debug*"
50FILES_${PN}-dev += "${libdir}/ts/*.la" 49FILES_${PN}-dev += "${libdir}/ts/*.la"
51FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" 50FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib"
52FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" 51FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*"
diff --git a/meta/recipes-graphics/wayland/libinput_0.21.0.bb b/meta/recipes-graphics/wayland/libinput_0.21.0.bb
index ac5a249825..f6c5975bcb 100644
--- a/meta/recipes-graphics/wayland/libinput_0.21.0.bb
+++ b/meta/recipes-graphics/wayland/libinput_0.21.0.bb
@@ -21,4 +21,3 @@ PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind"
21PACKAGECONFIG[gui] = "--enable-event-gui,--disable-event-gui,cairo gtk+3" 21PACKAGECONFIG[gui] = "--enable-event-gui,--disable-event-gui,cairo gtk+3"
22 22
23FILES_${PN} += "${libdir}/udev/" 23FILES_${PN} += "${libdir}/udev/"
24FILES_${PN}-dbg += "${libdir}/udev/.debug"
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index 7ddd1c7da5..57a4c827dd 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -12,7 +12,6 @@ DEPENDS = "virtual/xserver xproto randrproto util-macros"
12SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" 12SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
13 13
14FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" 14FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
15FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
16 15
17inherit autotools pkgconfig distro_features_check 16inherit autotools pkgconfig distro_features_check
18# depends on virtual/xserver 17# depends on virtual/xserver
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
index 21b60c47b2..c4dba1b19c 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
@@ -10,4 +10,3 @@ PACKAGEFUNCS =+ "add_xorg_abi_depends"
10FILES_${PN} += " ${libdir}/xorg/modules/input/*.so \ 10FILES_${PN} += " ${libdir}/xorg/modules/input/*.so \
11 ${datadir}/X11/xorg.conf.d \ 11 ${datadir}/X11/xorg.conf.d \
12 " 12 "
13FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug"