2 files changed, 20 insertions, 34 deletions

diff --git a/meta/packages/findutils/findutils-4.2.31/mkdir.patch b/meta/packages/findutils/findutils-4.2.31/mkdir.patch
deleted file mode 100644
index 98ffbd2e72..0000000000
--- a/meta/packages/findutils/findutils-4.2.31/mkdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: findutils-4.2.29/configure.in
-===================================================================
---- findutils-4.2.29.orig/configure.in  2006-11-25 18:06:00.000000000 +0000
-+++ findutils-4.2.29/configure.in       2009-08-19 18:01:06.000000000 +0100
-@@ -209,6 +209,8 @@
- dnl Hence they need to know if they are being compiled into findutils or not.
- AC_DEFINE([FINDUTILS], 1, [Define if we are compiling GNU findutils])
- 
-+MKINSTALLDIRS="mkdir -p"
-+AC_SUBST(MKINSTALLDIRS)
- 
- # This is necessary so that .o files in LIBOBJS are also built via
- # the ANSI2KNR-filtering rules.
-Index: findutils-4.2.29/po/Makefile.in.in
-===================================================================
---- findutils-4.2.29.orig/po/Makefile.in.in     2009-08-19 18:05:47.000000000 +0100
-+++ findutils-4.2.29/po/Makefile.in.in  2009-08-19 18:05:58.000000000 +0100
-@@ -30,7 +30,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-+mkinstalldirs = $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@
diff --git a/meta/packages/findutils/findutils_4.2.31.bb b/meta/packages/findutils/findutils_4.2.31.bb
index 3f4fc534cc..2804a3ba3a 100644
--- a/meta/packages/findutils/findutils_4.2.31.bb
+++ b/meta/packages/findutils/findutils_4.2.31.bb
@@ -1,17 +1,29 @@
-require findutils.inc
+DESCRIPTION = "find, locate, and xargs binaries."
+HOMEPAGE = "http://www.gnu.org/software/findutils/"
+BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils"
+SECTION = "console/utils"
 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-PR = "r0"
+PR = "r1"
 
-SRC_URI += "file://mkdir.patch \
-            file://gnulib-extension.patch"
+SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz \
+           file://gnulib-extension.patch"
+
+inherit autotools gettext
+
+# diffutils assumes non-glibc compilation with uclibc and
+# this causes it to generate its own implementations of
+# standard functionality.  regex.c actually breaks compilation
+# because it uses __mempcpy, there are other things (TBD:
+# see diffutils.mk in buildroot)
+EXTRA_OECONF_linux-uclibc = "--without-included-regex"
 
 do_install_append () {
-        if [ -e ${D}${bindir}/find ]; then
-            mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
-            mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
-        fi
+        if [ -e ${D}${bindir}/find ]; then
+                mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
+                mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
+        fi
 }
 
 pkg_postinst_${PN} () {