diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-07-26 17:10:28 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-15 14:26:33 +0100 |
commit | 1d1205698f33b489e70c8a88ea16f2b911be0a55 (patch) | |
tree | 3268120ab6bdb503249f719b8d3e7328659bec0c /meta/recipes-extended/which/which_2.20.bb | |
parent | 484e8619cd6f4057b10ee7e9258af1b13cbd515b (diff) | |
download | poky-1d1205698f33b489e70c8a88ea16f2b911be0a55.tar.gz |
which: cleanup update-alternatives deprecated code
(From OE-Core rev: 929d7ec6ad5a27b6fcc6ac8c0af1a9f25a7ff6df)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/which/which_2.20.bb')
-rw-r--r-- | meta/recipes-extended/which/which_2.20.bb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/meta/recipes-extended/which/which_2.20.bb b/meta/recipes-extended/which/which_2.20.bb index 9b4394331c..312688fe1e 100644 --- a/meta/recipes-extended/which/which_2.20.bb +++ b/meta/recipes-extended/which/which_2.20.bb | |||
@@ -8,7 +8,7 @@ DEPENDS = "cwautomacros-native" | |||
8 | 8 | ||
9 | inherit autotools update-alternatives | 9 | inherit autotools update-alternatives |
10 | 10 | ||
11 | PR = "r2" | 11 | PR = "r3" |
12 | 12 | ||
13 | EXTRA_OECONF = "--disable-iberty" | 13 | EXTRA_OECONF = "--disable-iberty" |
14 | 14 | ||
@@ -22,11 +22,5 @@ do_configure_prepend() { | |||
22 | sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am | 22 | sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am |
23 | } | 23 | } |
24 | 24 | ||
25 | do_install() { | 25 | ALTERNATIVE_${PN} = "which" |
26 | autotools_do_install | ||
27 | mv ${D}${bindir}/which ${D}${bindir}/which.${BPN} | ||
28 | } | ||
29 | |||
30 | ALTERNATIVE_NAME = "which" | ||
31 | ALTERNATIVE_PATH = "which.${BPN}" | ||
32 | ALTERNATIVE_PRIORITY = "100" | 26 | ALTERNATIVE_PRIORITY = "100" |