[oe] [meta-networking][PATCH] samba: fix installation for minimal build
Peter Kjellerstedt
peter.kjellerstedt at axis.com
Mon Nov 18 14:13:13 UTC 2019
Please cherry-pick this to Zeus.
//Peter
> -----Original Message-----
> From: openembedded-devel-bounces at lists.openembedded.org <openembedded-devel-bounces at lists.openembedded.org> On Behalf Of Andreas Oberritter
> Sent: den 7 november 2019 21:37
> To: openembedded-devel at lists.openembedded.org
> Subject: [oe] [meta-networking][PATCH] samba: fix installation for minimal build
>
> | chmod: cannot access '.../image/etc/sudoers.d': No such file or directory
> | sed: can't read .../image/usr/bin/samba-tool: No such file or directory
>
> Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
> ---
> .../recipes-connectivity/samba/samba_4.10.8.bb | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/meta-networking/recipes-connectivity/samba/samba_4.10.8.bb b/meta-networking/recipes-connectivity/samba/samba_4.10.8.bb
> index d824eacf9e..4ab8b26c31 100644
> --- a/meta-networking/recipes-connectivity/samba/samba_4.10.8.bb
> +++ b/meta-networking/recipes-connectivity/samba/samba_4.10.8.bb
> @@ -189,15 +189,17 @@ do_install_append() {
> sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode
> fi
>
> - chmod 0750 ${D}${sysconfdir}/sudoers.d
> + chmod 0750 ${D}${sysconfdir}/sudoers.d || true
> rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log
>
> - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba-gpupdate
> - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_upgradedns
> - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_spnupdate
> - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_kcc
> - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/samba_dnsupdate
> - sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${bindir}/samba-tool
> + for f in samba-gpupdate samba_upgradedns samba_spnupdate samba_kcc samba_dnsupdate; do
> + if [ -f "${D}${sbindir}/$f" ]; then
> + sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${sbindir}/$f
> + fi
> + done
> + if [ -f "${D}${bindir}/samba-tool" ]; then
> + sed -i -e 's,${PYTHON},/usr/bin/env python3/,g' ${D}${bindir}/samba-tool
> + fi
>
> }
>
> --
> 2.17.1
More information about the Openembedded-devel
mailing list