pkg-generic: host variant use git submodules if target variant does
PATCH 1/1 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 targt one, we end up with the generated archive missing the submodules.
This happens in exactly one package in our tree: c-capnproto.
Weirdly enough, the issue was not caught until after we changed the way we generate tar archives from git downloads.
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/
--- package/pkg-generic.mk | 6 ++++++ 1 file changed, 6 insertions(+)
package/pkg-generic.mk +6 -0
@@ -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)
Signature · 1 line
2.25.1
Arnout Vandecappelle
AppliedPATCH 1/1 pkg-generic: host variant use git submodules if target variant does
Quoted 8 lines · Yann E. MORIN
When a package has both a target and a host variant, and uses git submodules, and the host variant is downloaded before the targt one, we end up with the generated archive missing the submodules.
This happens in exactly one package in our tree: c-capnproto.
Weirdly enough, the issue was not caught until after we changed the way we generate tar archives from git downloads.
Applied to master after adding this explanation:
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.
Thanks!
Regards,
Arnout
Quoted 31 lines
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 <[email protected]>Signed-off-by Yann E. MORIN <[email protected]>--- package/pkg-generic.mk | 6 ++++++ 1 file changed, 6 insertions(+)package/pkg-generic.mk +6
-0@@ -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)
PATCH 1/1 pkg-generic: host variant use git submodules if target variant does
In reply to Yann E. MORINQuoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
When a package has both a target and a host variant, and uses git submodules, and the host variant is downloaded before the targt one, we end up with the generated archive missing the submodules.
This happens in exactly one package in our tree: c-capnproto.
Weirdly enough, the issue was not caught until after we changed the way we generate tar archives from git downloads.
Quoted 8 lines
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 <[email protected]>Signed-off-by Yann E. MORIN <[email protected]>
Committed to 2020.02.x and 2020.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard