update bootstrap git commit info patch

this broke bootstrap tests, since it still attempted to call `git` to find LLVM
submodule information..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/debian/patches/build/d-bootstrap-disable-git.patch b/debian/patches/build/d-bootstrap-disable-git.patch
index ca99dec62ff600a66d4e29e8f67089d7b235308b..58e69cb2f98a22cf20bb43360c9b26d9d4a5d802 100644 (file)
--- a/debian/patches/build/d-bootstrap-disable-git.patch
+++ b/debian/patches/build/d-bootstrap-disable-git.patch
@@ -1,12 +1,12 @@
 From: Matthijs van Otterdijk <matthijs@wirevirt.net>
 Date: Thu, 14 Jul 2022 13:17:38 +0200
-Subject: Don't check for cargo-vendor when building from (Debian's) git
+Subject: bootstrap: always use commit info file instead of checking .git
 
 Forwarded: not-needed
 ---
  src/bootstrap/src/core/build_steps/dist.rs | 6 ++++--
- src/bootstrap/src/utils/channel.rs         | 6 ++++++
- 2 files changed, 10 insertions(+), 2 deletions(-)
+ 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 4957de2..1bdc965 100644
@@ -26,19 +26,22 @@ index 4957de2..1bdc965 100644
              builder.require_and_update_all_submodules();
  
 diff --git a/src/bootstrap/src/utils/channel.rs b/src/bootstrap/src/utils/channel.rs
-index 3ae512e..8d9b4cd 100644
+index 3ae512e..fbc3472 100644
 --- a/src/bootstrap/src/utils/channel.rs
 +++ b/src/bootstrap/src/utils/channel.rs
-@@ -35,6 +35,12 @@ pub struct Info {
- 
+@@ -36,12 +36,13 @@ 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() {
+-        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() {