summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2015-11-04 23:06:22 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-11-06 17:49:39 +0100
commit59edd180f28e60657f0de29dea4f7c52bc928ec5 (patch)
treec0dd9fe373b544e4e1bf35ce8b0abcdd0fb5cdf5 /meta-oe
parenteb133f9d7dc8adc4a9c6a9bf6668d0b0542acc0c (diff)
downloadmeta-openembedded-59edd180f28e60657f0de29dea4f7c52bc928ec5.tar.gz
samba: install pam libraries to base_libdir
that's where libpam installs libraries and expects them Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-connectivity/samba/samba_4.1.12.bb10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb b/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb
index a0dd8dc54..b86f64f08 100644
--- a/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb
+++ b/meta-oe/recipes-connectivity/samba/samba_4.1.12.bb
@@ -63,7 +63,7 @@ EXTRA_OECONF += "--enable-fhs \
63 --with-piddir=${localstatedir}/run \ 63 --with-piddir=${localstatedir}/run \
64 --with-sockets-dir=${localstatedir}/run/samba \ 64 --with-sockets-dir=${localstatedir}/run/samba \
65 --with-modulesdir=${libdir}/samba \ 65 --with-modulesdir=${libdir}/samba \
66 --with-pammodulesdir=${libdir}/security \ 66 --with-pammodulesdir=${base_libdir}/security \
67 --with-lockdir=${localstatedir}/lib/samba \ 67 --with-lockdir=${localstatedir}/lib/samba \
68 --with-cachedir=${localstatedir}/lib/samba \ 68 --with-cachedir=${localstatedir}/lib/samba \
69 --with-perl-lib-install-dir=${PERL_VERNDORLIB} \ 69 --with-perl-lib-install-dir=${PERL_VERNDORLIB} \
@@ -118,7 +118,7 @@ do_install_append() {
118PACKAGES += "${PN}-python ${PN}-python-dbg ${PN}-pidl libwinbind libwinbind-dbg libwinbind-krb5-locator" 118PACKAGES += "${PN}-python ${PN}-python-dbg ${PN}-pidl libwinbind libwinbind-dbg libwinbind-krb5-locator"
119 119
120FILES_${PN} += "/run \ 120FILES_${PN} += "/run \
121 ${libdir}/security/pam_smbpass.so \ 121 ${base_libdir}/security/pam_smbpass.so \
122 ${libdir}/tmpfiles.d/* \ 122 ${libdir}/tmpfiles.d/* \
123 " 123 "
124 124
@@ -133,12 +133,12 @@ FILES_${PN}-dbg += "${libdir}/samba/idmap/.debug/* \
133 ${libdir}/samba/nss_info/.debug/* \ 133 ${libdir}/samba/nss_info/.debug/* \
134 ${libdir}/samba/ldb/.debug/* \ 134 ${libdir}/samba/ldb/.debug/* \
135 ${libdir}/samba/vfs/.debug/* \ 135 ${libdir}/samba/vfs/.debug/* \
136 ${libdir}/security/.debug/pam_smbpass.so \ 136 ${base_libdir}/security/.debug/pam_smbpass.so \
137 " 137 "
138 138
139FILES_libwinbind = "${libdir}/security/pam_winbind.so" 139FILES_libwinbind = "${base_libdir}/security/pam_winbind.so"
140FILES_libwinbind += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/winbind.service', '', d)}" 140FILES_libwinbind += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/winbind.service', '', d)}"
141FILES_libwinbind-dbg = "${libdir}/security/.debug/pam_winbind.so" 141FILES_libwinbind-dbg = "${base_libdir}/security/.debug/pam_winbind.so"
142FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so" 142FILES_libwinbind-krb5-locator = "${libdir}/winbind_krb5_locator.so"
143 143
144FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \ 144FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.so \