summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/which
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-07-26 17:10:28 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-15 14:26:33 +0100
commit1d1205698f33b489e70c8a88ea16f2b911be0a55 (patch)
tree3268120ab6bdb503249f719b8d3e7328659bec0c /meta/recipes-extended/which
parent484e8619cd6f4057b10ee7e9258af1b13cbd515b (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-extended/which/which_2.18.bb8
-rw-r--r--meta/recipes-extended/which/which_2.20.bb10
2 files changed, 4 insertions, 14 deletions
diff --git a/meta/recipes-extended/which/which_2.18.bb b/meta/recipes-extended/which/which_2.18.bb
index d54e776407..27a567cd0c 100644
--- a/meta/recipes-extended/which/which_2.18.bb
+++ b/meta/recipes-extended/which/which_2.18.bb
@@ -9,7 +9,7 @@ BUGTRACKER = "n/a"
9LICENSE = "GPLv2+" 9LICENSE = "GPLv2+"
10LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 10LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
11 11
12PR = "r1" 12PR = "r2"
13 13
14SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \ 14SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \
15 file://fix_name_conflict_group_member.patch" 15 file://fix_name_conflict_group_member.patch"
@@ -26,11 +26,7 @@ do_configure_prepend() {
26 NEW="-I ${STAGING_DIR_NATIVE}/${datadir}/cwautomacros/m4" 26 NEW="-I ${STAGING_DIR_NATIVE}/${datadir}/cwautomacros/m4"
27 sed -i "s#${OLD}#${NEW}#g" `grep -rl ${OLD} ${S}` 27 sed -i "s#${OLD}#${NEW}#g" `grep -rl ${OLD} ${S}`
28} 28}
29do_install_append() {
30 mv ${D}/${bindir}/which ${D}/${bindir}/which.${BPN}
31}
32 29
33ALTERNATIVE_NAME = "which" 30ALTERNATIVE_${PN} = "which"
34ALTERNATIVE_PATH = "which.${BPN}"
35ALTERNATIVE_PRIORITY = "100" 31ALTERNATIVE_PRIORITY = "100"
36 32
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
9inherit autotools update-alternatives 9inherit autotools update-alternatives
10 10
11PR = "r2" 11PR = "r3"
12 12
13EXTRA_OECONF = "--disable-iberty" 13EXTRA_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
25do_install() { 25ALTERNATIVE_${PN} = "which"
26 autotools_do_install
27 mv ${D}${bindir}/which ${D}${bindir}/which.${BPN}
28}
29
30ALTERNATIVE_NAME = "which"
31ALTERNATIVE_PATH = "which.${BPN}"
32ALTERNATIVE_PRIORITY = "100" 26ALTERNATIVE_PRIORITY = "100"