From 0b3810bfb4c25d0a023045eab429c9401293375a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 22 Feb 2016 16:24:21 +0000 Subject: findutils: upgrade to 4.6.0 Inherit upstream-version-is-even as minor-odd releases (such as 4.5.x) are development snapshots. Change the SRC_URI back to using GNU_MIRROR now we're not using a development release but a stable tarball. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/findutils/findutils.inc | 5 ++--- meta/recipes-extended/findutils/findutils_4.5.19.bb | 17 ----------------- meta/recipes-extended/findutils/findutils_4.6.0.bb | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-extended/findutils/findutils_4.5.19.bb create mode 100644 meta/recipes-extended/findutils/findutils_4.6.0.bb (limited to 'meta/recipes-extended/findutils') diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc index 37c84cc59b..bfedf874be 100644 --- a/meta/recipes-extended/findutils/findutils.inc +++ b/meta/recipes-extended/findutils/findutils.inc @@ -6,10 +6,9 @@ HOMEPAGE = "http://www.gnu.org/software/findutils/" BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils" SECTION = "console/utils" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" -SRC_URI = "ftp://alpha.gnu.org/gnu/${BPN}/${BP}.tar.gz" - -inherit autotools gettext texinfo update-alternatives +inherit autotools gettext texinfo update-alternatives upstream-version-is-even ALTERNATIVE_${PN} = "find xargs" ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/findutils/findutils_4.5.19.bb b/meta/recipes-extended/findutils/findutils_4.5.19.bb deleted file mode 100644 index de39a89738..0000000000 --- a/meta/recipes-extended/findutils/findutils_4.5.19.bb +++ /dev/null @@ -1,17 +0,0 @@ -require findutils.inc - -# GPLv2+ (<< 4.2.32), GPLv3+ (>= 4.2.32) -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -DEPENDS = "bison-native" - -SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch" - -SRC_URI[md5sum] = "1428516452520b51cf893c05500eda3d" -SRC_URI[sha256sum] = "e9bc769d78573c91b1d4e504ad39621b870db6fa38fde923acf6896399f16f8e" - -# http://savannah.gnu.org/bugs/?27299 -CACHED_CONFIGUREVARS += "${@bb.utils.contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}" - -EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" diff --git a/meta/recipes-extended/findutils/findutils_4.6.0.bb b/meta/recipes-extended/findutils/findutils_4.6.0.bb new file mode 100644 index 0000000000..072d3b3c05 --- /dev/null +++ b/meta/recipes-extended/findutils/findutils_4.6.0.bb @@ -0,0 +1,17 @@ +require findutils.inc + +# GPLv2+ (<< 4.2.32), GPLv3+ (>= 4.2.32) +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + +DEPENDS = "bison-native" + +SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch" + +SRC_URI[md5sum] = "9936aa8009438ce185bea2694a997fc1" +SRC_URI[sha256sum] = "ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d" + +# http://savannah.gnu.org/bugs/?27299 +CACHED_CONFIGUREVARS += "${@bb.utils.contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}" + +EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" -- cgit 1.2.3-korg