summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/findutils/findutils.inc5
-rw-r--r--meta/recipes-extended/findutils/findutils_4.2.31.bb22
-rw-r--r--meta/recipes-extended/findutils/findutils_4.4.2.bb17
3 files changed, 10 insertions, 34 deletions
diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc
index 7a07ad502f..64909a1f8c 100644
--- a/meta/recipes-extended/findutils/findutils.inc
+++ b/meta/recipes-extended/findutils/findutils.inc
@@ -12,7 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
12 12
13SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz" 13SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz"
14 14
15inherit autotools gettext 15inherit autotools gettext update-alternatives
16
17ALTERNATIVE_LINKS = "${bindir}/find ${bindir}/xargs"
18ALTERNATIVE_PRIORITY = "100"
16 19
17# diffutils assumes non-glibc compilation with uclibc and 20# diffutils assumes non-glibc compilation with uclibc and
18# this causes it to generate its own implementations of 21# this causes it to generate its own implementations of
diff --git a/meta/recipes-extended/findutils/findutils_4.2.31.bb b/meta/recipes-extended/findutils/findutils_4.2.31.bb
index bd455a51a8..0c3783614e 100644
--- a/meta/recipes-extended/findutils/findutils_4.2.31.bb
+++ b/meta/recipes-extended/findutils/findutils_4.2.31.bb
@@ -8,7 +8,7 @@ SECTION = "console/utils"
8 8
9LICENSE = "GPLv2+" 9LICENSE = "GPLv2+"
10LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 10LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
11PR = "r1" 11PR = "r2"
12 12
13SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz \ 13SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz \
14 file://gnulib-extension.patch" 14 file://gnulib-extension.patch"
@@ -16,7 +16,10 @@ SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz \
16SRC_URI[md5sum] = "a0e31a0f18a49709bf5a449867c8049a" 16SRC_URI[md5sum] = "a0e31a0f18a49709bf5a449867c8049a"
17SRC_URI[sha256sum] = "e0d34b8faca0b3cca0703f6c6b498afbe72f0ba16c35980c10ec9ef7724d6204" 17SRC_URI[sha256sum] = "e0d34b8faca0b3cca0703f6c6b498afbe72f0ba16c35980c10ec9ef7724d6204"
18 18
19inherit autotools gettext 19inherit autotools gettext update-alternatives
20
21ALTERNATIVE_LINKS = "${bindir}/find ${bindir}/xargs"
22ALTERNATIVE_PRIORITY = "100"
20 23
21# diffutils assumes non-glibc compilation with uclibc and 24# diffutils assumes non-glibc compilation with uclibc and
22# this causes it to generate its own implementations of 25# this causes it to generate its own implementations of
@@ -25,19 +28,4 @@ inherit autotools gettext
25# see diffutils.mk in buildroot) 28# see diffutils.mk in buildroot)
26EXTRA_OECONF_libc-uclibc = "--without-included-regex" 29EXTRA_OECONF_libc-uclibc = "--without-included-regex"
27 30
28do_install_append () {
29 if [ -e ${D}${bindir}/find ]; then
30 mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
31 mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
32 fi
33}
34
35pkg_postinst_${PN} () {
36 for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
37}
38
39pkg_prerm_${PN} () {
40 for i in find xargs; do update-alternatives --remove $i $i.${PN}; done
41}
42
43BBCLASSEXTEND = "native" 31BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/findutils/findutils_4.4.2.bb b/meta/recipes-extended/findutils/findutils_4.4.2.bb
index b2898ed5d9..d80511c4dc 100644
--- a/meta/recipes-extended/findutils/findutils_4.4.2.bb
+++ b/meta/recipes-extended/findutils/findutils_4.4.2.bb
@@ -1,6 +1,6 @@
1require findutils.inc 1require findutils.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5SRC_URI += "file://01-27017.patch \ 5SRC_URI += "file://01-27017.patch \
6 file://02-28824.patch \ 6 file://02-28824.patch \
@@ -13,19 +13,4 @@ SRC_URI[sha256sum] = "434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd7
13# http://savannah.gnu.org/bugs/?27299 13# http://savannah.gnu.org/bugs/?27299
14CACHED_CONFIGUREVARS += "${@base_contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}" 14CACHED_CONFIGUREVARS += "${@base_contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}"
15 15
16do_install_append () {
17 if [ -e ${D}${bindir}/find ]; then
18 mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
19 mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
20 fi
21}
22
23pkg_postinst_${PN} () {
24 for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
25}
26
27pkg_prerm_${PN} () {
28 for i in find xargs; do update-alternatives --remove $i $i.${PN}; done
29}
30
31BBCLASSEXTEND = "native" 16BBCLASSEXTEND = "native"