From 343971c1f22aacf200bdc072a659f3cfa8ada511 Mon Sep 17 00:00:00 2001
From: John Eckersberg <dev@eckersberg.com>
Date: Mon, 5 Oct 2026 11:42:44 -0400
Subject: [PATCH] Use published, versioned bootc internal crates

We don't need to track these by hash anymore, and more importantly the
gitref dependencies are not grouped properly by renovate, so these
crates keep getting bumped independently and they always conflict with
each other.

This also reverts #367 where I tried (and failed) to get them to group
properly.

Signed-off-by: John Eckersberg <dev@eckersberg.com>
---
 Cargo.lock            | 26 ++++++++++++++------------
 crates/kit/Cargo.toml |  4 ++--
 renovate.json         |  8 --------
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 94215acaa..284e08763 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -289,7 +289,8 @@ dependencies = [
 [[package]]
 name = "bootc-internal-mount"
 version = "1.16.14"
-source = "git+https://github.com/bootc-dev/bootc?rev=83d15891428cda862c5c732397f5dd7c81dc4a23#83d15891428cda862c5c732397f5dd7c81dc4a23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "709ac7a3df84605118d4e4d23aeb970d7df8a3350cfc797ae7ff401c3ce11a8a"
 dependencies = [
  "anyhow",
  "bootc-internal-utils",
@@ -306,7 +307,8 @@ dependencies = [
 [[package]]
 name = "bootc-internal-utils"
 version = "1.16.14"
-source = "git+https://github.com/bootc-dev/bootc?rev=83d15891428cda862c5c732397f5dd7c81dc4a23#83d15891428cda862c5c732397f5dd7c81dc4a23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fac963c49a067b63196efbd2bd540b99a4f5719a350d47b684604969e04127f"
 dependencies = [
  "anstream",
  "anyhow",
@@ -369,7 +371,7 @@ dependencies = [
  "maybe-owned",
  "rustix",
  "rustix-linux-procfs",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.1",
  "winx",
 ]
 
@@ -410,7 +412,7 @@ dependencies = [
  "rustix",
  "rustix-linux-procfs",
  "uuid",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.1",
 ]
 
 [[package]]
@@ -812,7 +814,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.1",
 ]
 
 [[package]]
@@ -869,7 +871,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.1",
 ]
 
 [[package]]
@@ -1541,7 +1543,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20fd6de4ccfcc187e38bc21cfa543cb5a302cb86a8b114eb7f0bf0dc9f8ac00f"
 dependencies = [
  "io-lifetimes 3.0.1",
- "windows-sys 0.52.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2375,7 +2377,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.1",
 ]
 
 [[package]]
@@ -2630,7 +2632,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.1",
 ]
 
 [[package]]
@@ -2769,10 +2771,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
  "fastrand",
- "getrandom 0.3.3",
+ "getrandom 0.4.3",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.1",
 ]
 
 [[package]]
@@ -3347,7 +3349,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.61.1",
 ]
 
 [[package]]
diff --git a/crates/kit/Cargo.toml b/crates/kit/Cargo.toml
index 21bb8b8a5..477863340 100644
--- a/crates/kit/Cargo.toml
+++ b/crates/kit/Cargo.toml
@@ -48,8 +48,8 @@ cpio = "0.4"
 [target.'cfg(target_os = "linux")'.dependencies]
 bcvk-qemu = { path = "../bcvk-qemu" }
 cap-std-ext = { workspace = true }
-bootc-mount = { package = "bootc-internal-mount", git = "https://github.com/bootc-dev/bootc", rev = "83d15891428cda862c5c732397f5dd7c81dc4a23" }
-bootc-utils = { package = "bootc-internal-utils", git = "https://github.com/bootc-dev/bootc", rev = "83d15891428cda862c5c732397f5dd7c81dc4a23" }
+bootc-mount = { package = "bootc-internal-mount", version = "1.16.14" }
+bootc-utils = { package = "bootc-internal-utils", version = "1.16.14" }
 rustix = { version = "1", features = ["thread", "net", "fs", "pipe", "system", "process", "mount"] }
 vsock = "0.5"
 nix = { version = "0.31", features = ["socket"] }
diff --git a/renovate.json b/renovate.json
index 27b13469f..3e4b91a3a 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,13 +2,5 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "local>bootc-dev/infra:renovate-shared-config.json"
-  ],
-  "packageRules": [
-    {
-      "description": ["Group bootc crates so they stay in sync"],
-      "matchManagers": ["cargo"],
-      "matchPackageNames": ["bootc-mount", "bootc-utils"],
-      "groupName": "bootc crates"
-    }
   ]
 }