From 4d2c3684f8f47cdb4ab21f1c080c9a23573ccaa2 Mon Sep 17 00:00:00 2001 From: Matthijs van Otterdijk Date: Thu, 14 Jul 2022 13:17:38 +0200 Subject: [PATCH] bootstrap: always use commit info file instead of checking .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 | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index 4957de2e1b..1bdc9659ae 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -1013,8 +1013,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 { builder.require_and_update_all_submodules(); diff --git a/src/bootstrap/src/utils/channel.rs b/src/bootstrap/src/utils/channel.rs index 3ae512ef7f..fbc3472e1a 100644 --- a/src/bootstrap/src/utils/channel.rs +++ b/src/bootstrap/src/utils/channel.rs @@ -36,12 +36,13 @@ pub struct Info { impl GitInfo { pub fn new(omit_git_hash: bool, dir: &Path) -> GitInfo { // See if this even begins to look like a git dir - if !dir.join(".git").exists() { + // Debian: always use commit info file, since our .git is not upstreams.. + //if !dir.join(".git").exists() { match read_commit_info_file(dir) { Some(info) => return GitInfo::RecordedForTarball(info), None => return GitInfo::Absent, } - } + //} // Make sure git commands work match helpers::git(Some(dir)).arg("rev-parse").as_command_mut().output() { -- 2.30.2