From 2efc848753d7495e5cf44b6934d15db63f95ed2f Mon Sep 17 00:00:00 2001 From: Matthijs van Otterdijk Date: Thu, 14 Jul 2022 13:17:38 +0200 Subject: [PATCH] Don't check for cargo-vendor when building from (Debian's) git Forwarded: not-needed Gbp-Pq: Topic build Gbp-Pq: Name d-bootstrap-disable-git.patch --- src/bootstrap/src/core/build_steps/dist.rs | 6 ++++-- src/bootstrap/src/utils/channel.rs | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index 1e9d2025bc..5fe4b9e70a 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -1011,8 +1011,10 @@ impl Step for PlainSourceTarball { // If we're building from git or tarball sources, we need to vendor // a complete distribution. - if builder.rust_info().is_managed_git_subrepository() - || builder.rust_info().is_from_tarball() + // + // Debian: short-circuited because the Debian package is also in a git + // repository, but cargo-vendor should not be installed or run. + if false { // FIXME: This code looks _very_ similar to what we have in `src/core/build_steps/vendor.rs` // perhaps it should be removed in favor of making `dist` perform the `vendor` step? diff --git a/src/bootstrap/src/utils/channel.rs b/src/bootstrap/src/utils/channel.rs index f8bcb58499..9163b42d3e 100644 --- a/src/bootstrap/src/utils/channel.rs +++ b/src/bootstrap/src/utils/channel.rs @@ -36,6 +36,12 @@ pub struct Info { impl GitInfo { pub fn new(omit_git_hash: bool, dir: &Path) -> GitInfo { + // + // Debian: returning early because the Debian package is also in a git + // repository, but we don't want to parse gitinfo. This is + // needed for the bootstrap tests to work which running for + // Debian git. + return GitInfo::Absent; // See if this even begins to look like a git dir if !dir.join(".git").exists() { match read_commit_info_file(dir) { -- 2.30.2