diff options
Diffstat (limited to 'meta/recipes-extended/findutils')
-rw-r--r-- | meta/recipes-extended/findutils/findutils.inc | 1 | ||||
-rw-r--r-- | meta/recipes-extended/findutils/findutils/autoconf-2.73.patch | 24 | ||||
-rw-r--r-- | meta/recipes-extended/findutils/findutils/run-ptest | 31 | ||||
-rw-r--r-- | meta/recipes-extended/findutils/findutils_4.10.0.bb (renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb) | 5 |
4 files changed, 6 insertions, 55 deletions
diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc index 03cf2a8d72..ddcc05750b 100644 --- a/meta/recipes-extended/findutils/findutils.inc +++ b/meta/recipes-extended/findutils/findutils.inc | |||
@@ -7,7 +7,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 \ | 10 | file://run-ptest \ |
12 | " | 11 | " |
13 | 12 | ||
diff --git a/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch b/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted file mode 100644 index 63728b5f91..0000000000 --- a/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
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 index ec71583c51..0c9af47efd 100644 --- a/meta/recipes-extended/findutils/findutils/run-ptest +++ b/meta/recipes-extended/findutils/findutils/run-ptest | |||
@@ -5,39 +5,14 @@ ln -s /usr/bin/find /tmp/oldfind | |||
5 | # make oldfind visible | 5 | # make oldfind visible |
6 | export PATH="/tmp:${PATH}" | 6 | export PATH="/tmp:${PATH}" |
7 | 7 | ||
8 | # Add findutils ptest directory to PATH for getlimits | ||
9 | export PATH="/usr/lib/findutils/ptest:${PATH}" | ||
10 | |||
8 | export built_programs="find xargs locate updatedb" | 11 | export built_programs="find xargs locate updatedb" |
9 | 12 | ||
10 | # this gets substituted by sed during build | 13 | # this gets substituted by sed during build |
11 | export VERSION="__run_ptest_version__" | 14 | export VERSION="__run_ptest_version__" |
12 | 15 | ||
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 | 16 | for f in tests/*/*.sh; do |
42 | bash $f ; | 17 | bash $f ; |
43 | case $? in | 18 | case $? in |
diff --git a/meta/recipes-extended/findutils/findutils_4.9.0.bb b/meta/recipes-extended/findutils/findutils_4.10.0.bb index 074817df27..aa21637657 100644 --- a/meta/recipes-extended/findutils/findutils_4.9.0.bb +++ b/meta/recipes-extended/findutils/findutils_4.10.0.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" | |||
6 | 6 | ||
7 | DEPENDS = "bison-native" | 7 | DEPENDS = "bison-native" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe" | 9 | SRC_URI[sha256sum] = "1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5" |
10 | 10 | ||
11 | PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" | 11 | PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" |
12 | # http://savannah.gnu.org/bugs/?27299 | 12 | # http://savannah.gnu.org/bugs/?27299 |
@@ -19,9 +19,10 @@ RDEPENDS:${PN}-ptest += "bash sed grep coreutils" | |||
19 | 19 | ||
20 | do_install_ptest:class-target() { | 20 | do_install_ptest:class-target() { |
21 | mkdir -p ${D}${PTEST_PATH}/tests/ | 21 | mkdir -p ${D}${PTEST_PATH}/tests/ |
22 | cp ${S}/init.cfg ${D}${PTEST_PATH} | ||
22 | cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ | 23 | cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ |
24 | install -m 755 ${B}/find/getlimits ${D}${PTEST_PATH}/ | ||
23 | 25 | ||
24 | # substitute value in run-ptest with actual version | 26 | # substitute value in run-ptest with actual version |
25 | sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest | 27 | sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest |
26 | |||
27 | } | 28 | } |