[OE-core] [oe-commits] Andreas Oberritter : procps: use update-alternatives for pwdx, pgrep and watch

[Martin Jansa]

On Fri, Mar 23, 2012 at 05:53:01PM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 68dc2a3fa30c03a196d650de34d0c657a7b85454
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=68dc2a3fa30c03a196d650de34d0c657a7b85454
> 
> Author: Andreas Oberritter <obi at opendreambox.org>
> Date:   Fri Mar 23 17:37:36 2012 +0100
> 
> procps: use update-alternatives for pwdx, pgrep and watch

Good intention but results in this error in opkg upgrade:

update-alternatives: Error: cannot register alternative watch to
/usr/bin/watch since it is already registered to /bin/watch

can you move one of them or move alternative?

fwiw: gentoo also has procps's watch in bindir and busybox's in
base_bindir

Cheers,

> 
> * pwdx, pgrep and watch may be provided by busybox.
> * Use update-alternatives to avoid conflict.
> 
> Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> 
> ---
> 
>  meta/recipes-extended/procps/procps_3.2.8.bb |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb
> index 27d2b5c..683badc 100644
> --- a/meta/recipes-extended/procps/procps_3.2.8.bb
> +++ b/meta/recipes-extended/procps/procps_3.2.8.bb
> @@ -1,11 +1,12 @@
>  require procps.inc
>  
> -PR = "r5"
> +PR = "r6"
>  
>  inherit update-alternatives
>  
>  ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \
> -                     ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps"
> +                     ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps \
> +                     ${bindir}/pgrep ${bindir}/pwdx ${bindir}/watch"
>  ALTERNATIVE_PRIORITY = "110"
>  
>  SRC_URI += "file://procmodule.patch \
> 
> 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- 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-core/attachments/20120324/60987be9/attachment-0002.sig>