diff options
Diffstat (limited to 'meta/recipes-extended/findutils')
5 files changed, 114 insertions, 17 deletions
diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc index 9aa7239825..03cf2a8d72 100644 --- a/meta/recipes-extended/findutils/findutils.inc +++ b/meta/recipes-extended/findutils/findutils.inc | |||
@@ -6,11 +6,14 @@ HOMEPAGE = "http://www.gnu.org/software/findutils/" | |||
6 | BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils" | 6 | BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils" |
7 | SECTION = "console/utils" | 7 | SECTION = "console/utils" |
8 | 8 | ||
9 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz" | 9 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \ |
10 | file://autoconf-2.73.patch \ | ||
11 | file://run-ptest \ | ||
12 | " | ||
10 | 13 | ||
11 | inherit autotools gettext texinfo update-alternatives | 14 | inherit autotools gettext texinfo update-alternatives ptest |
12 | 15 | ||
13 | ALTERNATIVE_${PN} = "find xargs" | 16 | ALTERNATIVE:${PN} = "find xargs" |
14 | ALTERNATIVE_PRIORITY = "100" | 17 | ALTERNATIVE_PRIORITY = "100" |
15 | 18 | ||
16 | BBCLASSEXTEND = "native nativesdk" | 19 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch b/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch new file mode 100644 index 0000000000..63728b5f91 --- /dev/null +++ b/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | The gnulib largefile macro needs updating to work with autoconf 2.73. Rather | ||
2 | than the full code: | ||
3 | |||
4 | https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb | ||
5 | |||
6 | Just tweak the exiting code to work with 2.73. The next findutils upgrade should | ||
7 | update to new gnulib | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
11 | |||
12 | Index: findutils-4.9.0/gl/m4/largefile.m4 | ||
13 | =================================================================== | ||
14 | --- findutils-4.9.0.orig/gl/m4/largefile.m4 | ||
15 | +++ findutils-4.9.0/gl/m4/largefile.m4 | ||
16 | @@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], | ||
17 | # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: | ||
18 | # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, | ||
19 | # or configures them incorrectly in some cases. | ||
20 | -m4_version_prereq([2.70], [], [ | ||
21 | +m4_version_prereq([2.73], [], [ | ||
22 | |||
23 | # _AC_SYS_LARGEFILE_TEST_INCLUDES | ||
24 | # ------------------------------- | ||
diff --git a/meta/recipes-extended/findutils/findutils/run-ptest b/meta/recipes-extended/findutils/findutils/run-ptest new file mode 100644 index 0000000000..ec71583c51 --- /dev/null +++ b/meta/recipes-extended/findutils/findutils/run-ptest | |||
@@ -0,0 +1,57 @@ | |||
1 | #!/bin/bash | ||
2 | |||
3 | # create temporary symlink to workaround missing oldfind | ||
4 | ln -s /usr/bin/find /tmp/oldfind | ||
5 | # make oldfind visible | ||
6 | export PATH="/tmp:${PATH}" | ||
7 | |||
8 | export built_programs="find xargs locate updatedb" | ||
9 | |||
10 | # this gets substituted by sed during build | ||
11 | export VERSION="__run_ptest_version__" | ||
12 | |||
13 | # define missing functions for tests/init.sh | ||
14 | fu_path_prepend_ () { | ||
15 | path_prepend_ $@ | ||
16 | } | ||
17 | |||
18 | print_ver_ () { | ||
19 | : | ||
20 | } | ||
21 | |||
22 | skip_if_root_ () { | ||
23 | [ $(id -u) = 0 ] && exit 77; | ||
24 | } | ||
25 | |||
26 | require_root_ () { | ||
27 | [ $(id -u) = 0 ] || exit 77; | ||
28 | } | ||
29 | |||
30 | expensive_ () { | ||
31 | : | ||
32 | } | ||
33 | |||
34 | export -f fu_path_prepend_ | ||
35 | export -f print_ver_ | ||
36 | export -f skip_if_root_ | ||
37 | export -f require_root_ | ||
38 | export -f expensive_ | ||
39 | |||
40 | |||
41 | for f in tests/*/*.sh; do | ||
42 | bash $f ; | ||
43 | case $? in | ||
44 | 0 ) | ||
45 | echo -n "PASS";; | ||
46 | 77 ) | ||
47 | echo -n "SKIP";; | ||
48 | * ) | ||
49 | echo -n "FAIL";; | ||
50 | esac | ||
51 | echo ": $f" | ||
52 | done | ||
53 | |||
54 | #remove symlink | ||
55 | rm -f /tmp/oldfind | ||
56 | |||
57 | echo | ||
diff --git a/meta/recipes-extended/findutils/findutils_4.8.0.bb b/meta/recipes-extended/findutils/findutils_4.8.0.bb deleted file mode 100644 index 675e53c0da..0000000000 --- a/meta/recipes-extended/findutils/findutils_4.8.0.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | require findutils.inc | ||
2 | |||
3 | # GPLv2+ (<< 4.2.32), GPLv3+ (>= 4.2.32) | ||
4 | LICENSE = "GPLv3+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" | ||
6 | |||
7 | DEPENDS = "bison-native" | ||
8 | |||
9 | SRC_URI[sha256sum] = "57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164" | ||
10 | |||
11 | # http://savannah.gnu.org/bugs/?27299 | ||
12 | CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes" | ||
13 | |||
14 | EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" | ||
diff --git a/meta/recipes-extended/findutils/findutils_4.9.0.bb b/meta/recipes-extended/findutils/findutils_4.9.0.bb new file mode 100644 index 0000000000..074817df27 --- /dev/null +++ b/meta/recipes-extended/findutils/findutils_4.9.0.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | require findutils.inc | ||
2 | |||
3 | # GPL-2.0-or-later (<< 4.2.32), GPL-3.0-or-later (>= 4.2.32) | ||
4 | LICENSE = "GPL-3.0-or-later" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" | ||
6 | |||
7 | DEPENDS = "bison-native" | ||
8 | |||
9 | SRC_URI[sha256sum] = "a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe" | ||
10 | |||
11 | PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" | ||
12 | # http://savannah.gnu.org/bugs/?27299 | ||
13 | CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes" | ||
14 | |||
15 | EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" | ||
16 | |||
17 | # need od from coreutils for -t option | ||
18 | RDEPENDS:${PN}-ptest += "bash sed grep coreutils" | ||
19 | |||
20 | do_install_ptest:class-target() { | ||
21 | mkdir -p ${D}${PTEST_PATH}/tests/ | ||
22 | cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ | ||
23 | |||
24 | # substitute value in run-ptest with actual version | ||
25 | sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest | ||
26 | |||
27 | } | ||