php: fix aclocal-copy aclocal-copy
PATCH 1/2 php: fix aclocal-copy aclocal-copy
Fixed do_install error:
| DEBUG: Executing shell function do_install | cat: aclocal-copy/libtool.m4: No such file or directory | cat: aclocal-copy/lt~obsolete.m4: No such file or directory | cat: aclocal-copy/ltoptions.m4: No such file or directory | cat: aclocal-copy/ltsugar.m4: No such file or directory | cat: aclocal-copy/ltversion.m4: No such file or directory
--- meta-oe/recipes-devtools/php/php.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-devtools/php/php.inc +2 -2
@@ -120,8 +120,8 @@ do_install_append_class-native() { } do_install_prepend() { - cat aclocal-copy/libtool.m4 aclocal-copy/lt~obsolete.m4 aclocal-copy/ltoptions.m4 \ - aclocal-copy/ltsugar.m4 aclocal-copy/ltversion.m4 > ${S}/build/libtool.m4 + cat ${ACLOCALDIR}/libtool.m4 ${ACLOCALDIR}/lt~obsolete.m4 ${ACLOCALDIR}/ltoptions.m4 \ + ${ACLOCALDIR}/ltsugar.m4 ${ACLOCALDIR}/ltversion.m4 > ${S}/build/libtool.m4 } do_install_prepend_class-target() {
Signature · 1 line
2.9.0
PATCH 2/2 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.
--- meta-networking/recipes-connectivity/samba/samba_4.4.2.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.4.2.bb +1 -2
@@ -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 \ "
Signature · 1 line
2.9.0