diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2024-04-04 18:33:49 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2024-04-04 18:42:09 +0200 |
| commit | b433fbf27b8d6ccf6e13d4b6a28de556012576d7 (patch) | |
| tree | 7849c08bb199b37c7d0b1ab316f0a172d4b44474 | |
| parent | e39de9b1dd3b9bf75ef99667fd10badd7908e0df (diff) | |
| download | rebel-b433fbf27b8d6ccf6e13d4b6a28de556012576d7.tar rebel-b433fbf27b8d6ccf6e13d4b6a28de556012576d7.zip | |
examples: convert recipes with common sources to subrecipes
| -rw-r--r-- | examples/pins.yml.example | 6 | ||||
| -rw-r--r-- | examples/recipes/gcc/build.libgcc-initial.yml (renamed from examples/recipes/libgcc-initial/build.yml) | 1 | ||||
| -rw-r--r-- | examples/recipes/gcc/build.libgcc.yml (renamed from examples/recipes/libgcc/build.yml) | 2 | ||||
| -rw-r--r-- | examples/recipes/gcc/build.libs.yml (renamed from examples/recipes/gcc-libs/build.yml) | 5 | ||||
| -rw-r--r-- | examples/recipes/glibc/build.yml | 6 | ||||
| -rw-r--r-- | examples/recipes/linux/build.uapi-headers.yml (renamed from examples/recipes/linux-uapi-headers/build.yml) | 1 | ||||
| -rw-r--r-- | examples/recipes/toolchain/build.yml | 4 |
7 files changed, 9 insertions, 16 deletions
diff --git a/examples/pins.yml.example b/examples/pins.yml.example index f4dc98f..c16cedb 100644 --- a/examples/pins.yml.example +++ b/examples/pins.yml.example @@ -2,12 +2,12 @@ rootfs-8d1fb3274ebc: hash: '8d1fb3274ebcb0f7ae88f3ce5810ad20014d08efca29e617a873670949de729d' is-rootfs: true provides: - - recipe: 'gcc-libs' + - recipe: 'gcc/libs' task: 'install' output: ['default'] args: host: 'build' - - recipe: 'linux-uapi-headers' + - recipe: 'linux/uapi-headers' task: 'install' output: ['default'] args: @@ -54,7 +54,7 @@ rootfs-8d1fb3274ebc: args: host: 'build' target: 'build' - - recipe: 'libgcc' + - recipe: 'gcc/libgcc' task: 'install' output: ['default'] args: diff --git a/examples/recipes/libgcc-initial/build.yml b/examples/recipes/gcc/build.libgcc-initial.yml index 81cacfd..ca24907 100644 --- a/examples/recipes/libgcc-initial/build.yml +++ b/examples/recipes/gcc/build.libgcc-initial.yml @@ -1,5 +1,4 @@ meta: - name: 'gcc' version: '13.2.0' tasks: configure: diff --git a/examples/recipes/libgcc/build.yml b/examples/recipes/gcc/build.libgcc.yml index d7433fe..0c8cfd6 100644 --- a/examples/recipes/libgcc/build.yml +++ b/examples/recipes/gcc/build.libgcc.yml @@ -1,5 +1,3 @@ -meta: - name: 'gcc' tasks: compile: args: diff --git a/examples/recipes/gcc-libs/build.yml b/examples/recipes/gcc/build.libs.yml index 2f566b8..e69d318 100644 --- a/examples/recipes/gcc-libs/build.yml +++ b/examples/recipes/gcc/build.libs.yml @@ -1,12 +1,9 @@ -meta: - name: 'gcc' - version: '13.2.0' tasks: compile: args: host: 'platform' inherit: - recipe: 'libgcc' + recipe: 'gcc/libgcc' task: 'compile' args: host: 'build' diff --git a/examples/recipes/glibc/build.yml b/examples/recipes/glibc/build.yml index 20e2363..16f2706 100644 --- a/examples/recipes/glibc/build.yml +++ b/examples/recipes/glibc/build.yml @@ -16,10 +16,10 @@ tasks: build_depends: - recipe: 'gcc' task: 'install' - - recipe: 'libgcc-initial' + - recipe: 'gcc/libgcc-initial' task: 'install' depends: - - recipe: 'linux-uapi-headers' + - recipe: 'linux/uapi-headers' task: 'install' run: | export BUILD_CC="$CC_FOR_BUILD" @@ -61,7 +61,7 @@ tasks: output: default: runtime_depends: - - recipe: 'linux-uapi-headers' + - recipe: 'linux/uapi-headers' task: 'install' run: | cd {{basename}}-build diff --git a/examples/recipes/linux-uapi-headers/build.yml b/examples/recipes/linux/build.uapi-headers.yml index 3fadccd..10c2539 100644 --- a/examples/recipes/linux-uapi-headers/build.yml +++ b/examples/recipes/linux/build.uapi-headers.yml @@ -1,5 +1,4 @@ meta: - name: 'linux' version: '6.5.5' tasks: unpack: diff --git a/examples/recipes/toolchain/build.yml b/examples/recipes/toolchain/build.yml index ab8e6de..d612261 100644 --- a/examples/recipes/toolchain/build.yml +++ b/examples/recipes/toolchain/build.yml @@ -8,7 +8,7 @@ tasks: runtime_depends: - recipe: 'gcc' task: 'install' - - recipe: 'libgcc' + - recipe: 'gcc/libgcc' task: 'install' depends: @@ -19,7 +19,7 @@ tasks: runtime_depends: - recipe: 'glibc' task: 'install' - - recipe: 'gcc-libs' + - recipe: 'gcc/libs' task: 'install' build: |