Patchwork [09/19] sed: use new update-alternatives

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

 
@@ -22,9 +22,9 @@
 do_install () {
 	rmdir ${D}${bindir}/
 }
 
-ALTERNATIVE_NAME = "sed"
-ALTERNATIVE_PATH = "sed.${BPN}"
-ALTERNATIVE_LINK = "${base_bindir}/sed"
+ALTERNATIVE_${PN} = "sed"
+ALTERNATIVE_TARGET[sed] = "${base_bindir}/sed.${BPN}"
+ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed"
 ALTERNATIVE_PRIORITY = "100"
 
 BBCLASSEXTEND = "native"
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/sed/sed_4.1.2.bb |    8 ++++----
>   meta/recipes-extended/sed/sed_4.2.1.bb |    8 ++++----
>   2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
> index 3455c20..cffbec3 100644
> --- a/meta/recipes-extended/sed/sed_4.1.2.bb
> +++ b/meta/recipes-extended/sed/sed_4.1.2.bb
> @@ -4,7 +4,7 @@
>   LICENSE = "GPLv2+"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
>                       file://sed/sed.h;beginline=1;endline=17;md5=e00ffd1837f298439a214fd197f6a407"
>   SECTION = "console/utils"
> -PR = "r6"
> +PR = "r7"
>
>   SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \
>              file://fix_return_type.patch \
> @@ -22,9 +22,9 @@
>   do_install () {
>   	rmdir ${D}${bindir}/
>   }
>
> -ALTERNATIVE_NAME = "sed"
> -ALTERNATIVE_PATH = "sed.${BPN}"
> -ALTERNATIVE_LINK = "${base_bindir}/sed"
> +ALTERNATIVE_${PN} = "sed"
> +ALTERNATIVE_TARGET[sed] = "${base_bindir}/sed.${BPN}"
> +ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed"
>   ALTERNATIVE_PRIORITY = "100"
>
>   BBCLASSEXTEND = "native"
> diff --git a/meta/recipes-extended/sed/sed_4.2.1.bb b/meta/recipes-extended/sed/sed_4.2.1.bb
> index b39eca0..60d4b20 100644
> --- a/meta/recipes-extended/sed/sed_4.2.1.bb
> +++ b/meta/recipes-extended/sed/sed_4.2.1.bb
> @@ -4,7 +4,7 @@
>   LICENSE = "GPLv3+"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
>                       file://sed/sed.h;beginline=1;endline=17;md5=767ab3a06d7584f6fd0469abaec4412f"
>   SECTION = "console/utils"
> -PR = "r3"
> +PR = "r4"
>
>   SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz"
>
> @@ -22,9 +22,9 @@
>   do_install () {
>   	rmdir ${D}${bindir}/
>   }
>
> -ALTERNATIVE_NAME = "sed"
> -ALTERNATIVE_PATH = "sed.${BPN}"
> -ALTERNATIVE_LINK = "${base_bindir}/sed"
> +ALTERNATIVE_${PN} = "sed"
> +ALTERNATIVE_TARGET[sed] = "${base_bindir}/sed.${BPN}"
> +ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed"
>   ALTERNATIVE_PRIORITY = "100"
>
>   BBCLASSEXTEND = "native"
>

See previous emails.. the ${BPN} still isn't needed.

--Mark

Patch

diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
index 3455c20..cffbec3 100644
--- a/meta/recipes-extended/sed/sed_4.1.2.bb
+++ b/meta/recipes-extended/sed/sed_4.1.2.bb
@@ -4,7 +4,7 @@ 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://sed/sed.h;beginline=1;endline=17;md5=e00ffd1837f298439a214fd197f6a407"
 SECTION = "console/utils"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \
            file://fix_return_type.patch \
@@ -22,9 +22,9 @@ 
 do_install () {
 	rmdir ${D}${bindir}/
 }
 
-ALTERNATIVE_NAME = "sed"
-ALTERNATIVE_PATH = "sed.${BPN}"
-ALTERNATIVE_LINK = "${base_bindir}/sed"
+ALTERNATIVE_${PN} = "sed"
+ALTERNATIVE_TARGET[sed] = "${base_bindir}/sed.${BPN}"
+ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed"
 ALTERNATIVE_PRIORITY = "100"
 
 BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/sed/sed_4.2.1.bb b/meta/recipes-extended/sed/sed_4.2.1.bb
index b39eca0..60d4b20 100644
--- a/meta/recipes-extended/sed/sed_4.2.1.bb
+++ b/meta/recipes-extended/sed/sed_4.2.1.bb
@@ -4,7 +4,7 @@ 
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
                     file://sed/sed.h;beginline=1;endline=17;md5=767ab3a06d7584f6fd0469abaec4412f"
 SECTION = "console/utils"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz"