mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

which: cleanup update-alternatives deprecated code

Browse Source 
(From OE-Core rev: 929d7ec6ad5a27b6fcc6ac8c0af1a9f25a7ff6df)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold
2012-07-26 17:10:28 -07:00
committed by Richard Purdie
parent 484e8619cd
commit 1d1205698f
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/which/which_2.18.bb
+2 -6
View File
@@ -9,7 +9,7 @@ BUGTRACKER = "n/a"
LICENSE = "GPLv2+" LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
PR = "r1" PR = "r2"
SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \ SRC_URI = "http://www.xs4all.nl/~carlo17/which/which-${PV}.tar.gz \
file://fix_name_conflict_group_member.patch" file://fix_name_conflict_group_member.patch"
@@ -26,11 +26,7 @@ do_configure_prepend() {
NEW="-I ${STAGING_DIR_NATIVE}/${datadir}/cwautomacros/m4" NEW="-I ${STAGING_DIR_NATIVE}/${datadir}/cwautomacros/m4"
sed -i "s#${OLD}#${NEW}#g" `grep -rl ${OLD} ${S}` 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_${PN} = "which"
ALTERNATIVE_PATH = "which.${BPN}"
ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_PRIORITY = "100"
meta/recipes-extended/which/which_2.20.bb
+2 -8
View File
@@ -8,7 +8,7 @@ DEPENDS = "cwautomacros-native"
inherit autotools update-alternatives inherit autotools update-alternatives
PR = "r2" PR = "r3"
EXTRA_OECONF = "--disable-iberty" 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 sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am
} }
do_install() { ALTERNATIVE_${PN} = "which"
autotools_do_install
mv ${D}${bindir}/which ${D}${bindir}/which.${BPN}
}
ALTERNATIVE_NAME = "which"
ALTERNATIVE_PATH = "which.${BPN}"
ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_PRIORITY = "100"