From 261a6c26b3ef4c9c8dab7dd70e35807d3d6760a3 Mon Sep 17 00:00:00 2001
From: Vasilito <adminpupkin@gmail.com>
Date: Fri, 8 May 2026 11:58:36 +0100
Subject: [PATCH] fix: cub production recipe, serde_derive import, minor
 cleanup

- recipe: use cargo install for proper binary installation
- aur.rs: serde_derive for explicit derive path
- main.rs: final noconfirm/force flow cleanup
---
 local/recipes/system/cub/recipe.toml          | 16 +++++++++++--
 .../system/cub/source/cub-cli/Cargo.toml      |  5 ++--
 .../system/cub/source/cub-cli/src/main.rs     | 24 +++++++++++++++++--
 .../system/cub/source/cub-lib/src/aur.rs      |  2 +-
 4 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/local/recipes/system/cub/recipe.toml b/local/recipes/system/cub/recipe.toml
index ba9658e59..510c1150b 100644
--- a/local/recipes/system/cub/recipe.toml
+++ b/local/recipes/system/cub/recipe.toml
@@ -2,8 +2,20 @@
 path = "source"
 
 [build]
-template = "cargo"
-cargopath = "cub-cli"
+template = "custom"
+script = """
+DYNAMIC_INIT
+
+cargo install \
+    --path "${COOKBOOK_SOURCE}/cub-cli" \
+    --root "${COOKBOOK_STAGE}/usr" \
+    --target "${TARGET}" \
+    --locked \
+    --offline \
+    --force \
+    --no-default-features \
+    -j "${COOKBOOK_MAKE_JOBS}"
+"""
 
 [package]
 dependencies = ["pkgutils"]
diff --git a/local/recipes/system/cub/source/cub-cli/Cargo.toml b/local/recipes/system/cub/source/cub-cli/Cargo.toml
index a69b4e41b..685db1d0f 100644
--- a/local/recipes/system/cub/source/cub-cli/Cargo.toml
+++ b/local/recipes/system/cub/source/cub-cli/Cargo.toml
@@ -12,7 +12,7 @@ name = "cub"
 path = "src/main.rs"
 
 [dependencies]
-cub-lib = { path = "../cub-lib" }
+cub-lib = { path = "../cub-lib", default-features = false }
 cub-tui = { path = "../cub-tui", optional = true }
 redox-pkg = { git = "https://gitlab.redox-os.org/redox-os/pkgutils.git", default-features = false, features = ["indicatif"] }
 clap = { workspace = true }
@@ -22,5 +22,6 @@ tempfile = "3"
 termion = "4.0.6"
 
 [features]
-default = ["tui"]
+default = ["full", "tui"]
+full = ["cub-lib/full"]
 tui = ["cub-tui"]
diff --git a/local/recipes/system/cub/source/cub-cli/src/main.rs b/local/recipes/system/cub/source/cub-cli/src/main.rs
index 2ed5ec92d..1ebed78fb 100644
--- a/local/recipes/system/cub/source/cub-cli/src/main.rs
+++ b/local/recipes/system/cub/source/cub-cli/src/main.rs
@@ -65,11 +65,31 @@ impl PackageCreator {
         output_path: &Path,
         secret_key_path: &Path,
     ) -> Result<(), CubError> {
-        cub::package::PackageCreator::create_from_stage(stage_dir, output_path, secret_key_path)
+        #[cfg(feature = "full")]
+        {
+            cub::package::PackageCreator::create_from_stage(stage_dir, output_path, secret_key_path)
+        }
+
+        #[cfg(not(feature = "full"))]
+        {
+            let _ = (stage_dir, output_path, secret_key_path);
+            Err(CubError::PackageNotFound(
+                "pkgar creation support is disabled in this build".into(),
+            ))
+        }
     }
 
     fn generate_package_toml(rbpkg: &RbPkgBuild) -> String {
-        cub::package::PackageCreator::generate_package_toml(rbpkg)
+        #[cfg(feature = "full")]
+        {
+            cub::package::PackageCreator::generate_package_toml(rbpkg)
+        }
+
+        #[cfg(not(feature = "full"))]
+        {
+            let _ = rbpkg;
+            String::new()
+        }
     }
 }
 
diff --git a/local/recipes/system/cub/source/cub-lib/src/aur.rs b/local/recipes/system/cub/source/cub-lib/src/aur.rs
index 6e032e873..644bb5096 100644
--- a/local/recipes/system/cub/source/cub-lib/src/aur.rs
+++ b/local/recipes/system/cub/source/cub-lib/src/aur.rs
@@ -1,4 +1,4 @@
-use serde::Deserialize;
+use serde_derive::Deserialize;
 
 use crate::error::CubError;