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
v19.07.3_mercusys_ac12_duma
Felix Fietkau 18 years ago
parent 5605b82835
commit 0e3a29c270

@ -21,7 +21,7 @@ define Build/DefaultTargets
ifeq ($(DUMP),) ifeq ($(DUMP),)
ifeq ($(CONFIG_AUTOREBUILD),y) ifeq ($(CONFIG_AUTOREBUILD),y)
_INFO:= _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)) _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
$(PKG_BUILD_DIR)/.prepared: package-clean $(PKG_BUILD_DIR)/.prepared: package-clean
endif endif

@ -13,6 +13,7 @@ PKG_NAME:=base-files
PKG_RELEASE:=8 PKG_RELEASE:=8
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
PKG_FILE_DEPEND:=$(PLATFORM_DIR)
REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' ) REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
ifeq ($(REV),) ifeq ($(REV),)

@ -17,9 +17,8 @@ sub get_ts($$) {
while (<FIND>) { while (<FIND>) {
chomp; chomp;
my $file = $_; my $file = $_;
open FILE, "<$file"; next if -l $file;
my @stat = stat FILE; my @stat = stat $file;
close FILE;
if ($stat[9] > $ts) { if ($stat[9] > $ts) {
$ts = $stat[9]; $ts = $stat[9];
$fn = $file; $fn = $file;

Loading…
Cancel
Save