mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 14:19:52 +00:00
Code Issues Projects Releases Wiki Activity

recipes-connectivity/samba: Only rmdir directories that exist

Browse Source 
Depending on PACKAGECONFIG selection, the /run/samba directory may not
have been created. Make the do_install_append handle both situations
by checking whether these directories exist before attempting to remove
them.

This fixes do_install failing with an error like this:
 rmdir: failed to remove '/.../samba/4.1.12-r0/image/run/samba': No such file or directory

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
mike.looijmans@topic.nl
2016-01-11 18:53:52 +01:00
committed by Joe MacDonald
parent 37edcea5b7
commit 751659c243
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-connectivity/samba/samba_4.1.12.bb
+4
View File
@@ -111,8 +111,12 @@ EXTRA_OECONF += "--enable-fhs \
LDFLAGS += "-Wl,-z,relro,-z,now" LDFLAGS += "-Wl,-z,relro,-z,now"
do_install_append() { do_install_append() {
if [ -d "${D}/run" ]; then
if [ -d "${D}/run/samba" ]; then
rmdir --ignore-fail-on-non-empty "${D}/run/samba" rmdir --ignore-fail-on-non-empty "${D}/run/samba"
fi
rmdir --ignore-fail-on-non-empty "${D}/run" rmdir --ignore-fail-on-non-empty "${D}/run"
fi
if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then
install -d ${D}${systemd_unitdir}/system install -d ${D}${systemd_unitdir}/system