sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

findutils: Use update-alternatives 

Change to using update-alternatives to ensure that we're consistently
using the class, and the package provides are being setup properly.

(From OE-Core rev: be2dbd1abfb4e0e6989d1c34c09047e439d8194e)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mark Hatle 2012-04-16 11:04:50 -05:00 committed by Richard Purdie
parent f264a10d4f
commit 46ffeed918
3 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/recipes-extended/findutils/findutils.inc
View File

@ -12,7 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz"
inherit autotools gettext
inherit autotools gettext update-alternatives
ALTERNATIVE_LINKS = "${bindir}/find ${bindir}/xargs"
ALTERNATIVE_PRIORITY = "100"
# diffutils assumes non-glibc compilation with uclibc and
# this causes it to generate its own implementations of

22
meta/recipes-extended/findutils/findutils_4.2.31.bb
View File

@ -8,7 +8,7 @@ SECTION = "console/utils"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
PR = "r1"
PR = "r2"
SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz \
file://gnulib-extension.patch"
@ -16,7 +16,10 @@ SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz \
SRC_URI[md5sum] = "a0e31a0f18a49709bf5a449867c8049a"
SRC_URI[sha256sum] = "e0d34b8faca0b3cca0703f6c6b498afbe72f0ba16c35980c10ec9ef7724d6204"
inherit autotools gettext
inherit autotools gettext update-alternatives
ALTERNATIVE_LINKS = "${bindir}/find ${bindir}/xargs"
ALTERNATIVE_PRIORITY = "100"
# diffutils assumes non-glibc compilation with uclibc and
# this causes it to generate its own implementations of
@ -25,19 +28,4 @@ inherit autotools gettext
# see diffutils.mk in buildroot)
EXTRA_OECONF_libc-uclibc = "--without-included-regex"
do_install_append () {
if [ -e ${D}${bindir}/find ]; then
mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
fi
}
pkg_postinst_${PN} () {
for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
}
pkg_prerm_${PN} () {
for i in find xargs; do update-alternatives --remove $i $i.${PN}; done
}
BBCLASSEXTEND = "native"

17
meta/recipes-extended/findutils/findutils_4.4.2.bb
View File

@ -1,6 +1,6 @@
require findutils.inc
PR = "r2"
PR = "r3"
SRC_URI += "file://01-27017.patch \
file://02-28824.patch \
@ -13,19 +13,4 @@ SRC_URI[sha256sum] = "434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd7
# http://savannah.gnu.org/bugs/?27299
CACHED_CONFIGUREVARS += "${@base_contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}"
do_install_append () {
if [ -e ${D}${bindir}/find ]; then
mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
fi
}
pkg_postinst_${PN} () {
for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
}
pkg_prerm_${PN} () {
for i in find xargs; do update-alternatives --remove $i $i.${PN}; done
}
BBCLASSEXTEND = "native"