aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-10-18 10:10:35 +0200
committerAndreas Oberritter <obi@opendreambox.org>2017-02-16 11:29:19 +0100
commit7d6a9411f132421b2c37b128a2f55c0dc277d45e (patch)
tree5b30a512f751966c9351df4665483a76becb07a4
parent4b78098d8f93f33ff2c1cf4d41038eaac838b644 (diff)
downloadmeta-openembedded-contrib-7d6a9411f132421b2c37b128a2f55c0dc277d45e.tar.gz
meta-openembedded-contrib-7d6a9411f132421b2c37b128a2f55c0dc277d45e.tar.bz2
meta-openembedded-contrib-7d6a9411f132421b2c37b128a2f55c0dc277d45e.zip
samba: use default packaging rules for -dbg and -dev packages
There's no need to create multiple packages. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.4.5.bb33
1 files changed, 3 insertions, 30 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index b11462a0fe..ea9c9ac09e 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -126,9 +126,9 @@ do_install_append() {
rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log
}
-PACKAGES =+ "${PN}-python ${PN}-python-dbg ${PN}-pidl libwinbind libwinbind-dbg libwinbind-krb5-locator"
-PACKAGES =+ "libwbclient libnss-winbind winbind winbind-dbg libnetapi libsmbsharemodes \
- libsmbclient libsmbclient-dev lib${PN}-base ${PN}-base ${PN}-ctdb-tests"
+PACKAGES =+ "${PN}-python ${PN}-pidl libwinbind libwinbind-krb5-locator"
+PACKAGES =+ "libwbclient libnss-winbind winbind libnetapi libsmbsharemodes \
+ libsmbclient lib${PN}-base ${PN}-base ${PN}-ctdb-tests"
RDEPENDS_${PN} += "${PN}-base"
@@ -236,10 +236,6 @@ FILES_lib${PN}-base = "\
${libdir}/samba/pdb/wbc_sam.so \
"
-FILES_winbind-dbg = "${libdir}/idmap/.debug/*.so \
- ${libdir}/security/.debug/pam_winbind.so \
-"
-
FILES_${PN} += "${libdir}/vfs/*.so \
${libdir}/charset/*.so \
${libdir}/*.dat \
@@ -247,17 +243,10 @@ FILES_${PN} += "${libdir}/vfs/*.so \
${libdir}/security/pam_smbpass.so \
"
-FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so \
- ${libdir}/charset/.debug/*.so \
- ${libdir}/auth/.debug/*.so \
- ${libdir}/security/.debug/pam_smbpass.so \
-"
-
FILES_libwbclient = "${libdir}/libwbclient.so.* ${libdir}/samba/libwinbind-client.so"
FILES_libnetapi = "${libdir}/libnetapi.so.*"
FILES_libsmbsharemodes = "${libdir}/libsmbsharemodes.so.*"
FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
-FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
FILES_winbind = "${sbindir}/winbindd \
${bindir}/wbinfo \
${bindir}/ntlm_auth \
@@ -277,18 +266,8 @@ SMB_SYSV="${sysconfdir}/init.d ${sysconfdir}/rc?.d"
FILES_${PN}-base +="${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${SMB_SERVICE}', '', d)}"
FILES_${PN}-base +="${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SMB_SYSV}', '', d)}"
-FILES_${PN}-dbg += "${libdir}/samba/idmap/.debug/* \
- ${libdir}/samba/pdb/.debug/* \
- ${libdir}/samba/auth/.debug/* \
- ${libdir}/samba/nss_info/.debug/* \
- ${libdir}/samba/ldb/.debug/* \
- ${libdir}/samba/vfs/.debug/* \
- ${base_libdir}/security/.debug/pam_smbpass.so \
-"
-
FILES_libwinbind = "${base_libdir}/security/pam_winbind.so"
FILES_libwinbind += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/winbind.service', '', d)}"
-FILES_libwinbind-dbg = "${base_libdir}/security/.debug/pam_winbind.so"
FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so"
FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \
@@ -309,11 +288,5 @@ FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \
${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/web_server/* \
"
-FILES_${PN}-python-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/* \
- ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/.debug/* \
- ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/samba3/.debug/* \
- ${libdir}/python${PYTHON_BASEVERSION}/site-packages/samba/dcerpc/.debug/* \
-"
-
RDEPENDS_${PN}-pidl_append = " perl"
FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse"