ADHOC/replicant-vendor_replicant
3
0
Fork 0
Code Issues 6 Pull Requests Releases Activity

http_prebuilt: Improve retrieval of artifacts from archive

Browse Source 
The current version always redownloads the artifact.
Kali does not like the nested md5sum command and ignores it
leaving file checksum value blank so the test always fails.
A temporary variable is used to get around this limitation
of kali.

The echo "Downloading..." command has been modified to actually
print and has been moved so it only does so when downloading
the artifact.

Change-Id: I115860a87e55399a652d6548fe50f6204337f854
(cherry picked from commit 20c06fd75e09f3910ec699bdc54eec08f6bb4594)
This commit is contained in:
David Marble 2017-01-12 00:21:36 -06:00 committed by Scott Warner
parent 1846ec0341
commit 84cfb7f0d1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/core/http_prebuilt.mk
View File

@ -47,11 +47,13 @@ define curl-checksum
endef endef
define audit-checksum define audit-checksum
@echo "Downloading: $(filename) (version $(version))" -> $(filepath);
$(hide) if [ ! -f $(filepath) ]; then \ $(hide) if [ ! -f $(filepath) ]; then \
echo "Downloading: $(filename) (version $(version)) -> $(filepath)"; \
$(call download-prebuilt-module, $(HTTP_FILE_URL),$(filepath)) \ $(call download-prebuilt-module, $(HTTP_FILE_URL),$(filepath)) \
else \ else \
if [ "$(shell echo $(md5sum $(filepath)))" != "$(shell cat $(checksum) | cut -d ' ' -f1)" ]; then \ temp_checksum=$(shell md5sum $(filepath) | cut -d ' ' -f1); \
if [ "$$temp_checksum" != "$(shell cat $(checksum) | cut -d ' ' -f1)" ]; then \
echo "Downloading: $(filename) (version $(version)) -> $(filepath)"; \
rm -rf $(filepath); \ rm -rf $(filepath); \
$(call download-prebuilt-module, $(HTTP_FILE_URL),$(filepath)) \ $(call download-prebuilt-module, $(HTTP_FILE_URL),$(filepath)) \
fi; \ fi; \