aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2020-03-19 22:56:57 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-03-27 23:51:14 +0100
commit630283a7f79107d93a8502a8467571f61c99d24d (patch)
tree8a68e3cac134089e5a15722d41a05943b81968eb
parentfb546684f60a7e42b4b5a61d29b0df0af7ec9b98 (diff)
downloadbuildroot-630283a7f79107d93a8502a8467571f61c99d24d.tar.gz
buildroot-630283a7f79107d93a8502a8467571f61c99d24d.tar.bz2
boot/barebox-aux: exclude git downloads from hash check
When barebox, and thus barebox-aux, are downloaded from a git tree, then barebox-aux download fails because a hash check is attempted on the downloaded archive: Could not fetch special ref 'v2020.03.0'; assuming it is not special. ERROR: No hash found for barebox-aux-v2020.03.0.tar.gz This is because we only exclude from the check the archive of the bare barebox: BR_NO_CHECK_HASH_FOR += $(BAREBOX_SOURCE) However, the default name of an archive is based on the package name, which for barebox-aux is not 'barebox'. Since barebox-aux really uses the exact same source as the bare barebox, it should also share the archive name. This has two direct consequences and advantages: - the hash check is completely avoided for the barebox-aux archive; - the barebox-aux archive is not downloaded as it is already downloaded for barebox. Reported-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Tested-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> (cherry picked from commit 451ee6fa5454158b5d95cef0f404c0443dde868e) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--boot/barebox/barebox.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 814e21f945..5e423f9b2c 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -25,6 +25,10 @@ $(1)_SOURCE = $$(notdir $$($(1)_TARBALL))
else ifeq ($$(BR2_TARGET_BAREBOX_CUSTOM_GIT),y)
$(1)_SITE = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL))
$(1)_SITE_METHOD = git
+# Override the default value of _SOURCE to 'barebox-*' so that it is not
+# downloaded a second time for barebox-aux; also alows avoiding the hash
+# check:
+$(1)_SOURCE = barebox-$$($(1)_VERSION).tar.gz
else
# Handle stable official Barebox versions
$(1)_SOURCE = barebox-$$($(1)_VERSION).tar.bz2