From 0e3a29c270904f3b7be0dabbecd0401488318809 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 12 Jan 2007 11:09:05 +0000
Subject: [PATCH] Fix the annoying base-files autorebuild bug. When checking
file mtimes in directories, timestamp.pl was following symlinks. This broke
on base-files, because there are symlinks to /tmp and to /proc/mounts in the
build directory.
SVN-Revision: 6084
---
include/package.mk | 2 +-
package/base-files/Makefile | 1 +
scripts/timestamp.pl | 5 ++---
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/package.mk b/include/package.mk
index 1b69cf25d6..ffab228aae 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -21,7 +21,7 @@ define Build/DefaultTargets
ifeq ($(DUMP),)
ifeq ($(CONFIG_AUTOREBUILD),y)
_INFO:=
- ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
+ ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(PKG_FILE_DEPEND)),$(PKG_BUILD_DIR))
_INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
$(PKG_BUILD_DIR)/.prepared: package-clean
endif
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 14917f683b..33e6522e7e 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -13,6 +13,7 @@ PKG_NAME:=base-files
PKG_RELEASE:=8
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
+PKG_FILE_DEPEND:=$(PLATFORM_DIR)
REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
ifeq ($(REV),)
diff --git a/scripts/timestamp.pl b/scripts/timestamp.pl
index a3aa50cb0d..a4c5cae015 100755
--- a/scripts/timestamp.pl
+++ b/scripts/timestamp.pl
@@ -17,9 +17,8 @@ sub get_ts($$) {
while (<FIND>) {
chomp;
my $file = $_;
- open FILE, "<$file";
- my @stat = stat FILE;
- close FILE;
+ next if -l $file;
+ my @stat = stat $file;
if ($stat[9] > $ts) {
$ts = $stat[9];
$fn = $file;
--
GitLab