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-connectivity/avahi/avahi-ui_0.6.31.bb | 1 - meta/recipes-connectivity/connman/connman.inc | 2 -- meta/recipes-connectivity/iproute2/iproute2.inc | 2 -- meta/recipes-connectivity/neard/neard_0.15.bb | 1 - meta/recipes-connectivity/openssl/openssl_1.0.2e.bb | 7 +------ meta/recipes-connectivity/ppp/ppp_2.4.7.bb | 1 - meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb | 5 +---- 7 files changed, 2 insertions(+), 17 deletions(-) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb index 0d42b90e71..604ee9ec37 100644 --- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb +++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb @@ -26,7 +26,6 @@ S = "${WORKDIR}/avahi-${PV}" PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc python-avahi avahi-discover avahi-discover-standalone" FILES_${PN} = "${libdir}/libavahi-ui*.so.*" -FILES_${PN}-dbg += "${libdir}/.debug/libavah-ui*" FILES_${PN}-dev += "${libdir}/libavahi-ui${SOLIBSDEV}" FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a" diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 6324d7a1fd..ba2ca24065 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -154,8 +154,6 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} \ ${datadir}/dbus-1/system-services/*" -FILES_${PN}-dbg += "${libdir}/connman/*/.debug" - FILES_${PN}-dev += "${libdir}/connman/*/*.la" PACKAGES =+ "${PN}-vpn" diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index 6a08114630..9ce157b2ca 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -36,8 +36,6 @@ PACKAGES =+ "${PN}-tc" FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" -FILES_${PN}-dbg += "${libdir}/tc/.debug" - ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip" diff --git a/meta/recipes-connectivity/neard/neard_0.15.bb b/meta/recipes-connectivity/neard/neard_0.15.bb index f9623106d9..93bddb34ce 100644 --- a/meta/recipes-connectivity/neard/neard_0.15.bb +++ b/meta/recipes-connectivity/neard/neard_0.15.bb @@ -43,7 +43,6 @@ do_install_append() { PACKAGES =+ "${PN}-tests" FILES_${PN}-tests = "${libdir}/${BPN}/*-test" -FILES_${PN}-dbg += "${libexecdir}/nfc/.debug ${libdir}/${BPN}/*/.debug" RDEPENDS_${PN} = "dbus python python-dbus python-pygobject" diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2e.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2e.bb index c4e590f760..d2a265a79c 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2e.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2e.bb @@ -43,13 +43,8 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \ SRC_URI[md5sum] = "5262bfa25b60ed9de9f28d5d52d77fc5" SRC_URI[sha256sum] = "e23ccafdb75cfcde782da0151731aa2185195ac745eea3846133f2e05c0e0bff" -PACKAGES =+ " \ - ${PN}-engines \ - ${PN}-engines-dbg \ - " - +PACKAGES =+ "${PN}-engines" FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" -FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug" # The crypto_use_bigint patch means that perl's bignum module needs to be # installed, but some distributions (for example Fedora 23) don't ship it by diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index adc38e10b4..5f06034727 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -78,7 +78,6 @@ do_install_append () { CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools" FILES_${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_unitdir}/system/ppp@.service" -FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug" FILES_${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so" FILES_${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/rp-pppoe.so" FILES_${PN}-radius = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so" diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb index b6f33e5eb7..c3b8f665b1 100644 --- a/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb +++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb @@ -39,11 +39,8 @@ do_install() { install -m 0755 ifrename ${D}${sbindir}/ifrename } -PACKAGES = "libiw-dbg ifrename-dbg ${PN}-dbg \ -libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc" +PACKAGES = "libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc ${PN}-dbg" -FILES_libiw-dbg = "${libdir}/.debug/*.so.*" -FILES_ifrename-dbg = "${sbindir}/.debug/ifrename" FILES_libiw = "${libdir}/*.so.*" FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}" FILES_libiw-doc = "${mandir}/man7" -- cgit v1.2.3-54-g00ecf