[meta-lsi] [PATCH 38/41] autofs: fix do_install failure and removing unused /var/run directory

Daniel Dragomir daniel.dragomir at windriver.com
Thu Jan 28 04:29:41 PST 2016


Backport patch from meta-openembedded:

Commit: ddfcd90894a9b16e13b471d75745ae7b9cf7fca7
autofs: fix do_install failure and remove unused /var/run directory
Author: Chen Qi <Qi.Chen at windriver.com>

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: Daniel Dragomir <daniel.dragomir at windriver.com>
Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
---
 recipes-daemons/autofs/autofs_5.0.7.bbappend | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 recipes-daemons/autofs/autofs_5.0.7.bbappend

diff --git a/recipes-daemons/autofs/autofs_5.0.7.bbappend b/recipes-daemons/autofs/autofs_5.0.7.bbappend
new file mode 100644
index 0000000..1875e10
--- /dev/null
+++ b/recipes-daemons/autofs/autofs_5.0.7.bbappend
@@ -0,0 +1,8 @@
+do_install_append () {
+    if [ -d ${D}/run ]; then
+        rmdir ${D}/run
+    fi
+    if [ -d ${D}${localstatedir}/run ]; then
+        rmdir ${D}${localstatedir}/run
+    fi
+}
-- 
1.9.1



More information about the meta-lsi mailing list