aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-04-14 22:21:15 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-04-14 22:21:15 +0000
commitda1d443c2c6c0b55f18ebb6b269b88bc319afaa3 (patch)
tree281cdd22bdb516f2a4870a1c24cb39638cbbfb13
parent394ddd479808a835659c5cd3b45af8e6d7faa0aa (diff)
downloadupstream-da1d443c2c6c0b55f18ebb6b269b88bc319afaa3.tar.gz
upstream-da1d443c2c6c0b55f18ebb6b269b88bc319afaa3.tar.bz2
upstream-da1d443c2c6c0b55f18ebb6b269b88bc319afaa3.zip
fix timestamp checks for build system paths which have '.svn' in their directory name
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20856 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/depends.mk2
-rwxr-xr-xscripts/timestamp.pl2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/depends.mk b/include/depends.mk
index 4c31eb3984..65e9b25d5e 100644
--- a/include/depends.mk
+++ b/include/depends.mk
@@ -11,7 +11,7 @@
# 3: tempfile for file listings
# 4: find options
-DEP_FINDPARAMS := -x "*.svn*" -x ".*" -x "*.svn*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check"
+DEP_FINDPARAMS := -x "*/.svn*" -x ".*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check"
find_md5=find $(1) -type f $(patsubst -x,-and -not -path,$(DEP_FINDPARAMS) $(2)) | md5s
diff --git a/scripts/timestamp.pl b/scripts/timestamp.pl
index 3bf057151f..e24d8149d9 100755
--- a/scripts/timestamp.pl
+++ b/scripts/timestamp.pl
@@ -14,7 +14,7 @@ sub get_ts($$) {
my $ts = 0;
my $fn = "";
$path .= "/" if( -d $path);
- open FIND, "find $path -type f -and -not -path \\*.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |";
+ open FIND, "find $path -type f -and -not -path \\*/.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |";
while (<FIND>) {
chomp;
my $file = $_;