From 8c5a5e17484c92f286a26fca45b6db4bddde1f3b Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Fri, 27 Sep 2024 14:55:15 +0200
Subject: toolchains: move python to shell defaults

... and drop unneeded duplication as well as wrong expansion
variables in "PATH" fields.
---
 etc/defaults/shell/clang.TARGETS      |  3 ++-
 toolchains/CC/foreign/busybox.TARGETS |  8 --------
 toolchains/CC/foreign/cmake.TARGETS   |  1 -
 toolchains/CC/foreign/make.TARGETS    |  1 -
 toolchains/CC/foreign/python.TARGETS  |  7 +------
 toolchains/shell/python.TARGETS       | 14 ++++++++++++--
 6 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/etc/defaults/shell/clang.TARGETS b/etc/defaults/shell/clang.TARGETS
index 6a2bf9f..7cea0f5 100644
--- a/etc/defaults/shell/clang.TARGETS
+++ b/etc/defaults/shell/clang.TARGETS
@@ -1,5 +1,6 @@
 { "defaults":
   { "type": "defaults"
-  , "base": [["@", "base", "shell", "defaults"]]
+  , "base":
+    [["@", "base", "shell", "defaults"], ["@", "python", "shell", "defaults"]]
   }
 }
diff --git a/toolchains/CC/foreign/busybox.TARGETS b/toolchains/CC/foreign/busybox.TARGETS
index da37c1a..3559b47 100644
--- a/toolchains/CC/foreign/busybox.TARGETS
+++ b/toolchains/CC/foreign/busybox.TARGETS
@@ -7,13 +7,5 @@
 , "defaults (unexported)":
   { "type": ["@", "rules", "CC/foreign", "defaults"]
   , "toolchain": ["staged-busybox"]
-  , "PATH":
-    [ "$(TOOLCHAIN)/busybox/bin"
-    , "$(TOOLCHAIN)/busybox/sbin"
-    , "$(TOOLCHAIN)/busybox/usr/bin"
-    , "$(TOOLCHAIN)/busybox/usr/sbin"
-    ]
   }
-, "staged-busybox":
-  {"type": "install", "dirs": [[["", "toolchain"], "busybox"]]}
 }
diff --git a/toolchains/CC/foreign/cmake.TARGETS b/toolchains/CC/foreign/cmake.TARGETS
index 4436416..78f3436 100644
--- a/toolchains/CC/foreign/cmake.TARGETS
+++ b/toolchains/CC/foreign/cmake.TARGETS
@@ -8,7 +8,6 @@
   { "type": ["@", "rules", "CC/foreign", "defaults"]
   , "CMAKE": ["cmake/bin/cmake"]
   , "toolchain": ["staged-cmake"]
-  , "PATH": ["$(TOOLCHAIN)/cmake/bin"]
   }
 , "staged-cmake": {"type": "install", "dirs": [[["", "toolchain"], "cmake"]]}
 }
diff --git a/toolchains/CC/foreign/make.TARGETS b/toolchains/CC/foreign/make.TARGETS
index a5efc72..ddd5f09 100644
--- a/toolchains/CC/foreign/make.TARGETS
+++ b/toolchains/CC/foreign/make.TARGETS
@@ -7,7 +7,6 @@
 , "defaults (unexported)":
   { "type": ["@", "rules", "CC/foreign", "defaults"]
   , "MAKE": ["make/bin/make"]
-  , "PATH": ["$(TOOLCHAIN)/make/bin"]
   , "toolchain": ["staged-make"]
   }
 , "staged-make": {"type": "install", "dirs": [[["", "toolchain"], "make"]]}
diff --git a/toolchains/CC/foreign/python.TARGETS b/toolchains/CC/foreign/python.TARGETS
index 143cc14..97c0518 100644
--- a/toolchains/CC/foreign/python.TARGETS
+++ b/toolchains/CC/foreign/python.TARGETS
@@ -4,10 +4,5 @@
   , "flexible_config":
     ["ARCH", "ENV", "HOST_ARCH", "TARGET_ARCH", "TOOLCHAIN_CONFIG"]
   }
-, "defaults (unexported)":
-  { "type": ["@", "rules", "CC/foreign", "defaults"]
-  , "toolchain": ["staged-python"]
-  , "PATH": ["$(TOOLCHAIN)/python/usr/bin"]
-  }
-, "staged-python": {"type": "install", "dirs": [[["", "toolchain"], "python"]]}
+, "defaults (unexported)": {"type": ["@", "rules", "CC/foreign", "defaults"]}
 }
diff --git a/toolchains/shell/python.TARGETS b/toolchains/shell/python.TARGETS
index a2a686c..0a9e053 100644
--- a/toolchains/shell/python.TARGETS
+++ b/toolchains/shell/python.TARGETS
@@ -1,3 +1,13 @@
-{ "defaults": {"type": "export", "target": "defaults (unexported)"}
-, "defaults (unexported)": {"type": ["@", "rules", "shell", "defaults"]}
+{ "defaults":
+  { "type": "export"
+  , "target": "defaults (unexported)"
+  , "flexible_config":
+    ["ARCH", "ENV", "HOST_ARCH", "TARGET_ARCH", "TOOLCHAIN_CONFIG"]
+  }
+, "defaults (unexported)":
+  { "type": ["@", "rules", "shell", "defaults"]
+  , "toolchain": ["staged-python"]
+  , "bin dirs": ["python/usr/bin"]
+  }
+, "staged-python": {"type": "install", "dirs": [[["", "toolchain"], "python"]]}
 }
-- 
cgit v1.2.3