Patchwork bc: use update-alternatives to make dc play nice with busybox

login
register
mail settings
Submitter Denys Dmytriyenko
Date March 28, 2012, 6:11 a.m.
Message ID <1332915061-19304-1-git-send-email-denis@denix.org>
Download mbox | patch
Permalink /patch/24707/
State New
Headers show

Comments

Denys Dmytriyenko - March 28, 2012, 6:11 a.m.
From: Denys Dmytriyenko <denys@ti.com>

busybox' default configuration enables dc app, which bc also provides,
setup update-alternatives to resolve the conflict.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta/recipes-extended/bc/bc_1.06.bb |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
Richard Purdie - March 28, 2012, 8:38 a.m.
On Wed, 2012-03-28 at 02:11 -0400, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
> 
> busybox' default configuration enables dc app, which bc also provides,
> setup update-alternatives to resolve the conflict.
> 
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
>  meta/recipes-extended/bc/bc_1.06.bb |   13 +++++++++++--
>  1 files changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-extended/bc/bc_1.06.bb b/meta/recipes-extended/bc/bc_1.06.bb
> index 02915e1..d8d8f4d 100644
> --- a/meta/recipes-extended/bc/bc_1.06.bb
> +++ b/meta/recipes-extended/bc/bc_1.06.bb
> @@ -11,11 +11,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
>  
>  SECTION = "base"
>  DEPENDS = "flex"
> -PR = "r0"
> +PR = "r1"
>  
>  SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz"
>  
>  SRC_URI[md5sum] = "d44b5dddebd8a7a7309aea6c36fda117"
>  SRC_URI[sha256sum] = "4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33"
>  
> -inherit autotools
> +do_install_append () {
> +	mv ${D}${bindir}/dc ${D}${bindir}/dc.${PN}
> +}
> +
> +inherit autotools update-alternatives
> +
> +ALTERNATIVE_NAME = "dc"
> +ALTERNATIVE_LINK = "${bindir}/dc"
> +ALTERNATIVE_PATH = "${bindir}/dc.${PN}"
> +ALTERNATIVE_PRIORITY = "100"


I think you should just be able to do:

"""
ALTERNATIVE_LINKS = "${bindir}/dc"
ALTERNATIVE_PRIORITY = "100"

inherit autotools update-alternatives
"""

?

Cheers,

Richard
Denys Dmytriyenko - March 28, 2012, 11:35 p.m.
On Wed, Mar 28, 2012 at 09:38:04AM +0100, Richard Purdie wrote:
> On Wed, 2012-03-28 at 02:11 -0400, Denys Dmytriyenko wrote:
> > From: Denys Dmytriyenko <denys@ti.com>
> > 
> > busybox' default configuration enables dc app, which bc also provides,
> > setup update-alternatives to resolve the conflict.
> > 
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> >  meta/recipes-extended/bc/bc_1.06.bb |   13 +++++++++++--
> >  1 files changed, 11 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-extended/bc/bc_1.06.bb b/meta/recipes-extended/bc/bc_1.06.bb
> > index 02915e1..d8d8f4d 100644
> > --- a/meta/recipes-extended/bc/bc_1.06.bb
> > +++ b/meta/recipes-extended/bc/bc_1.06.bb
> > @@ -11,11 +11,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
> >  
> >  SECTION = "base"
> >  DEPENDS = "flex"
> > -PR = "r0"
> > +PR = "r1"
> >  
> >  SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz"
> >  
> >  SRC_URI[md5sum] = "d44b5dddebd8a7a7309aea6c36fda117"
> >  SRC_URI[sha256sum] = "4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33"
> >  
> > -inherit autotools
> > +do_install_append () {
> > +	mv ${D}${bindir}/dc ${D}${bindir}/dc.${PN}
> > +}
> > +
> > +inherit autotools update-alternatives
> > +
> > +ALTERNATIVE_NAME = "dc"
> > +ALTERNATIVE_LINK = "${bindir}/dc"
> > +ALTERNATIVE_PATH = "${bindir}/dc.${PN}"
> > +ALTERNATIVE_PRIORITY = "100"
> 
> 
> I think you should just be able to do:
> 
> """
> ALTERNATIVE_LINKS = "${bindir}/dc"
> ALTERNATIVE_PRIORITY = "100"
> 
> inherit autotools update-alternatives
> """
> 
> ?

Yes, quite right. I see plenty of other recipes do it the hard way though...
Richard Purdie - March 29, 2012, 9:50 a.m.
On Wed, 2012-03-28 at 19:35 -0400, Denys Dmytriyenko wrote:
> On Wed, Mar 28, 2012 at 09:38:04AM +0100, Richard Purdie wrote:
> > On Wed, 2012-03-28 at 02:11 -0400, Denys Dmytriyenko wrote:
> > > -inherit autotools
> > > +do_install_append () {
> > > +	mv ${D}${bindir}/dc ${D}${bindir}/dc.${PN}
> > > +}
> > > +
> > > +inherit autotools update-alternatives
> > > +
> > > +ALTERNATIVE_NAME = "dc"
> > > +ALTERNATIVE_LINK = "${bindir}/dc"
> > > +ALTERNATIVE_PATH = "${bindir}/dc.${PN}"
> > > +ALTERNATIVE_PRIORITY = "100"
> > 
> > 
> > I think you should just be able to do:
> > 
> > """
> > ALTERNATIVE_LINKS = "${bindir}/dc"
> > ALTERNATIVE_PRIORITY = "100"
> > 
> > inherit autotools update-alternatives
> > """

> Yes, quite right. I see plenty of other recipes do it the hard way though...


All the more reason to get some better examples out there! :)

Thanks for resending.

Cheers,

Richard

Patch

diff --git a/meta/recipes-extended/bc/bc_1.06.bb b/meta/recipes-extended/bc/bc_1.06.bb
index 02915e1..d8d8f4d 100644
--- a/meta/recipes-extended/bc/bc_1.06.bb
+++ b/meta/recipes-extended/bc/bc_1.06.bb
@@ -11,11 +11,20 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 SECTION = "base"
 DEPENDS = "flex"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz"
 
 SRC_URI[md5sum] = "d44b5dddebd8a7a7309aea6c36fda117"
 SRC_URI[sha256sum] = "4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33"
 
-inherit autotools
+do_install_append () {
+	mv ${D}${bindir}/dc ${D}${bindir}/dc.${PN}
+}
+
+inherit autotools update-alternatives
+
+ALTERNATIVE_NAME = "dc"
+ALTERNATIVE_LINK = "${bindir}/dc"
+ALTERNATIVE_PATH = "${bindir}/dc.${PN}"
+ALTERNATIVE_PRIORITY = "100"