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

login
register
mail settings
Submitter Denys Dmytriyenko
Date March 28, 2012, 11:52 p.m.
Message ID <1332978770-6323-1-git-send-email-denis@denix.org>
Download mbox | patch
Permalink /patch/24773/
State Accepted
Commit f8456e7a0fd8559497db8292c87fee4fd95eb9c6
Headers show

Comments

Denys Dmytriyenko - March 28, 2012, 11:52 p.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 |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
Saul Wold - April 3, 2012, 10:56 p.m.
On 03/28/2012 04:52 PM, 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 |    7 +++++--
>   1 files changed, 5 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..283e2d8 100644
> --- a/meta/recipes-extended/bc/bc_1.06.bb
> +++ b/meta/recipes-extended/bc/bc_1.06.bb
> @@ -11,11 +11,14 @@ 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
> +inherit autotools update-alternatives
> +
> +ALTERNATIVE_LINKS = "${bindir}/dc"
> +ALTERNATIVE_PRIORITY = "100"

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-extended/bc/bc_1.06.bb b/meta/recipes-extended/bc/bc_1.06.bb
index 02915e1..283e2d8 100644
--- a/meta/recipes-extended/bc/bc_1.06.bb
+++ b/meta/recipes-extended/bc/bc_1.06.bb
@@ -11,11 +11,14 @@  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
+inherit autotools update-alternatives
+
+ALTERNATIVE_LINKS = "${bindir}/dc"
+ALTERNATIVE_PRIORITY = "100"