diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-15 15:40:23 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-16 11:56:30 +0000 |
commit | e0890b662e590d18a4eb7229b469f0078f97b1e7 (patch) | |
tree | 68a658a13cde6650067ef61444d961936a9570d5 /meta/recipes-core | |
parent | b7766e4bbe61d025346365de4cbafcae56909c27 (diff) | |
download | poky-e0890b662e590d18a4eb7229b469f0078f97b1e7.tar.gz |
meta: Drop now pointless manual -dbg packaging
With the autodebug package generation logic, specifically setting FILES_${PN}-dbg
isn't needed in most cases, we can remove them.
(From OE-Core rev: 3ab59d49dd7c18e194b58d1248b4b87709b5a738)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/dbus/dbus-glib.inc | 3 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 4 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-locale.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 1 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_225.bb | 7 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev.inc | 4 |
6 files changed, 2 insertions, 18 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc index abd013247c..1c47873a6e 100644 --- a/meta/recipes-core/dbus/dbus-glib.inc +++ b/meta/recipes-core/dbus/dbus-glib.inc | |||
@@ -36,8 +36,5 @@ FILES_${PN}-dev += "${bindir}/dbus-binding-tool" | |||
36 | 36 | ||
37 | RDEPENDS_${PN}-tests += "dbus-x11" | 37 | RDEPENDS_${PN}-tests += "dbus-x11" |
38 | FILES_${PN}-tests = "${datadir}/${BPN}/tests" | 38 | FILES_${PN}-tests = "${datadir}/${BPN}/tests" |
39 | FILES_${PN}-tests-dbg = "${datadir}/${BPN}/tests/.debug/* \ | ||
40 | ${datadir}/${BPN}/tests/core/.debug/* \ | ||
41 | ${datadir}/${BPN}/tests/interfaces/.debug/*" | ||
42 | 39 | ||
43 | BBCLASSEXTEND = "native" | 40 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 6e3cf56666..86f7e0ee57 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -49,9 +49,7 @@ FILES_${PN} = "${libdir}/lib*${SOLIBS} ${libdir}/gio ${datadir}/glib-2.0/schemas | |||
49 | FILES_${PN}-dev += "${libdir}/glib-2.0/include \ | 49 | FILES_${PN}-dev += "${libdir}/glib-2.0/include \ |
50 | ${libdir}/gio/modules/lib*${SOLIBSDEV} \ | 50 | ${libdir}/gio/modules/lib*${SOLIBSDEV} \ |
51 | ${libdir}/gio/modules/*.la" | 51 | ${libdir}/gio/modules/*.la" |
52 | FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \ | 52 | FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" |
53 | ${libdir}/gio/modules/.debug \ | ||
54 | ${libdir}/glib-2.0/installed-tests/glib/.debug" | ||
55 | FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" | 53 | FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" |
56 | FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ | 54 | FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ |
57 | ${datadir}/bash-completion" | 55 | ${datadir}/bash-completion" |
diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc index df6d073436..ad1fc5cfd7 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/meta/recipes-core/glibc/glibc-locale.inc | |||
@@ -64,7 +64,6 @@ DESCRIPTION_localedef = "glibc: compile locale definition files" | |||
64 | # FILES_glibc-gconv will not be automatically extended in multilib. | 64 | # FILES_glibc-gconv will not be automatically extended in multilib. |
65 | # Explicitly add ${MLPREFIX} for FILES_glibc-gconv. | 65 | # Explicitly add ${MLPREFIX} for FILES_glibc-gconv. |
66 | FILES_${MLPREFIX}glibc-gconv = "${libdir}/gconv/*" | 66 | FILES_${MLPREFIX}glibc-gconv = "${libdir}/gconv/*" |
67 | FILES_${PN}-dbg += "${libdir}/gconv/.debug/*" | ||
68 | FILES_localedef = "${bindir}/localedef" | 67 | FILES_localedef = "${bindir}/localedef" |
69 | 68 | ||
70 | LOCALETREESRC = "${STAGING_INCDIR}/glibc-locale-internal-${MULTIMACH_TARGET_SYS}" | 69 | LOCALETREESRC = "${STAGING_INCDIR}/glibc-locale-internal-${MULTIMACH_TARGET_SYS}" |
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 36c5350896..bad642449a 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -54,7 +54,6 @@ FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/syst | |||
54 | FILES_${PN}-mtrace = "${bindir}/mtrace" | 54 | FILES_${PN}-mtrace = "${bindir}/mtrace" |
55 | FILES_tzcode = "${bindir}/tzselect ${sbindir}/zic ${sbindir}/zdump" | 55 | FILES_tzcode = "${bindir}/tzselect ${sbindir}/zic ${sbindir}/zdump" |
56 | FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" | 56 | FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" |
57 | FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" | ||
58 | FILES_catchsegv = "${bindir}/catchsegv" | 57 | FILES_catchsegv = "${bindir}/catchsegv" |
59 | RDEPENDS_catchsegv = "libsegfault" | 58 | RDEPENDS_catchsegv = "libsegfault" |
60 | FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" | 59 | FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" |
diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb index 428158a15a..72bf678e10 100644 --- a/meta/recipes-core/systemd/systemd_225.bb +++ b/meta/recipes-core/systemd/systemd_225.bb | |||
@@ -244,8 +244,6 @@ RDEPENDS_${PN}-initramfs = "${PN}" | |||
244 | RDEPENDS_${PN}-ptest += "perl python bash" | 244 | RDEPENDS_${PN}-ptest += "perl python bash" |
245 | FILES_${PN}-ptest += "${libdir}/udev/rules.d" | 245 | FILES_${PN}-ptest += "${libdir}/udev/rules.d" |
246 | 246 | ||
247 | FILES_${PN}-dbg += "${libdir}/systemd/ptest/.debug" | ||
248 | |||
249 | FILES_${PN}-gui = "${bindir}/systemadm" | 247 | FILES_${PN}-gui = "${bindir}/systemadm" |
250 | 248 | ||
251 | FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ | 249 | FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ |
@@ -322,7 +320,6 @@ FILES_${PN} = " ${base_bindir}/* \ | |||
322 | ${nonarch_base_libdir}/udev/rules.d/99-systemd.rules \ | 320 | ${nonarch_base_libdir}/udev/rules.d/99-systemd.rules \ |
323 | " | 321 | " |
324 | 322 | ||
325 | FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" | ||
326 | FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" | 323 | FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" |
327 | 324 | ||
328 | RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" | 325 | RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" |
@@ -337,9 +334,7 @@ RRECOMMENDS_${PN} += "systemd-serialgetty systemd-vconsole-setup \ | |||
337 | 334 | ||
338 | INSANE_SKIP_${PN}-doc += " libdir" | 335 | INSANE_SKIP_${PN}-doc += " libdir" |
339 | 336 | ||
340 | PACKAGES =+ "udev-dbg udev udev-hwdb" | 337 | PACKAGES =+ "udev udev-hwdb" |
341 | |||
342 | FILES_udev-dbg += "${nonarch_base_libdir}/udev/.debug" | ||
343 | 338 | ||
344 | RPROVIDES_udev = "hotplug" | 339 | RPROVIDES_udev = "hotplug" |
345 | 340 | ||
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc index c378ae3cd2..c00ed3412a 100644 --- a/meta/recipes-core/udev/udev.inc +++ b/meta/recipes-core/udev/udev.inc | |||
@@ -68,10 +68,6 @@ RRECOMMENDS_${PN} += "udev-cache" | |||
68 | RCONFLICTS_${PN} += "udev-utils" | 68 | RCONFLICTS_${PN} += "udev-utils" |
69 | RREPLACES_${PN} += "udev-utils" | 69 | RREPLACES_${PN} += "udev-utils" |
70 | 70 | ||
71 | FILES_${PN}-dbg += "${libexecdir}/.debug" | ||
72 | FILES_${PN}-dbg += "${base_libdir}/udev/.debug/" | ||
73 | FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*" | ||
74 | FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug/*" | ||
75 | FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \ | 71 | FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \ |
76 | ${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \ | 72 | ${includedir}/libudev.h ${libdir}/libudev.so ${libdir}/libudev.la \ |
77 | ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc \ | 73 | ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc \ |