[oe] [meta-networking][PATCH] autofs: fix do_install failure and remove unused /var/run directory
Joe MacDonald
joe at deserted.net
Thu Oct 24 19:50:03 UTC 2013
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 at windriver.com wrote:
> From: 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: Chen Qi <Qi.Chen at 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"
--
-Joe MacDonald.
:wq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20131024/77a6b829/attachment-0002.sig>
More information about the Openembedded-devel
mailing list