mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 03:32:13 +02:00
findutils: upgrade from 4.9.0 to 4.10.0
autoconf-2.73.patch is dropped as it's not needed any more. The run-ptest script is fixed. Instead copying function definitions from init.cfg file, we should just install init.cfg file in the ptest package. The coreutils-getlimits is added as a runtime dependency of the ptest package because the getlimits command is needed. (From OE-Core rev: aaf3655266e05b0e21dee55757041d2daa2778b3) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -7,7 +7,6 @@ BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils"
|
||||
SECTION = "console/utils"
|
||||
|
||||
SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \
|
||||
file://autoconf-2.73.patch \
|
||||
file://run-ptest \
|
||||
"
|
||||
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
|
||||
than the full code:
|
||||
|
||||
https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
|
||||
|
||||
Just tweak the exiting code to work with 2.73. The next findutils upgrade should
|
||||
update to new gnulib
|
||||
|
||||
Upstream-Status: Inappropriate
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
|
||||
Index: findutils-4.9.0/gl/m4/largefile.m4
|
||||
===================================================================
|
||||
--- findutils-4.9.0.orig/gl/m4/largefile.m4
|
||||
+++ findutils-4.9.0/gl/m4/largefile.m4
|
||||
@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
|
||||
# with _TIME_BITS. Also, work around a problem in autoconf <= 2.69:
|
||||
# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
|
||||
# or configures them incorrectly in some cases.
|
||||
-m4_version_prereq([2.70], [], [
|
||||
+m4_version_prereq([2.73], [], [
|
||||
|
||||
# _AC_SYS_LARGEFILE_TEST_INCLUDES
|
||||
# -------------------------------
|
||||
@@ -10,34 +10,6 @@ export built_programs="find xargs locate updatedb"
|
||||
# this gets substituted by sed during build
|
||||
export VERSION="__run_ptest_version__"
|
||||
|
||||
# define missing functions for tests/init.sh
|
||||
fu_path_prepend_ () {
|
||||
path_prepend_ $@
|
||||
}
|
||||
|
||||
print_ver_ () {
|
||||
:
|
||||
}
|
||||
|
||||
skip_if_root_ () {
|
||||
[ $(id -u) = 0 ] && exit 77;
|
||||
}
|
||||
|
||||
require_root_ () {
|
||||
[ $(id -u) = 0 ] || exit 77;
|
||||
}
|
||||
|
||||
expensive_ () {
|
||||
:
|
||||
}
|
||||
|
||||
export -f fu_path_prepend_
|
||||
export -f print_ver_
|
||||
export -f skip_if_root_
|
||||
export -f require_root_
|
||||
export -f expensive_
|
||||
|
||||
|
||||
for f in tests/*/*.sh; do
|
||||
bash $f ;
|
||||
case $? in
|
||||
|
||||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
|
||||
|
||||
DEPENDS = "bison-native"
|
||||
|
||||
SRC_URI[sha256sum] = "a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe"
|
||||
SRC_URI[sha256sum] = "1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5"
|
||||
|
||||
PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
|
||||
# http://savannah.gnu.org/bugs/?27299
|
||||
@@ -15,13 +15,13 @@ CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes"
|
||||
EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
|
||||
|
||||
# need od from coreutils for -t option
|
||||
RDEPENDS:${PN}-ptest += "bash sed grep coreutils"
|
||||
RDEPENDS:${PN}-ptest += "bash sed grep coreutils coreutils-getlimits"
|
||||
|
||||
do_install_ptest:class-target() {
|
||||
mkdir -p ${D}${PTEST_PATH}/tests/
|
||||
cp ${S}/init.cfg ${D}${PTEST_PATH}
|
||||
cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/
|
||||
|
||||
# substitute value in run-ptest with actual version
|
||||
sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user