From 9dc8025af91d3e37a53a346a976f99b9f154f52c Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 24 Oct 2013 12:47:39 +0800 Subject: [PATCH] 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. (From meta-openembedded rev: ddfcd90894a9b16e13b471d75745ae7b9cf7fca7) Signed-off-by: Chen Qi Signed-off-by: Joe MacDonald Signed-off-by: Patrick Ohly --- .../meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb index f8df0ef..c4eea31 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb +++ b/meta-openembedded/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" -- 2.7.4