recipe: specify recipe and task name separately in dependencies

6 files changed, 60 insertions, 30 deletions

diff --git a/examples/gcc-libs.yml b/examples/gcc-libs.yml
index 9ca259a..1a43ebb 100644
--- a/examples/gcc-libs.yml
+++ b/examples/gcc-libs.yml
@@ -4,13 +4,16 @@ tasks:
       host: 'platform'
       target: 'platform'
     inherit:
-      task: 'gcc:compile'
+      recipe: 'gcc'
+      task: 'compile'
     build_depends:
-      - task: 'binutils:install'
+      - recipe: 'binutils'
+        task: 'install'
         args:
           target: 'target'
     depends:
-      - task: 'glibc:install'
+      - recipe: 'glibc'
+        task: 'install'
         args:
           host: 'target'
     run: |
@@ -24,11 +27,13 @@ tasks:
     inherit:
       task: 'compile'
     build_depends:
-      - task: 'binutils:install'
+      - recipe: 'binutils'
+        task: 'install'
         args:
           target: 'target'
     depends:
-      - task: 'glibc:install'
+      - recipe: 'glibc'
+        task: 'install'
         args:
           host: 'target'
     output:
diff --git a/examples/gcc.yml b/examples/gcc.yml
index 166ab22..3102fd6 100644
--- a/examples/gcc.yml
+++ b/examples/gcc.yml
@@ -24,7 +24,8 @@ tasks:
     inherit:
       task: 'unpack'
     build_depends:
-      - task: 'binutils:install'
+      - recipe: 'binutils'
+        task: 'install'
         args:
           target: 'target'
     depends:
@@ -78,7 +79,8 @@ tasks:
     inherit:
       task: 'configure'
     build_depends:
-      - task: 'binutils:install'
+      - recipe: 'binutils'
+        task: 'install'
         args:
           target: 'target'
     depends:
@@ -96,7 +98,8 @@ tasks:
     output:
       default:
         runtime_depends:
-          - task: 'binutils:install'
+          - recipe: 'binutils'
+            task: 'install'
     run: |
       cd gcc-build
       make DESTDIR={{destdir}} install-host
diff --git a/examples/glibc.yml b/examples/glibc.yml
index 9f2ae9d..0c5235a 100644
--- a/examples/glibc.yml
+++ b/examples/glibc.yml
@@ -12,10 +12,13 @@ tasks:
     inherit:
       task: 'unpack'
     build_depends:
-      - task: 'gcc:install'
-      - task: 'libgcc-initial:install'
+      - recipe: 'gcc'
+        task: 'install'
+      - recipe: 'libgcc-initial'
+        task: 'install'
     depends:
-      - task: 'linux-uapi-headers:install'
+      - recipe: 'linux-uapi-headers'
+        task: 'install'
     run: |
       CROSS_COMPILE={{build.prefix}}/bin/{{host.gnu_triplet}}-
 
@@ -55,10 +58,13 @@ tasks:
     inherit:
       task: 'configure'
     build_depends:
-      - task: 'gcc:install'
-      - task: 'libgcc-initial:install'
+      - recipe: 'gcc'
+        task: 'install'
+      - recipe: 'libgcc-initial'
+        task: 'install'
     depends:
-      - task: 'linux-uapi-headers:install'
+      - recipe: 'linux-uapi-headers'
+        task: 'install'
     run: |
       cd glibc-build
       make -j8
@@ -69,14 +75,18 @@ tasks:
     inherit:
       task: 'compile'
     build_depends:
-      - task: 'gcc:install'
-      - task: 'libgcc-initial:install'
+      - recipe: 'gcc'
+        task: 'install'
+      - recipe: 'libgcc-initial'
+        task: 'install'
     depends:
-      - task: 'linux-uapi-headers:install'
+      - recipe: 'linux-uapi-headers'
+        task: 'install'
     output:
       default:
         runtime_depends:
-          - task: 'linux-uapi-headers:install'
+          - recipe: 'linux-uapi-headers'
+            task: 'install'
     run: |
       cd glibc-build
       make install_root={{destdir}} install
diff --git a/examples/libgcc-initial.yml b/examples/libgcc-initial.yml
index 2e166d9..89a6734 100644
--- a/examples/libgcc-initial.yml
+++ b/examples/libgcc-initial.yml
@@ -4,13 +4,16 @@ tasks:
       host: 'platform'
       target: 'platform'
     inherit:
-      task: 'gcc:compile'
+      recipe: 'gcc'
+      task: 'compile'
     build_depends:
-      - task: 'binutils:install'
+      - recipe: 'binutils'
+        task: 'install'
         args:
           target: 'target'
     depends:
-      - task: 'gcc:header-stubs'
+      - recipe: 'gcc'
+        task: 'header-stubs'
     run: |
       cd gcc-build
       make configure-target-libgcc
@@ -33,11 +36,13 @@ tasks:
     inherit:
       task: 'configure'
     build_depends:
-      - task: 'binutils:install'
+      - recipe: 'binutils'
+        task: 'install'
         args:
           target: 'target'
     depends:
-      - task: 'gcc:header-stubs'
+      - recipe: 'gcc'
+        task: 'header-stubs'
     run: |
       cd gcc-build
       make -j8 all-target-libgcc
@@ -49,7 +54,8 @@ tasks:
     inherit:
       task: 'compile'
     build_depends:
-      - task: 'binutils:install'
+      - recipe: 'binutils'
+        task: 'install'
         args:
           target: 'target'
     output:
diff --git a/examples/ls.yml b/examples/ls.yml
index b9cdb28..633336d 100644
--- a/examples/ls.yml
+++ b/examples/ls.yml
@@ -1,8 +1,10 @@
 tasks:
   build:
     depends:
-      - task: 'foo:build'
-      - task: 'bar:build'
+      - recipe: 'foo'
+        task: 'build'
+      - recipe: 'bar'
+        task: 'build'
     output:
       default: {}
     run: |
diff --git a/examples/toolchain.yml b/examples/toolchain.yml
index fea1ce4..863785c 100644
--- a/examples/toolchain.yml
+++ b/examples/toolchain.yml
@@ -6,8 +6,10 @@ tasks:
     output:
       default:
         runtime_depends:
-        - task: 'gcc:install'
-        - task: 'gcc-libs:install-gcc'
+        - recipe: 'gcc'
+          task: 'install'
+        - recipe: 'gcc-libs'
+          task: 'install-gcc'
 
   depends:
     args:
@@ -15,8 +17,10 @@ tasks:
     output:
       default:
         runtime_depends:
-        - task: 'glibc:install'
-        - task: 'gcc-libs:install'
+        - recipe: 'glibc'
+          task: 'install'
+        - recipe: 'gcc-libs'
+          task: 'install'
 
   build:
     args: