5 files changed, 39 insertions, 6 deletions
diff --git a/packages/findutils/findutils-4.2.29/mkinstalldirs.patch b/packages/findutils/findutils-4.2.29/mkinstalldirs.patch
new file mode 100644
index 0000000000..e82380b1b2
--- /dev/null
+++ b/packages/findutils/findutils-4.2.29/mkinstalldirs.patch
@@ -0,0 +1,14 @@
+Index: findutils-4.2.29/po/Makefile.in.in
+===================================================================
+--- findutils-4.2.29.orig/po/Makefile.in.in	2008-11-01 22:45:48.466060774 +0100
++++ findutils-4.2.29/po/Makefile.in.in	2008-11-01 22:46:18.000751035 +0100
+@@ -29,8 +29,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
diff --git a/packages/findutils/findutils-native_4.4.bb b/packages/findutils/findutils-native_4.4.bb
new file mode 100644
index 0000000000..1a7b1fe4a8
--- /dev/null
+++ b/packages/findutils/findutils-native_4.4.bb
@@ -0,0 +1,9 @@
+require findutils.inc
+
+inherit native
+
+DEFAULT_PREFERENCE = "-1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}"
+
+S = "${WORKDIR}/findutils-${PV}"
diff --git a/packages/findutils/findutils.inc b/packages/findutils/findutils.inc
index e054dd0cc7..7feef27025 100644
--- a/packages/findutils/findutils.inc
+++ b/packages/findutils/findutils.inc
@@ -11,4 +11,4 @@ inherit autotools gettext
 # 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"
+EXTRA_OECONF_linux-uclibc += "--without-included-regex"
diff --git a/packages/findutils/findutils_4.2.29.bb b/packages/findutils/findutils_4.2.29.bb
index fcb074c185..6de63af151 100644
--- a/packages/findutils/findutils_4.2.29.bb
+++ b/packages/findutils/findutils_4.2.29.bb
@@ -1,11 +1,8 @@
 require findutils.inc
 
-EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort "
+SRC_URI += "file://mkinstalldirs.patch;patch=1"
 
-do_install_append () {
-        mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
-        mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
-}
+EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort "
 
 pkg_postinst_${PN} () {
 	for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
diff --git a/packages/findutils/findutils_4.4.bb b/packages/findutils/findutils_4.4.bb
new file mode 100644
index 0000000000..844f206460
--- /dev/null
+++ b/packages/findutils/findutils_4.4.bb
@@ -0,0 +1,13 @@
+require findutils.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort "
+
+pkg_postinst_${PN} () {
+	for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
+}
+
+pkg_prerm_${PN} () {
+	for i in find xargs; do update-alternatives --remove $i $i.${PN}; done
+}