From b00ef322be2fd3329b6e4844f402387c7ace91ab Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@huawei.com>
Date: Tue, 9 Jan 2024 16:20:50 +0100
Subject: repos: Base rules on parent rules

... to propagate foreign tools that are the same in each
rule set (e.g., busybox, make).
---
 etc/defaults/CC/foreign/clang.TARGETS | 14 ++------------
 etc/defaults/CC/foreign/gcc.TARGETS   | 12 +-----------
 etc/defaults/CC/foreign/tools.TARGETS | 12 +-----------
 3 files changed, 4 insertions(+), 34 deletions(-)

(limited to 'etc/defaults')

diff --git a/etc/defaults/CC/foreign/clang.TARGETS b/etc/defaults/CC/foreign/clang.TARGETS
index 74e376c..3c8dc50 100644
--- a/etc/defaults/CC/foreign/clang.TARGETS
+++ b/etc/defaults/CC/foreign/clang.TARGETS
@@ -1,19 +1,9 @@
 { "defaults":
   { "type": ["CC/foreign", "defaults"]
   , "base":
-    [ ["@", "cmake", "CC/foreign", "defaults"]
+    [ ["@", "base", "CC/foreign", "defaults"]
+    , ["@", "cmake", "CC/foreign", "defaults"]
     , ["@", "python", "CC/foreign", "defaults"]
     ]
-  , "MAKE": ["make/bin/make"]
-  , "toolchain": ["staged-make", "staged-busybox"]
-  , "PATH":
-    [ "$(TOOLCHAIN)/make/bin"
-    , "$(TOOLCHAIN)/busybox/bin"
-    , "$(TOOLCHAIN)/busybox/usr/bin"
-    ]
   }
-, "staged-make":
-  {"type": "install", "dirs": [[["@", "make", "", "toolchain"], "make"]]}
-, "staged-busybox":
-  {"type": "install", "dirs": [[["@", "busybox", "", "toolchain"], "busybox"]]}
 }
diff --git a/etc/defaults/CC/foreign/gcc.TARGETS b/etc/defaults/CC/foreign/gcc.TARGETS
index 32ae01b..b9ea991 100644
--- a/etc/defaults/CC/foreign/gcc.TARGETS
+++ b/etc/defaults/CC/foreign/gcc.TARGETS
@@ -1,15 +1,5 @@
 { "defaults":
   { "type": ["CC/foreign", "defaults"]
-  , "MAKE": ["make/bin/make"]
-  , "toolchain": ["staged-make", "staged-busybox"]
-  , "PATH":
-    [ "$(TOOLCHAIN)/make/bin"
-    , "$(TOOLCHAIN)/busybox/bin"
-    , "$(TOOLCHAIN)/busybox/usr/bin"
-    ]
+  , "base": [["@", "base", "CC/foreign", "defaults"]]
   }
-, "staged-make":
-  {"type": "install", "dirs": [[["@", "make", "", "toolchain"], "make"]]}
-, "staged-busybox":
-  {"type": "install", "dirs": [[["@", "busybox", "", "toolchain"], "busybox"]]}
 }
diff --git a/etc/defaults/CC/foreign/tools.TARGETS b/etc/defaults/CC/foreign/tools.TARGETS
index 32ae01b..b9ea991 100644
--- a/etc/defaults/CC/foreign/tools.TARGETS
+++ b/etc/defaults/CC/foreign/tools.TARGETS
@@ -1,15 +1,5 @@
 { "defaults":
   { "type": ["CC/foreign", "defaults"]
-  , "MAKE": ["make/bin/make"]
-  , "toolchain": ["staged-make", "staged-busybox"]
-  , "PATH":
-    [ "$(TOOLCHAIN)/make/bin"
-    , "$(TOOLCHAIN)/busybox/bin"
-    , "$(TOOLCHAIN)/busybox/usr/bin"
-    ]
+  , "base": [["@", "base", "CC/foreign", "defaults"]]
   }
-, "staged-make":
-  {"type": "install", "dirs": [[["@", "make", "", "toolchain"], "make"]]}
-, "staged-busybox":
-  {"type": "install", "dirs": [[["@", "busybox", "", "toolchain"], "busybox"]]}
 }
-- 
cgit v1.2.3