Patchwork [02/19] patch: use new update-alternatives

login
register
mail settings
Submitter Morgan Little
Date Aug. 1, 2012, 2:12 p.m.
Message ID <1343830340-25351-3-git-send-email-morgan.little@windriver.com>
Download mbox | patch
Permalink /patch/33535/
State New
Headers show

Comments

Morgan Little - Aug. 1, 2012, 2:12 p.m.
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
 meta/recipes-devtools/patch/patch.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

 ALTERNATIVE_PRIORITY = "100"
Mark Hatle - Aug. 1, 2012, 3:13 p.m.
On 8/1/12 9:12 AM, Morgan Little wrote:
>
> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> ---
>   meta/recipes-devtools/patch/patch.inc |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/patch/patch.inc b/meta/recipes-devtools/patch/patch.inc
> index 21c06c6..80e00f6 100644
> --- a/meta/recipes-devtools/patch/patch.inc
> +++ b/meta/recipes-devtools/patch/patch.inc
> @@ -13,6 +13,6 @@
>   do_install_append () {
>           mv ${D}${bindir}/patch ${D}${bindir}/patch.${BPN}
>   }
>
> -ALTERNATIVE_NAME = "patch"
> -ALTERNATIVE_PATH = "patch.${BPN}"
> +ALTERNATIVE_${PN} = "patch"
> +ALTERNATIVE_TARGET[patch] = "$[bindir}/patch.${BPN}"
>   ALTERNATIVE_PRIORITY = "100"
>

See the previous.. the do_install_append should be removed, and once that is 
done the alternative_target[patch] is no needed.

--Mark

Patch

diff --git a/meta/recipes-devtools/patch/patch.inc b/meta/recipes-devtools/patch/patch.inc
index 21c06c6..80e00f6 100644
--- a/meta/recipes-devtools/patch/patch.inc
+++ b/meta/recipes-devtools/patch/patch.inc
@@ -13,6 +13,6 @@ 
 do_install_append () {
         mv ${D}${bindir}/patch ${D}${bindir}/patch.${BPN}
 }
 
-ALTERNATIVE_NAME = "patch"
-ALTERNATIVE_PATH = "patch.${BPN}"
+ALTERNATIVE_${PN} = "patch"
+ALTERNATIVE_TARGET[patch] = "$[bindir}/patch.${BPN}"