diff options
| author | Pablo Saavedra <psaavedra@igalia.com> | 2018-05-30 23:51:50 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-05-31 21:53:52 -0700 |
| commit | 2560ea45446d049c86fcdb938c35cd59171129f6 (patch) | |
| tree | 26a607de9fa7c1a3a37285ce59e3bbb9d53ab9d7 /meta-networking/recipes-connectivity | |
| parent | 9044bb2daf70df85883a5e8661b91dc015c3e9c1 (diff) | |
| download | meta-openembedded-2560ea45446d049c86fcdb938c35cd59171129f6.tar.gz | |
Fixed an install error in Samba with LSB distros
An error in the Samba installation occurs with distros LSB:
install: cannot stat 'packaging/LSB/samba.sh': No such
file or directory
exit 1 from 'install -m 0755 packaging/LSB/samba.sh
LSB packaging directory was removed in Samba 4.7:
commit 0a23cde8efea06f81c6d34227b71dab627cc87b9
Author: Andreas Schneider <asn@samba.org>
Date: Tue May 9 15:48:09 2017 +0200
packaging: Remove LSB packaging
This hasn't been touched since 2001.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
This patch removes the conditional 'if' and uses always
compatible sysv script.
Signed-off-by: Pablo Saavedra <psaavedra@igalia.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity')
| -rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.7.6.bb | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb b/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb index a8517c541..e711e58d0 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb | |||
| @@ -150,19 +150,14 @@ do_install_append() { | |||
| 150 | install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf | 150 | install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf |
| 151 | echo "d ${localstatedir}/log/samba 0755 root root -" \ | 151 | echo "d ${localstatedir}/log/samba 0755 root root -" \ |
| 152 | >> ${D}${sysconfdir}/tmpfiles.d/samba.conf | 152 | >> ${D}${sysconfdir}/tmpfiles.d/samba.conf |
| 153 | if [ "${LSB}" = "lsb" ]; then | 153 | install -d ${D}${sysconfdir}/init.d |
| 154 | install -d ${D}${sysconfdir}/init.d | 154 | install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba |
| 155 | install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d/samba | 155 | sed -e 's,/opt/samba/bin,${sbindir},g' \ |
| 156 | else | 156 | -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ |
| 157 | install -d ${D}${sysconfdir}/init.d | 157 | -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ |
| 158 | install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba | 158 | -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ |
| 159 | sed -e 's,/opt/samba/bin,${sbindir},g' \ | 159 | -e 's,/usr/bin,${base_bindir},g' \ |
| 160 | -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ | 160 | -i ${D}${sysconfdir}/init.d/samba |
| 161 | -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ | ||
| 162 | -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ | ||
| 163 | -e 's,/usr/bin,${base_bindir},g' \ | ||
| 164 | -i ${D}${sysconfdir}/init.d/samba | ||
| 165 | fi | ||
| 166 | 161 | ||
| 167 | install -d ${D}${sysconfdir}/samba | 162 | install -d ${D}${sysconfdir}/samba |
| 168 | echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts | 163 | echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts |