From 751659c243caae359213ee1cdb242c7eaadda73b Mon Sep 17 00:00:00 2001 From: "mike.looijmans@topic.nl" Date: Mon, 11 Jan 2016 18:53:52 +0100 Subject: recipes-connectivity/samba: Only rmdir directories that exist 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 Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-connectivity/samba/samba_4.1.12.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'meta-networking/recipes-connectivity') diff --git a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb index 3d677bec1..42315138e 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.1.12.bb @@ -111,8 +111,12 @@ EXTRA_OECONF += "--enable-fhs \ LDFLAGS += "-Wl,-z,relro,-z,now" do_install_append() { - rmdir --ignore-fail-on-non-empty "${D}/run/samba" - rmdir --ignore-fail-on-non-empty "${D}/run" + if [ -d "${D}/run" ]; then + if [ -d "${D}/run/samba" ]; then + rmdir --ignore-fail-on-non-empty "${D}/run/samba" + fi + rmdir --ignore-fail-on-non-empty "${D}/run" + fi if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system -- cgit v1.2.3-54-g00ecf