From fceced8885c846196bf1b8ba94c55a83695c5019 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sun, 14 Aug 2016 07:21:08 -0700 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald (cherry picked from commit 74d994ed27e53370101a3a44f25cd07327d774ad) Signed-off-by: Andreas Oberritter --- meta-networking/recipes-connectivity/samba/samba_4.4.2.bb | 3 +-- 1 file changed, 1 insertion(+), 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 \ " -- cgit 1.2.3-korg