From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 8 Aug 2008 21:33:53 +0000 (+0000)
Subject: ipkg-build calls 'find' directly irrespective of the platform, this causes failure... 
X-Git-Tag: reboot~25831
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=65d4a5eaab4b08c7a84521f46fed1852f875448a;p=oweals%2Fopenwrt.git

ipkg-build calls 'find' directly irrespective of the platform, this causes failure in case gnu-find specific options are used (such as "-uid +99").

The attached diff, which creates tools/ipkg-utils/patches/160-find.patch,
fixes the problem by using gfind is available. Again, this is similar
to what is done in include/host.mk. (#3868)

Signed-off-by: Luigi Rizzo <rizzo@iet.unipi.it>

SVN-Revision: 12247
---

diff --git a/tools/ipkg-utils/patches/160-find.patch b/tools/ipkg-utils/patches/160-find.patch
new file mode 100644
index 0000000000..51b101afde
--- /dev/null
+++ b/tools/ipkg-utils/patches/160-find.patch
@@ -0,0 +1,39 @@
+--- /tmp/ipkg-build	2008-08-01 09:36:41.000000000 +0200
++++ ipkg-utils-1.7/ipkg-build	2008-08-06 15:04:52.000000000 +0200
+@@ -10,7 +10,8 @@
+ set -e
+ 
+ version=1.0
+-
++FIND="$(which gfind)"
++FIND="${FIND:-$(which find)}"
+ TAR="${TAR:-$(which tar)}"
+ 
+ ipkg_extract_value() {
+@@ -49,7 +50,7 @@
+ 
+ 	PKG_ERROR=0
+ 
+-	cvs_dirs=`find . -name 'CVS'`
++	cvs_dirs=`$FIND . -name 'CVS'`
+ 	if [ -n "$cvs_dirs" ]; then
+ 	    if [ "$noclean" = "1" ]; then
+ 		echo "*** Warning: The following CVS directories where found.
+@@ -62,7 +63,7 @@
+ 	    fi
+ 	fi
+ 
+-	tilde_files=`find . -name '*~'`
++	tilde_files=`$FIND . -name '*~'`
+ 	if [ -n "$tilde_files" ]; then
+ 	    if [ "$noclean" = "1" ]; then
+ 		echo "*** Warning: The following files have names ending in '~'.
+@@ -75,7 +76,7 @@
+ 	    fi
+ 	fi
+ 
+-	large_uid_files=`find . -uid +99 || true`
++	large_uid_files=`$FIND . -uid +99 || true`
+ 
+ 	if [ "$ogargs" = "" ]  && [ -n "$large_uid_files" ]; then
+ 		echo "*** Warning: The following files have a UID greater than 99.