From 79f3e1634328756ea0f29bdb9f2f06803cb16dd2 Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Tue, 7 Jul 2026 16:43:38 +0700
Subject: [PATCH] Fix to make cookbook.lock more consistent

---
 src/bin/repo.rs | 11 +++++++++--
 src/recipe.rs   | 21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/bin/repo.rs b/src/bin/repo.rs
index 7c01c3247..435d3a398 100644
--- a/src/bin/repo.rs
+++ b/src/bin/repo.rs
@@ -720,7 +720,13 @@ fn parse_args(args: Vec<String>) -> Result<(CliConfig, CliCommand, Vec<CookRecip
         recipes = recipes_flatten_package_names(recipes);
 
         for recipe in recipes.iter_mut() {
-            if let Some(special_rule) = special_rules.get(&recipe.name) {
+            if let Some(special_rule) =
+                special_rules.get(recipe.canon_recipe_name().without_prefix())
+            {
+                if recipe.name.is_host() && special_rule == "binary" {
+                    // host recipe binaries is currently not supported
+                    continue;
+                }
                 recipe.apply_filesystem_config(&special_rule)?;
                 continue;
             }
@@ -1042,7 +1048,8 @@ fn handle_change_rule(
         if is_capture_rev && !matches!(recipe.recipe.source, Some(SourceRecipe::Git { .. })) {
             continue;
         }
-        let recipe_name = recipe.name.without_prefix();
+        let recipe_name = recipe.canon_recipe_name();
+        let recipe_name = recipe_name.without_prefix();
         let mut recipe_lock = lock.get(recipe_name).cloned().unwrap_or_default();
         let cached = if is_change_rule {
             if config.unset {
diff --git a/src/recipe.rs b/src/recipe.rs
index 57ee205a5..b832c99a4 100644
--- a/src/recipe.rs
+++ b/src/recipe.rs
@@ -540,6 +540,27 @@ impl CookRecipe {
         }
         None
     }
+
+    /// Get the name for recipe that is used as the build source
+    pub fn canon_recipe_name(&self) -> PackageName {
+        // TODO: I hope nobody is nesting same_as...
+        if let Some(SourceRecipe::SameAs { same_as }) = &self.recipe.source {
+            if let Some(name) = Path::new(&same_as)
+                .file_name()
+                .and_then(|p| p.to_str())
+                .and_then(|p| PackageName::new(p).ok())
+            {
+                return name;
+            } else {
+                eprintln!(
+                    "canon_recipe_name(): the same_as path for recipe {} is not valid",
+                    self.name.as_str()
+                )
+            }
+        }
+
+        self.name.clone()
+    }
 }
 
 // TODO: Wrap these vectors in a struct