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:18:40 +0100 |
| commit | 929d7ec6ad5a27b6fcc6ac8c0af1a9f25a7ff6df (patch) | |
| tree | cebcc5cfa4190416fed7b58ccac69306a5f8768c /meta/recipes-extended/which | |
| parent | 4807d938023ce06f2924c8a0503c32d083be23b5 (diff) | |
| download | openembedded-core-929d7ec6ad5a27b6fcc6ac8c0af1a9f25a7ff6df.tar.gz openembedded-core-929d7ec6ad5a27b6fcc6ac8c0af1a9f25a7ff6df.tar.bz2 openembedded-core-929d7ec6ad5a27b6fcc6ac8c0af1a9f25a7ff6df.zip | |
which: cleanup update-alternatives deprecated code
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/which')
| -rw-r--r-- | meta/recipes-extended/which/which_2.18.bb | 8 | ||||
| -rw-r--r-- | meta/recipes-extended/which/which_2.20.bb | 10 |
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" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PR = "r1" +PR = "r2" SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \ file://fix_name_conflict_group_member.patch" @@ -26,11 +26,7 @@ do_configure_prepend() { NEW="-I ${STAGING_DIR_NATIVE}/${datadir}/cwautomacros/m4" sed -i "s#${OLD}#${NEW}#g" `grep -rl ${OLD} ${S}` } -do_install_append() { - mv ${D}/${bindir}/which ${D}/${bindir}/which.${BPN} -} -ALTERNATIVE_NAME = "which" -ALTERNATIVE_PATH = "which.${BPN}" +ALTERNATIVE_${PN} = "which" ALTERNATIVE_PRIORITY = "100" 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" inherit autotools update-alternatives -PR = "r2" +PR = "r3" EXTRA_OECONF = "--disable-iberty" @@ -22,11 +22,5 @@ do_configure_prepend() { sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am } -do_install() { - autotools_do_install - mv ${D}${bindir}/which ${D}${bindir}/which.${BPN} -} - -ALTERNATIVE_NAME = "which" -ALTERNATIVE_PATH = "which.${BPN}" +ALTERNATIVE_${PN} = "which" ALTERNATIVE_PRIORITY = "100" |