Patchwork [11/19] wget: use new update-alternatives

login
register
mail settings
Submitter Morgan Little
Date Aug. 1, 2012, 2:12 p.m.
Message ID <1343830340-25351-12-git-send-email-morgan.little@windriver.com>
Download mbox | patch
Permalink /patch/33555/
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-extended/wget/wget.inc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

 
@@ -14,7 +14,7 @@
 do_install_append () {
 	mv ${D}${bindir}/wget ${D}${bindir}/wget.${BPN}
 }
 
-ALTERNATIVE_NAME = "wget"
-ALTERNATIVE_LINK = "${bindir}/wget"
-ALTERNATIVE_PATH = "${bindir}/wget.${BPN}"
+ALTERNATIVE_${PN} = "wget"
+ALTERNATIVE_LINK_NAME[wget] = "${bindir}/wget"
+ALTERNATIVE_TARGET[wget] = "${bindir}/wget.${BPN}"
 ALTERNATIVE_PRIORITY = "100"
Mark Hatle - Aug. 1, 2012, 3:16 p.m.
On 8/1/12 9:12 AM, Morgan Little wrote:
>
> Signed-off-by: Morgan Little <morgan.little@windriver.com>
> ---
>   meta/recipes-extended/wget/wget.inc |    8 ++++----
>   1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
> index 4e1e931..0047329 100644
> --- a/meta/recipes-extended/wget/wget.inc
> +++ b/meta/recipes-extended/wget/wget.inc
> @@ -4,7 +4,7 @@
>   LICENSE = "GPLv3"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
>   DEPENDS = "openssl"
>
> -INC_PR = "r14"
> +INC_PR = "r15"
>
>   inherit autotools gettext update-alternatives
>
> @@ -14,7 +14,7 @@
>   do_install_append () {
>   	mv ${D}${bindir}/wget ${D}${bindir}/wget.${BPN}
>   }
>
> -ALTERNATIVE_NAME = "wget"
> -ALTERNATIVE_LINK = "${bindir}/wget"
> -ALTERNATIVE_PATH = "${bindir}/wget.${BPN}"
> +ALTERNATIVE_${PN} = "wget"
> +ALTERNATIVE_LINK_NAME[wget] = "${bindir}/wget"
> +ALTERNATIVE_TARGET[wget] = "${bindir}/wget.${BPN}"
>   ALTERNATIVE_PRIORITY = "100"
>

Remove the do_install_append, and the ALTERNATIVE_TARGET[wget] won't be needed.

--Mark

Patch

diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index 4e1e931..0047329 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -4,7 +4,7 @@ 
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = "openssl"
 
-INC_PR = "r14"
+INC_PR = "r15"
 
 inherit autotools gettext update-alternatives