From 455ff3242627f6e3178e44b5d43468a9ae81584c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 15 Dec 2015 16:32:43 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/apt/apt.inc | 2 -- meta/recipes-devtools/binutils/binutils.inc | 2 -- meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb | 1 - meta/recipes-devtools/gcc/gcc-sanitizers.inc | 7 +------ meta/recipes-devtools/gcc/libgcc.inc | 2 -- meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb | 2 -- meta/recipes-devtools/python/python-smartpm_git.bb | 2 -- meta/recipes-devtools/python/python3_3.5.0.bb | 3 --- meta/recipes-devtools/python/python_2.7.9.bb | 3 --- meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 2 +- meta/recipes-devtools/ruby/ruby_2.2.2.bb | 5 ----- meta/recipes-devtools/vala/vala.inc | 1 - meta/recipes-devtools/valgrind/valgrind_3.10.1.bb | 2 -- 13 files changed, 2 insertions(+), 32 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc index 8e267c3a82..312c6a9037 100644 --- a/meta/recipes-devtools/apt/apt.inc +++ b/meta/recipes-devtools/apt/apt.inc @@ -28,5 +28,3 @@ do_configure_prepend() { rm -rf ${S}/buildlib/config.sub rm -rf ${S}/buildlib/config.guess } - -FILES_${PN}-dbg += "${libdir}/apt/methods/.debug/" diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index a304867d2c..79e2a1205e 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -61,8 +61,6 @@ python do_package_prepend() { d.setVarFlag('ALTERNATIVE_LINK_NAME', alt, bindir + "/" + alt) } -# FILES_${PN}-dbg = "${prefix}/${TARGET_SYS}/bin/.debug ${prefix}/${libdir}/.debug" - B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb index 8ca26ef800..7586ff251a 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb @@ -150,7 +150,6 @@ FILES_bootchartd-stop-initscript += "${sysconfdir}/init.d ${sysconfdir}/rc*.d" FILES_${PN} += "${base_libdir}/bootchart/bootchart-collector" FILES_${PN} += "${base_libdir}/bootchart/tmpfs" FILES_${PN} += "${libdir}" -FILES_${PN}-dbg += "${base_libdir}/bootchart/.debug" FILES_${PN}-doc += "${datadir}/docs" RCONFLICTS_${PN} = "bootchart" diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/meta/recipes-devtools/gcc/gcc-sanitizers.inc index c987ccb589..a7b5d71fa0 100644 --- a/meta/recipes-devtools/gcc/gcc-sanitizers.inc +++ b/meta/recipes-devtools/gcc/gcc-sanitizers.inc @@ -58,10 +58,9 @@ DEPENDS = "gcc-runtime" BBCLASSEXTEND = "nativesdk" -PACKAGES = "${PN}" +PACKAGES = "${PN} ${PN}-dbg" PACKAGES += "libasan libubsan liblsan libtsan" PACKAGES += "libasan-dev libubsan-dev liblsan-dev libtsan-dev" -PACKAGES += "libasan-dbg libubsan-dbg liblsan-dbg libtsan-dbg" PACKAGES += "libasan-staticdev libubsan-staticdev liblsan-staticdev libtsan-staticdev" RDEPENDS_libasan += "libstdc++" @@ -84,7 +83,6 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlib COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm).*-linux' FILES_libasan += "${libdir}/libasan.so.*" -FILES_libasan-dbg += "${libdir}/.debug/libasan.so.*" FILES_libasan-dev += "\ ${libdir}/libasan_preinit.o \ ${libdir}/libasan.so \ @@ -93,7 +91,6 @@ FILES_libasan-dev += "\ FILES_libasan-staticdev += "${libdir}/libasan.a" FILES_libubsan += "${libdir}/libubsan.so.*" -FILES_libubsan-dbg += "${libdir}/.debug/libubsan.so.*" FILES_libubsan-dev += "\ ${libdir}/libubsan.so \ ${libdir}/libubsan.la \ @@ -101,7 +98,6 @@ FILES_libubsan-dev += "\ FILES_libubsan-staticdev += "${libdir}/libubsan.a" FILES_liblsan += "${libdir}/liblsan.so.*" -FILES_liblsan-dbg += "${libdir}/.debug/liblsan.so.*" FILES_liblsan-dev += "\ ${libdir}/liblsan.so \ ${libdir}/liblsan.la \ @@ -109,7 +105,6 @@ FILES_liblsan-dev += "\ FILES_liblsan-staticdev += "${libdir}/liblsan.a" FILES_libtsan += "${libdir}/libtsan.so.*" -FILES_libtsan-dbg += "${libdir}/.debug/libtsan.so.*" FILES_libtsan-dev += "\ ${libdir}/libtsan.so \ ${libdir}/libtsan.la \ diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc index 95fa3f40b0..68377869ca 100644 --- a/meta/recipes-devtools/gcc/libgcc.inc +++ b/meta/recipes-devtools/gcc/libgcc.inc @@ -21,8 +21,6 @@ FILES_${PN}-dev = "\ ${libdir}/${TARGET_SYS}/${BINV}* \ " -FILES_${PN}-dbg += "${base_libdir}/.debug/" - LIBGCCBUILDTREENAME = "gcc-build-internal-" do_package[depends] += "virtual/${MLPREFIX}libc:do_packagedata" diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb index 9ccd417398..9561a59554 100644 --- a/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb +++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb @@ -31,7 +31,5 @@ do_compile_class-native() { cpan_do_compile } -FILES_${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/XML/Parser/Expat/.debug/" - BBCLASSEXTEND="native" diff --git a/meta/recipes-devtools/python/python-smartpm_git.bb b/meta/recipes-devtools/python/python-smartpm_git.bb index d6c378bcfd..139bfd5802 100644 --- a/meta/recipes-devtools/python/python-smartpm_git.bb +++ b/meta/recipes-devtools/python/python-smartpm_git.bb @@ -128,8 +128,6 @@ RDEPENDS_${PN}-interface-gtk = "gtk+ ${PN}-interface-images" FILES_smartpm = "${bindir}/smart" -FILES_${PN}-dbg += "${libdir}/python*/site-packages/smart/backends/rpm/.debug" - FILES_${PN}-backend-rpm = "${libdir}/python*/site-packages/smart/backends/rpm" FILES_${PN}-interface-qt4 = "${libdir}/python*/site-packages/smart/interfaces/qt4" diff --git a/meta/recipes-devtools/python/python3_3.5.0.bb b/meta/recipes-devtools/python/python3_3.5.0.bb index 7f6fbdb27c..a5663a1e25 100644 --- a/meta/recipes-devtools/python/python3_3.5.0.bb +++ b/meta/recipes-devtools/python/python3_3.5.0.bb @@ -211,9 +211,6 @@ PACKAGES =+ "libpython3 libpython3-staticdev" FILES_libpython3 = "${libdir}/libpython*.so.*" FILES_libpython3-staticdev += "${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_BINABI}/libpython${PYTHON_BINABI}.a" -# catch debug extensions (isn't that already in python-core-dbg?) -FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" - # catch all the rest (unsorted) PACKAGES += "${PN}-misc" RDEPENDS_${PN}-misc += "${PN}-core" diff --git a/meta/recipes-devtools/python/python_2.7.9.bb b/meta/recipes-devtools/python/python_2.7.9.bb index f585a53d58..0287c191ab 100644 --- a/meta/recipes-devtools/python/python_2.7.9.bb +++ b/meta/recipes-devtools/python/python_2.7.9.bb @@ -151,9 +151,6 @@ RRECOMMENDS_${PN}-crypt = "openssl" PACKAGES =+ "lib${BPN}2" FILES_lib${BPN}2 = "${libdir}/libpython*.so.*" -# catch debug extensions (isn't that already in python-core-dbg?) -FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" - # catch all the rest (unsorted) PACKAGES += "${PN}-misc" FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN}" diff --git a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb index 0b38c3a357..2747a24ce3 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb @@ -224,7 +224,7 @@ CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE" LDFLAGS_append_libc-uclibc = "-lrt -lpthread" -PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm-dev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale" +PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-staticdev python-rpm-dev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale" SOLIBS = "5.4.so" diff --git a/meta/recipes-devtools/ruby/ruby_2.2.2.bb b/meta/recipes-devtools/ruby/ruby_2.2.2.bb index 78c943cc6f..9b807a7cd9 100644 --- a/meta/recipes-devtools/ruby/ruby_2.2.2.bb +++ b/meta/recipes-devtools/ruby/ruby_2.2.2.bb @@ -34,9 +34,4 @@ do_install() { FILES_${PN} += "${datadir}/rubygems \ ${datadir}/ri" -FILES_${PN}-dbg += "${libdir}/ruby/*/.debug \ - ${libdir}/ruby/*/*/.debug \ - ${libdir}/ruby/*/*/*/.debug \ - ${libdir}/ruby/*/*/*/*/.debug" - BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc index c98244b5b5..43f9bb3c3c 100644 --- a/meta/recipes-devtools/vala/vala.inc +++ b/meta/recipes-devtools/vala/vala.inc @@ -15,4 +15,3 @@ inherit autotools pkgconfig upstream-version-is-even FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi ${libdir}/${BPN}-${SHRT_VER}/" FILES_${PN}-doc += "${datadir}/devhelp" -FILES_${PN}-dbg += "${libdir}/${BPN}-${SHRT_VER}/.debug" diff --git a/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb index c386a19e88..c38a07b310 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.10.1.bb @@ -50,8 +50,6 @@ do_install_append () { RDEPENDS_${PN} += "perl" -FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug/*" - # valgrind needs debug information for ld.so at runtime in order to # redirect functions like strlen. RRECOMMENDS_${PN} += "${TCLIBC}-dbg" -- cgit v1.2.3-54-g00ecf