| Message ID | 1382590059-20109-1-git-send-email-Qi.Chen@windriver.com |
|---|---|
| State | Accepted |
| Commit | ddfcd90894a9b16e13b471d75745ae7b9cf7fca7 |
| Headers | show |
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"
Merged, thanks. -J. [[oe][meta-networking][PATCH] autofs: fix do_install failure and remove unused /var/run directory] On 13.10.24 (Thu 12:47) Qi.Chen@windriver.com wrote: > From: Chen Qi <Qi.Chen@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: Chen Qi <Qi.Chen@windriver.com> > --- > .../recipes-daemons/autofs/autofs_5.0.7.bb | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > 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"