aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-08-14 07:21:08 -0700
committerAndreas Oberritter <obi@opendreambox.org>2017-06-26 22:59:19 +0200
commit2c28ab03ef534b8e064dbfe688d79d7e1af38108 (patch)
treeca669f2f97890c81f84a62e56d1b34d816da1b92
parentae6b66c621fb91c403fa237e6771832a9e4b2ad9 (diff)
downloadmeta-openembedded-contrib-2c28ab03ef534b8e064dbfe688d79d7e1af38108.tar.gz
meta-openembedded-contrib-2c28ab03ef534b8e064dbfe688d79d7e1af38108.tar.bz2
meta-openembedded-contrib-2c28ab03ef534b8e064dbfe688d79d7e1af38108.zip
samba: remove ${localstatedir}/log
Fixed do_package error: WARNING: samba-4.4.2-r0 do_package: FILES contains file '/var/log/samba' which resides under a directory symlink. Please fix the recipe and use the real path for the file. ERROR: samba-4.4.2-r0 do_package: File './var/log/samba' cannot be packaged into 'samba-base' because its parent directory structure does not exist. One of its parent directories is a symlink whose target directory is not included in the package. ERROR: samba-4.4.2-r0 do_package: Function failed: populate_packages It has a file ${sysconfdir}/tmpfiles.d/samba.conf which will create /var/log/samba when systemd, and volatiles.03_samba when sysvinit. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> (cherry picked from commit 74d994ed27e53370101a3a44f25cd07327d774ad) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.4.2.bb3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
index 1255b3eb63..7d8b9096fc 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb
@@ -123,7 +123,7 @@ do_install_append() {
install -d ${D}${sysconfdir}/sysconfig/
install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/sysconfig/samba
- rm -rf ${D}/run ${D}${localstatedir}/run
+ rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log
}
PACKAGES += "${PN}-python ${PN}-python-dbg ${PN}-pidl libwinbind libwinbind-dbg libwinbind-krb5-locator"
@@ -136,7 +136,6 @@ FILES_${PN}-base = "${sbindir}/nmbd \
${sbindir}/smbd \
${sysconfdir}/init.d \
${localstatedir}/lib/samba \
- ${localstatedir}/log/samba \
${localstatedir}/nmbd \
${localstatedir}/spool/samba \
"