binutils: use new update-alternatives

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 552b80871b7749d41d225ff89fd515a0cb52488a..2440509207c3c5ecf1c9b815126ffabee2dcb891 100644 (file)
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -146,12 +146,14 @@ do_install_virtclass-native () {
        rmdir ${D}/${libdir}64 || :
 }
 
-pkg_postinst_${PN}-symlinks () {
-       update-alternatives --install ${bindir}/ar ar ${TARGET_PREFIX}ar 100
-       update-alternatives --install ${bindir}/strings strings ${TARGET_PREFIX}strings 100
-}
+inherit update-alternatives
 
-pkg_prerm_${PN}-symlinks () {
-       update-alternatives --remove ar ${TARGET_PREFIX}ar
-       update-alternatives --remove strings ${TARGET_PREFIX}strings
-}
+ALTERNATIVE_PRIORITY = "100"
+
+ALTERNATIVE_${PN}-symlinks = "ar strings"
+
+ALTERNATIVE_LINK_NAME[ar] = "${bindir}/ar"
+ALTERNATIVE_TARGET[ar] = "${bindir}/${TARGET_PREFIX}ar"
+
+ALTERNATIVE_LINK_NAME[strings] = "${bindir}/strings"
+ALTERNATIVE_TARGET[strings] = "${bindir}/${TARGET_PREFIX}strings"

diff --git a/meta/recipes-devtools/binutils/binutils_2.22.bb b/meta/recipes-devtools/binutils/binutils_2.22.bb
index ae15e82eb032fe759b0c84ad069cc674a2589987..9f62883ff3a0883e51573388f916286fec122c13 100644 (file)
--- a/meta/recipes-devtools/binutils/binutils_2.22.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.22.bb
@@ -1,6 +1,6 @@
 require binutils.inc
 
-PR = "r7"
+PR = "r8"
 
 LIC_FILES_CHKSUM="\
     file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\