From: Yann E. MORIN Date: Wed, 13 Jan 2021 22:10:14 +0000 (+0100) Subject: pkg-generic: host variant use git submodules if target variant does X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4d03923b6a7776d30ee2a7452640d79442cfa2f0;p=buildroot.git pkg-generic: host variant use git submodules if target variant does When a package has both a target and a host variant, and uses git submodules, and the host variant is downloaded before the target one, we end up with the generated archive missing the submodules. This happens in exactly one package in our tree: c-capnproto. This issue was not caught before because after a few days, the full sources are added to sources.buildroot.net. So when the hash check fails, the full tarball is simply downloaded from there. Propagate the git submodule setting from the target variant to the host variant, unless the host variant explicitly opted-out. Fixes: http://autobuild.buildroot.org/results/2de9c6c8ce83569d18cc7140ebc60d6fe1aadcbf/ Reported-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index c46c742352..357a4ce453 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -567,6 +567,12 @@ ifneq ($$(filter bzr cvs hg,$$($(2)_SITE_METHOD)),) BR_NO_CHECK_HASH_FOR += $$($(2)_SOURCE) endif +ifndef $(2)_GIT_SUBMODULES + ifdef $(3)_GIT_SUBMODULES + $(2)_GIT_SUBMODULES = $$($(3)_GIT_SUBMODULES) + endif +endif + # Do not accept to download git submodule if not using the git method ifneq ($$($(2)_GIT_SUBMODULES),) ifneq ($$($(2)_SITE_METHOD),git)