diff options
author | Eneas U de Queiroz <cotequeiroz@gmail.com> | 2021-08-19 18:14:22 -0300 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2021-11-01 20:18:55 +0100 |
commit | 8cf4d4df5560f6771f74c3124870e8a23094aff3 (patch) | |
tree | 571f2ef10dc6defc6680684be130cfe84386748a /include/package.mk | |
parent | 9ae5f09dc8718d51f8dad1f0e59032ee48d2e2e4 (diff) | |
download | openwrt-8cf4d4df5560f6771f74c3124870e8a23094aff3.tar.gz openwrt-8cf4d4df5560f6771f74c3124870e8a23094aff3.tar.bz2 openwrt-8cf4d4df5560f6771f74c3124870e8a23094aff3.zip |
download: improve handling of invalid local files
4e19cbc5533: [download: handle possibly invalid local tarballs] added a
FORCE rule to downloaded files, so that they will be always checked by
download.pl.
As a side-effect, check-compile will fail, forcing unnecessary package
rebuilds.
The check-compile.txt log shows (for libxml2 for example):
Considering target file '.../dl/libxml2-2.9.12.tar.gz'.
...
prerequisite 'FORCE' of target '.../dl/libxml2-2.9.12.tar.gz' does
not exist.
Must remake target '.../dl/libxml2-2.9.12.tar.gz'.
...
Giving up on target file '...libxml2-2.9.12/.prepared_...'.
Giving up on target file '...libxml2-2.9.12/.configured_...'.
Giving up on target file '...libxml2-2.9.12/.built'.
Giving up on target file '...stamp/.libxml2_installed'.
Giving up on target file '.compile'.
Then the package is rebuilt even if it is not otherwise needed.
To fix this, instead of always forcing the download target to be remade,
check its hash first: if it matches, then the FORCE is not added.
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Diffstat (limited to 'include/package.mk')
-rw-r--r-- | include/package.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/package.mk b/include/package.mk index db0a869dab..55d9352072 100644 --- a/include/package.mk +++ b/include/package.mk @@ -183,7 +183,7 @@ define Build/CoreTargets $(call Build/Autoclean) $(call DefaultTargets) - $(DL_DIR)/$(FILE): FORCE + $(call check_download_integrity) download: $(foreach hook,$(Hooks/Download), |