diff options
Diffstat (limited to 'examples/recipes')
-rw-r--r-- | examples/recipes/bar/build.yml (renamed from examples/recipes/bar.yml) | 0 | ||||
-rw-r--r-- | examples/recipes/binutils/build.yml (renamed from examples/recipes/binutils@2.37.yml) | 24 | ||||
-rw-r--r-- | examples/recipes/busybox/build.yml (renamed from examples/recipes/busybox@1.34.0.yml) | 30 | ||||
-rw-r--r-- | examples/recipes/e2fsprogs/build.yml (renamed from examples/recipes/e2fsprogs@1.46.4.yml) | 24 | ||||
-rw-r--r-- | examples/recipes/foo/build.yml (renamed from examples/recipes/foo.yml) | 0 | ||||
-rw-r--r-- | examples/recipes/gcc/build.libgcc-initial.yml (renamed from examples/recipes/libgcc-initial@11.2.0.yml) | 16 | ||||
-rw-r--r-- | examples/recipes/gcc/build.libgcc.yml (renamed from examples/recipes/libgcc@11.2.0.yml) | 10 | ||||
-rw-r--r-- | examples/recipes/gcc/build.libs.yml (renamed from examples/recipes/gcc-libs@11.2.0.yml) | 12 | ||||
-rw-r--r-- | examples/recipes/gcc/build.yml (renamed from examples/recipes/gcc@11.2.0.yml) | 28 | ||||
-rw-r--r-- | examples/recipes/glibc/build.yml (renamed from examples/recipes/glibc@2.34.yml) | 38 | ||||
-rw-r--r-- | examples/recipes/gmp/build.recipe | 67 | ||||
-rw-r--r-- | examples/recipes/gmp/build.yml (renamed from examples/recipes/gmp@6.2.1.yml) | 24 | ||||
-rw-r--r-- | examples/recipes/image/build.yml (renamed from examples/recipes/rootfs.yml) | 28 | ||||
-rw-r--r-- | examples/recipes/linux/build.uapi-headers.yml (renamed from examples/recipes/linux-uapi-headers@5.10.66.yml) | 12 | ||||
-rw-r--r-- | examples/recipes/linux/build.yml (renamed from examples/recipes/linux@5.10.66.yml) | 24 | ||||
-rw-r--r-- | examples/recipes/ls/build.yml (renamed from examples/recipes/ls.yml) | 0 | ||||
-rw-r--r-- | examples/recipes/make_ext4fs/build.yml (renamed from examples/recipes/make_ext4fs@2020-01-05.yml) | 12 | ||||
-rw-r--r-- | examples/recipes/mpc/build.yml (renamed from examples/recipes/mpc@1.2.1.yml) | 24 | ||||
-rw-r--r-- | examples/recipes/mpfr/build.yml (renamed from examples/recipes/mpfr@4.1.0.yml) | 24 | ||||
-rw-r--r-- | examples/recipes/toolchain/build.yml (renamed from examples/recipes/toolchain.yml) | 4 | ||||
-rw-r--r-- | examples/recipes/zlib/build.yml (renamed from examples/recipes/zlib@1.2.11.yml) | 24 |
21 files changed, 253 insertions, 172 deletions
diff --git a/examples/recipes/bar.yml b/examples/recipes/bar/build.yml index f25322e..f25322e 100644 --- a/examples/recipes/bar.yml +++ b/examples/recipes/bar/build.yml diff --git a/examples/recipes/binutils@2.37.yml b/examples/recipes/binutils/build.yml index b3afa92..dd82d2e 100644 --- a/examples/recipes/binutils@2.37.yml +++ b/examples/recipes/binutils/build.yml @@ -1,16 +1,18 @@ +meta: + version: '2.41' tasks: unpack: fetch: - - name: '{{pn}}-{{pv}}.tar.xz' - sha256: '820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c' + - name: '{{name}}-{{version}}.tar.xz' + sha256: 'ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450' run: | - tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz configure: args: host: 'platform' target: 'platform' - inherit: + parent: task: 'unpack' build_depends: - recipe: 'toolchain' @@ -19,9 +21,9 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - mkdir {{pn}}-build - cd {{pn}}-build - ../{{pn}}-{{pv}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --target={{target.gnu_triplet}} \ @@ -42,10 +44,10 @@ tasks: args: host: 'platform' target: 'platform' - inherit: + parent: task: 'configure' run: | - cd {{pn}}-build + cd {{name}}-build make find -name config.log -delete @@ -53,7 +55,7 @@ tasks: args: host: 'platform' target: 'platform' - inherit: + parent: task: 'compile' output: default: @@ -61,5 +63,5 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - cd {{pn}}-build + cd {{name}}-build make DESTDIR={{destdir}} install diff --git a/examples/recipes/busybox@1.34.0.yml b/examples/recipes/busybox/build.yml index bb62dc6..fa87bc3 100644 --- a/examples/recipes/busybox@1.34.0.yml +++ b/examples/recipes/busybox/build.yml @@ -1,27 +1,29 @@ +meta: + version: '1.36.1' tasks: unpack: fetch: - - name: '{{pn}}-{{pv}}.tar.bz2' - sha256: 'ec8d1615edb045b83b81966604759c4d4ac921434ab4011da604f629c06074ce' + - name: '{{name}}-{{version}}.tar.bz2' + sha256: 'b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314' run: | - tar xf {{dldir}}/{{pn}}-{{pv}}.tar.bz2 + tar xf {{dldir}}/{{name}}-{{version}}.tar.bz2 configure: - inherit: + parent: task: 'unpack' run: | - mkdir {{pn}}-build - cd {{pn}}-build + mkdir {{name}}-build + cd {{name}}-build make \ - -f ../{{pn}}-{{pv}}/Makefile \ - KBUILD_SRC=../{{pn}}-{{pv}} \ + -f ../{{name}}-{{version}}/Makefile \ + KBUILD_SRC=../{{name}}-{{version}} \ defconfig compile: args: host: 'platform' - inherit: + parent: task: 'configure' build_depends: - recipe: 'toolchain' @@ -30,21 +32,21 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - cd {{pn}}-build + cd {{name}}-build make \ ARCH={{host.karch}} \ CROSS_COMPILE={{cross_compile}} \ EXTRA_CFLAGS='-DBB_EXTRA_VERSION=""' \ - {{pn}} busybox.links + {{name}} busybox.links sed -i \ -e 's@^/usr@@' \ -e 's@^/sbin@/bin@' \ - {{pn}}.links + {{name}}.links install: args: host: 'platform' - inherit: + parent: task: 'compile' output: default: @@ -52,7 +54,7 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - cd {{pn}}-build + cd {{name}}-build make \ ARCH={{host.karch}} \ CROSS_COMPILE={{cross_compile}} \ diff --git a/examples/recipes/e2fsprogs@1.46.4.yml b/examples/recipes/e2fsprogs/build.yml index 6f308fa..508d1d4 100644 --- a/examples/recipes/e2fsprogs@1.46.4.yml +++ b/examples/recipes/e2fsprogs/build.yml @@ -1,15 +1,17 @@ +meta: + version: '1.47.0' tasks: unpack: fetch: - - name: '{{pn}}-{{pv}}.tar.xz' - sha256: 'b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713' + - name: '{{name}}-{{version}}.tar.xz' + sha256: '144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db' run: | - tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz configure: args: host: 'platform' - inherit: + parent: task: 'unpack' build_depends: - recipe: 'toolchain' @@ -18,9 +20,9 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - mkdir {{pn}}-build - cd {{pn}}-build - ../{{pn}}-{{pv}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --prefix={{host.prefix}} @@ -29,17 +31,17 @@ tasks: compile: args: host: 'platform' - inherit: + parent: task: 'configure' run: | - cd {{pn}}-build + cd {{name}}-build make find -name config.log -delete install: args: host: 'platform' - inherit: + parent: task: 'compile' output: default: @@ -47,6 +49,6 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - cd {{pn}}-build + cd {{name}}-build make DESTDIR={{destdir}} install diff --git a/examples/recipes/foo.yml b/examples/recipes/foo/build.yml index 2982795..2982795 100644 --- a/examples/recipes/foo.yml +++ b/examples/recipes/foo/build.yml diff --git a/examples/recipes/libgcc-initial@11.2.0.yml b/examples/recipes/gcc/build.libgcc-initial.yml index 43f6f45..ed230ba 100644 --- a/examples/recipes/libgcc-initial@11.2.0.yml +++ b/examples/recipes/gcc/build.libgcc-initial.yml @@ -1,18 +1,16 @@ -meta: - name: 'gcc' tasks: configure: args: host: 'platform' target: 'platform' - inherit: + parent: recipe: 'gcc' task: 'compile' depends: - recipe: 'gcc' task: 'header-stubs' run: | - cd {{pn}}-build + cd {{name}}-build make configure-target-libgcc # A hack borrowed from OpenEmbedded: @@ -30,22 +28,22 @@ tasks: args: host: 'platform' target: 'platform' - inherit: + parent: task: 'configure' run: | - cd {{pn}}-build + cd {{name}}-build make all-target-libgcc install: args: host: 'platform' target: 'platform' - inherit: + parent: task: 'compile' output: default: {} run: | - cd {{pn}}-build + cd {{name}}-build make DESTDIR={{destdir}} install-target-libgcc - ln -s libgcc.a {{destdir}}{{host.prefix}}/lib/gcc/{{target.gnu_triplet}}/"$(cat ../{{pn}}-{{pv}}/gcc/BASE-VER)"/libgcc_eh.a + ln -s libgcc.a {{destdir}}{{host.prefix}}/lib/gcc/{{target.gnu_triplet}}/"$(cat ../{{name}}-{{version}}/gcc/BASE-VER)"/libgcc_eh.a diff --git a/examples/recipes/libgcc@11.2.0.yml b/examples/recipes/gcc/build.libgcc.yml index 96a2ce8..67e21f7 100644 --- a/examples/recipes/libgcc@11.2.0.yml +++ b/examples/recipes/gcc/build.libgcc.yml @@ -1,11 +1,9 @@ -meta: - name: 'gcc' tasks: compile: args: host: 'platform' target: 'platform' - inherit: + parent: recipe: 'gcc' task: 'compile' depends: @@ -14,19 +12,19 @@ tasks: args: host: 'target' run: | - cd {{pn}}-build + cd {{name}}-build make all-target-libgcc install: args: host: 'platform' target: 'platform' - inherit: + parent: task: 'compile' output: default: {} run: | - cd {{pn}}-build + cd {{name}}-build make DESTDIR={{destdir}} install-target-libgcc rm {{destdir}}{{host_to_target.sysroot}}{{target.prefix}}/lib/libgcc_s.so* rmdir -p --ignore-fail-on-non-empty {{destdir}}{{host_to_target.sysroot}}{{target.prefix}}/lib diff --git a/examples/recipes/gcc-libs@11.2.0.yml b/examples/recipes/gcc/build.libs.yml index 5320d29..856fd1c 100644 --- a/examples/recipes/gcc-libs@11.2.0.yml +++ b/examples/recipes/gcc/build.libs.yml @@ -1,29 +1,27 @@ -meta: - name: 'gcc' tasks: compile: args: host: 'platform' - inherit: - recipe: 'libgcc' + parent: + recipe: 'gcc/libgcc' task: 'compile' args: host: 'build' target: 'host' run: | - cd {{pn}}-build + cd {{name}}-build make all-target-libatomic all-target-libgomp all-target-libquadmath all-target-libstdc++-v3 install: args: host: 'platform' - inherit: + parent: task: 'compile' output: default: path: 'sysroot' run: | - cd {{pn}}-build + cd {{name}}-build make DESTDIR={{destdir}}/install install-target-libgcc install-target-libatomic install-target-libgomp install-target-libquadmath install-target-libstdc++-v3 rm -r {{destdir}}/install{{build.prefix}}/lib/gcc mv -T {{destdir}}/install/{{build_to_host.sysroot}} {{destdir}}/sysroot diff --git a/examples/recipes/gcc@11.2.0.yml b/examples/recipes/gcc/build.yml index 41a2bf6..3352b2d 100644 --- a/examples/recipes/gcc@11.2.0.yml +++ b/examples/recipes/gcc/build.yml @@ -1,12 +1,14 @@ +meta: + version: '13.2.0' tasks: unpack: fetch: - - name: '{{pn}}-{{pv}}.tar.xz' - sha256: 'd08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b' + - name: '{{name}}-{{version}}.tar.xz' + sha256: 'e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da' run: | - tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz - sed -i -e 's@^MULTILIB_OSDIRNAMES@# &@' {{pn}}-{{pv}}/gcc/config/*/t-* + sed -i -e 's@^MULTILIB_OSDIRNAMES@# &@' {{name}}-{{version}}/gcc/config/*/t-* header-stubs: args: @@ -24,7 +26,7 @@ tasks: args: host: 'platform' target: 'platform' - inherit: + parent: task: 'unpack' build_depends: - recipe: 'toolchain' @@ -45,9 +47,9 @@ tasks: run: | export CXX_FOR_TARGET="$CXX_FOR_TARGET -nostdinc++" - mkdir {{pn}}-build - cd {{pn}}-build - ../{{pn}}-{{pv}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --target={{target.gnu_triplet}} \ @@ -58,7 +60,7 @@ tasks: --with-build-sysroot={{sysroot}} \ --with-native-system-header-dir={{target.prefix}}/include \ --with-toolexeclibdir={{host_to_target.sysroot}}{{target.prefix}}/lib \ - --with-gxx-include-dir={{host_to_target.sysroot}}{{target.prefix}}/include/c++/"$(cat ../{{pn}}-{{pv}}/gcc/BASE-VER)" \ + --with-gxx-include-dir={{host_to_target.sysroot}}{{target.prefix}}/include/c++/"$(cat ../{{name}}-{{version}}/gcc/BASE-VER)" \ --with-gnu-ld \ --enable-shared \ --enable-languages=c,c++ \ @@ -93,13 +95,13 @@ tasks: args: host: 'platform' target: 'platform' - inherit: + parent: task: 'configure' depends: - task: 'header-stubs' noinherit: true run: | - cd {{pn}}-build + cd {{name}}-build make all-host find -name config.log -delete @@ -107,7 +109,7 @@ tasks: args: host: 'platform' target: 'platform' - inherit: + parent: task: 'compile' output: default: @@ -119,6 +121,6 @@ tasks: - recipe: 'zlib' task: 'install' run: | - cd {{pn}}-build + cd {{name}}-build make DESTDIR={{destdir}} install-host diff --git a/examples/recipes/glibc@2.34.yml b/examples/recipes/glibc/build.yml index 98016cd..f1bf890 100644 --- a/examples/recipes/glibc@2.34.yml +++ b/examples/recipes/glibc/build.yml @@ -1,43 +1,43 @@ +meta: + version: '2.38-25-gf6445dc94da1' tasks: unpack: fetch: - - name: '{{pn}}-{{pv}}.tar.xz' - sha256: '44d26a1fe20b8853a48f470ead01e4279e869ac149b195dda4e44a195d981ab2' + - name: '{{name}}-{{version}}.tar.xz' + sha256: '92594ade540761f70d57de4f3a150128e7b7f7ed653a59d1acc23468ab70fae9' run: | - tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz configure: args: host: 'platform' - inherit: + parent: task: 'unpack' 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" - mkdir {{pn}}-build - cd {{pn}}-build - ../{{pn}}-{{pv}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --prefix={{host.prefix}} \ --includedir={{host.prefix}}/include \ --libdir={{host.prefix}}/lib \ --libexecdir={{host.prefix}}/lib \ - --enable-add-ons \ - --enable-obsolete-rpc \ - --enable-kernel=2.6.32 \ --enable-bind-now \ + --enable-fortify-source \ + --enable-kernel=4.4 \ + --disable-nscd \ --disable-profile \ - --enable-stackguard-randomization \ - --enable-lock-elision \ --disable-werror echo slibdir={{host.prefix}}/lib >> configparms @@ -47,22 +47,22 @@ tasks: compile: args: host: 'platform' - inherit: + parent: task: 'configure' run: | - cd {{pn}}-build + cd {{name}}-build make install: args: host: 'platform' - inherit: + parent: task: 'compile' output: default: runtime_depends: - - recipe: 'linux-uapi-headers' + - recipe: 'linux/uapi-headers' task: 'install' run: | - cd {{pn}}-build + cd {{name}}-build make install_root={{destdir}} install diff --git a/examples/recipes/gmp/build.recipe b/examples/recipes/gmp/build.recipe new file mode 100644 index 0000000..19a25f6 --- /dev/null +++ b/examples/recipes/gmp/build.recipe @@ -0,0 +1,67 @@ +// External definitions used by this recipe: +// +// workdir: String +// name: String +// destdir: String +// build: Platform +// build_depend: (task: TaskID) -> TaskDep +// host_depend: (task: TaskID) -> TaskDep + +let version = "6.3.0"; +let sourcedir = "{{workdir}}/{{name}}-{{version}}"; +let builddir = "{{workdir}}/{{name}}-build"; + +fetch source { + url: ["https://invalid/{{name}}-{{version}}.tar.xz"], + // TODO: Move to lockfile + sha256: "a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898", +} + +task unpack() { + task.depends = [source]; + + ``` + tar xf {{source.path}} + ``` +} + +task configure(host: Platform) { + task.parent = unpack(); + task.depends = [ + build_depend(toolchain::build_depends), + host_depend(toolchain::depends), + ]; + + ``` + mkdir {{builddir}} + cd {{builddir}} + {{sourcedir}}/configure \ + --build={{build.gnu_triplet}} \ + --host={{host.gnu_triplet}} \ + --prefix={{host.prefix}} + ``` +} + +task compile(host: Platform) { + task.parent = configure(host); + + ``` + cd {{builddir}} + make + ``` +} + +task install(host: Platform) { + task.parent = compile(host); + + task.output["default"] = { + runtime_depends: [host_depend(toolchain::depends)], + }; + + ``` + cd {{builddir}} + make DESTDIR={{destdir}} install + rm {{destdir}}{{host.prefix}}/lib/*.a + rm {{destdir}}{{host.prefix}}/lib/*.la + ``` +} diff --git a/examples/recipes/gmp@6.2.1.yml b/examples/recipes/gmp/build.yml index 0226fd9..322f0f0 100644 --- a/examples/recipes/gmp@6.2.1.yml +++ b/examples/recipes/gmp/build.yml @@ -1,15 +1,17 @@ +meta: + version: '6.3.0' tasks: unpack: fetch: - - name: '{{pn}}-{{pv}}.tar.lz' - sha256: '2c7f4f0d370801b2849c48c9ef3f59553b5f1d3791d070cffb04599f9fc67b41' + - name: '{{name}}-{{version}}.tar.xz' + sha256: 'a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898' run: | - tar xf {{dldir}}/{{pn}}-{{pv}}.tar.lz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz configure: args: host: 'platform' - inherit: + parent: task: 'unpack' build_depends: - recipe: 'toolchain' @@ -18,9 +20,9 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - mkdir {{pn}}-build - cd {{pn}}-build - ../{{pn}}-{{pv}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --prefix={{host.prefix}} @@ -29,16 +31,16 @@ tasks: compile: args: host: 'platform' - inherit: + parent: task: 'configure' run: | - cd {{pn}}-build + cd {{name}}-build make install: args: host: 'platform' - inherit: + parent: task: 'compile' output: default: @@ -46,7 +48,7 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - cd {{pn}}-build + cd {{name}}-build make DESTDIR={{destdir}} install rm {{destdir}}{{host.prefix}}/lib/*.a rm {{destdir}}{{host.prefix}}/lib/*.la diff --git a/examples/recipes/rootfs.yml b/examples/recipes/image/build.yml index 03b52d6..a42899f 100644 --- a/examples/recipes/rootfs.yml +++ b/examples/recipes/image/build.yml @@ -1,5 +1,5 @@ tasks: - install: + rootfs: args: host: 'platform' depends: @@ -15,12 +15,13 @@ tasks: mkdir -p \ {{destdir}}/dev \ {{destdir}}/proc \ - {{destdir}}/sys \ {{destdir}}/root \ {{destdir}}/run \ - {{destdir}}/var \ + {{destdir}}/sys \ + {{destdir}}/tmp \ {{destdir}}/usr/bin \ - {{destdir}}/usr/lib + {{destdir}}/usr/lib \ + {{destdir}}/var ln -s bin {{destdir}}/usr/sbin ln -s usr/bin {{destdir}}/bin @@ -31,7 +32,7 @@ tasks: rsync -aHAXK {{sysroot}}/ {{destdir}} - image-ext4: + ext4: args: host: 'platform' build_depends: @@ -40,17 +41,20 @@ tasks: - recipe: 'make_ext4fs' task: 'install' depends: - - task: 'install' + - task: 'rootfs' output: default: {} run: | - IMAGE={{destdir}}/{{pn}}.ext4 - UUID="$( - python3 \ - -c 'import sys; import uuid; print(uuid.UUID(hex=sys.argv[1][:32], version=4))' \ - "$INPUT_HASH" - )" + IMAGE={{destdir}}/{{name}}.ext4 mkdir {{destdir}} make_ext4fs -l 2G -T "$SOURCE_DATE_EPOCH" -L root "$IMAGE" {{sysroot}} + E2FSPROGS_FAKE_TIME="$SOURCE_DATE_EPOCH" tune2fs -U '00000000-0000-4000-8000-000000000000' "$IMAGE" + + HASH=$(sha256sum "$IMAGE") + UUID=$( + python3 \ + -c 'import sys; import uuid; print(uuid.UUID(hex=sys.argv[1][:32], version=4))' \ + "$HASH" + ) E2FSPROGS_FAKE_TIME="$SOURCE_DATE_EPOCH" tune2fs -U "$UUID" "$IMAGE" diff --git a/examples/recipes/linux-uapi-headers@5.10.66.yml b/examples/recipes/linux/build.uapi-headers.yml index 27d7fc2..a302aa9 100644 --- a/examples/recipes/linux-uapi-headers@5.10.66.yml +++ b/examples/recipes/linux/build.uapi-headers.yml @@ -1,21 +1,19 @@ -meta: - name: 'linux' tasks: unpack: fetch: - - name: '{{pn}}-{{pv}}.tar.xz' - sha256: '5dfa06bbbbd164b9ea669ec637b1e6d05fb5fea8ef3aeb6729f2cbcd0dfcc8a7' + - name: '{{name}}-{{version}}.tar.xz' + sha256: '8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95' run: | - tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz install: args: host: 'platform' - inherit: + parent: task: 'unpack' output: default: {} run: | - cd {{pn}}-{{pv}} + cd {{name}}-{{version}} make INSTALL_HDR_PATH={{destdir}}{{host.prefix}} ARCH={{host.karch}} headers_install diff --git a/examples/recipes/linux@5.10.66.yml b/examples/recipes/linux/build.yml index 22b17c2..3f84291 100644 --- a/examples/recipes/linux@5.10.66.yml +++ b/examples/recipes/linux/build.yml @@ -1,24 +1,26 @@ +meta: + version: '6.5.5' tasks: unpack: fetch: - - name: '{{pn}}-{{pv}}.tar.xz' - sha256: '5dfa06bbbbd164b9ea669ec637b1e6d05fb5fea8ef3aeb6729f2cbcd0dfcc8a7' + - name: '{{name}}-{{version}}.tar.xz' + sha256: '8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95' run: | - tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz configure: args: host: 'platform' - inherit: + parent: task: 'unpack' build_depends: - recipe: 'gcc' task: 'install' run: | - mkdir {{pn}}-build - cd {{pn}}-build + mkdir {{name}}-build + cd {{name}}-build make \ - -f ../{{pn}}-{{pv}}/Makefile \ + -f ../{{name}}-{{version}}/Makefile \ ARCH={{host.karch}} \ CROSS_COMPILE={{cross_compile}} \ defconfig @@ -26,12 +28,12 @@ tasks: compile: args: host: 'platform' - inherit: + parent: task: 'configure' run: | export KBUILD_BUILD_TIMESTAMP="@${SOURCE_DATE_EPOCH}" - cd {{pn}}-build + cd {{name}}-build make \ ARCH={{host.karch}} \ CROSS_COMPILE={{cross_compile}} \ @@ -40,7 +42,7 @@ tasks: install: args: host: 'platform' - inherit: + parent: task: 'compile' output: boot: @@ -48,7 +50,7 @@ tasks: modules: path: 'modules' run: | - cd {{pn}}-build + cd {{name}}-build mkdir -p {{destdir}}/boot make \ ARCH={{host.karch}} \ diff --git a/examples/recipes/ls.yml b/examples/recipes/ls/build.yml index 633336d..633336d 100644 --- a/examples/recipes/ls.yml +++ b/examples/recipes/ls/build.yml diff --git a/examples/recipes/make_ext4fs@2020-01-05.yml b/examples/recipes/make_ext4fs/build.yml index 53fed98..183389a 100644 --- a/examples/recipes/make_ext4fs@2020-01-05.yml +++ b/examples/recipes/make_ext4fs/build.yml @@ -3,10 +3,10 @@ meta: tasks: unpack: fetch: - - name: '{{pn}}-{{pv}}.tar.gz' + - name: '{{name}}-{{version}}.tar.gz' sha256: 'bfe984cc757c676639090a5b34bdfc359cdef9b723de77efbce590872dce4132' run: | - tar xf {{dldir}}/{{pn}}-{{pv}}.tar.gz + tar xf {{dldir}}/{{name}}-{{version}}.tar.gz compile: args: @@ -19,16 +19,16 @@ tasks: task: 'depends' - recipe: 'zlib' task: 'install' - inherit: + parent: task: 'unpack' run: | - cd {{pn}}-{{pv}} + cd {{name}}-{{version}} make install: args: host: 'platform' - inherit: + parent: task: 'compile' output: default: @@ -38,7 +38,7 @@ tasks: - recipe: 'zlib' task: 'install' run: | - cd {{pn}}-{{pv}} + cd {{name}}-{{version}} install -d {{destdir}}{{host.prefix}}/bin install -m755 make_ext4fs {{destdir}}{{host.prefix}}/bin/ diff --git a/examples/recipes/mpc@1.2.1.yml b/examples/recipes/mpc/build.yml index f5afb74..e415c60 100644 --- a/examples/recipes/mpc@1.2.1.yml +++ b/examples/recipes/mpc/build.yml @@ -1,15 +1,17 @@ +meta: + version: '1.3.1' tasks: unpack: fetch: - - name: '{{pn}}-{{pv}}.tar.gz' - sha256: '17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459' + - name: '{{name}}-{{version}}.tar.gz' + sha256: 'ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8' run: | - tar xf {{dldir}}/{{pn}}-{{pv}}.tar.gz + tar xf {{dldir}}/{{name}}-{{version}}.tar.gz configure: args: host: 'platform' - inherit: + parent: task: 'unpack' build_depends: - recipe: 'toolchain' @@ -20,9 +22,9 @@ tasks: - recipe: 'mpfr' task: 'install' run: | - mkdir {{pn}}-build - cd {{pn}}-build - ../{{pn}}-{{pv}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --prefix={{host.prefix}} @@ -31,16 +33,16 @@ tasks: compile: args: host: 'platform' - inherit: + parent: task: 'configure' run: | - cd {{pn}}-build + cd {{name}}-build make install: args: host: 'platform' - inherit: + parent: task: 'compile' output: default: @@ -50,7 +52,7 @@ tasks: - recipe: 'mpfr' task: 'install' run: | - cd {{pn}}-build + cd {{name}}-build make DESTDIR={{destdir}} install rm {{destdir}}{{host.prefix}}/lib/*.a rm {{destdir}}{{host.prefix}}/lib/*.la diff --git a/examples/recipes/mpfr@4.1.0.yml b/examples/recipes/mpfr/build.yml index de9e536..619bec7 100644 --- a/examples/recipes/mpfr@4.1.0.yml +++ b/examples/recipes/mpfr/build.yml @@ -1,15 +1,17 @@ +meta: + version: '4.2.1' tasks: unpack: fetch: - - name: '{{pn}}-{{pv}}.tar.xz' - sha256: '0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f' + - name: '{{name}}-{{version}}.tar.xz' + sha256: '277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2' run: | - tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz configure: args: host: 'platform' - inherit: + parent: task: 'unpack' build_depends: - recipe: 'toolchain' @@ -20,9 +22,9 @@ tasks: - recipe: 'gmp' task: 'install' run: | - mkdir {{pn}}-build - cd {{pn}}-build - ../{{pn}}-{{pv}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --prefix={{host.prefix}} @@ -31,16 +33,16 @@ tasks: compile: args: host: 'platform' - inherit: + parent: task: 'configure' run: | - cd {{pn}}-build + cd {{name}}-build make install: args: host: 'platform' - inherit: + parent: task: 'compile' output: default: @@ -50,7 +52,7 @@ tasks: - recipe: 'gmp' task: 'install' run: | - cd {{pn}}-build + cd {{name}}-build make DESTDIR={{destdir}} install rm {{destdir}}{{host.prefix}}/lib/*.a rm {{destdir}}{{host.prefix}}/lib/*.la diff --git a/examples/recipes/toolchain.yml b/examples/recipes/toolchain/build.yml index ab8e6de..d612261 100644 --- a/examples/recipes/toolchain.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: diff --git a/examples/recipes/zlib@1.2.11.yml b/examples/recipes/zlib/build.yml index 099b80c..3e72844 100644 --- a/examples/recipes/zlib@1.2.11.yml +++ b/examples/recipes/zlib/build.yml @@ -1,15 +1,17 @@ +meta: + version: '1.3' tasks: unpack: fetch: - - name: '{{pn}}-{{pv}}.tar.gz' - sha256: 'c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1' + - name: '{{name}}-{{version}}.tar.gz' + sha256: 'ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e' run: | - tar xf {{dldir}}/{{pn}}-{{pv}}.tar.gz + tar xf {{dldir}}/{{name}}-{{version}}.tar.gz configure: args: host: 'platform' - inherit: + parent: task: 'unpack' build_depends: - recipe: 'toolchain' @@ -18,25 +20,25 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - mkdir {{pn}}-build - cd {{pn}}-build - ../{{pn}}-{{pv}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --prefix={{host.prefix}} find -name configure.log -delete compile: args: host: 'platform' - inherit: + parent: task: 'configure' run: | - cd {{pn}}-build + cd {{name}}-build make install: args: host: 'platform' - inherit: + parent: task: 'compile' output: default: @@ -44,7 +46,7 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - cd {{pn}}-build + cd {{name}}-build make DESTDIR={{destdir}} install rm {{destdir}}{{host.prefix}}/lib/*.a |