[oe-commits] Chen Qi : autofs: fix do_install failure and remove unused /var/ run directory

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: ddfcd90894a9b16e13b471d75745ae7b9cf7fca7
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=ddfcd90894a9b16e13b471d75745ae7b9cf7fca7

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Thu Oct 24 12:47:39 2013 +0800

autofs: fix do_install failure and remove unused /var/run directory

If ${D}/run doesn't exist, the following statement will have non-zero
exit code, which leads to do_install failure.
     test -d ${D}/run && rmdir ${D}/run

Modify it to use the if statement to make the do_install task succeed
no matter ${D}/run exists or not.

Also, this patch removes the unused /var/run directory. Leaving that
directory there will result in /run directory created before splitting
package, which in turn lead to 'installed-vs-shipped' QA error or QA
warning.

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Joe MacDonald <joe at deserted.net>

---

 .../recipes-daemons/autofs/autofs_5.0.7.bb         |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
index f8df0ef..c4eea31 100644
--- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
+++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
@@ -96,7 +96,12 @@ do_configure_prepend () {
 }
 
 do_install_append () {
-    test -d ${D}/run && rmdir ${D}/run
+    if [ -d ${D}/run ]; then
+	rmdir ${D}/run
+    fi
+    if [ -d ${D}${localstatedir}/run ]; then
+	rmdir ${D}${localstatedir}/run
+    fi
 }
 
 INSANE_SKIP_${PN} = "dev-so"