From a488b37a22b72bdcd7b58102387fea98b82918e1 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 6 Apr 2024 00:19:09 +0200 Subject: examples: use {{name}} instead of {{basename}} {{name}} is usually the better choice for references in the scripts, as it can be overridden. --- examples/recipes/binutils/build.yml | 14 +++++++------- examples/recipes/busybox/build.yml | 20 ++++++++++---------- examples/recipes/e2fsprogs/build.yml | 14 +++++++------- examples/recipes/gcc/build.libgcc-initial.yml | 8 ++++---- examples/recipes/gcc/build.libgcc.yml | 4 ++-- examples/recipes/gcc/build.libs.yml | 4 ++-- examples/recipes/gcc/build.yml | 18 +++++++++--------- examples/recipes/glibc/build.yml | 14 +++++++------- examples/recipes/gmp/build.yml | 14 +++++++------- examples/recipes/image/build.yml | 2 +- examples/recipes/linux/build.uapi-headers.yml | 6 +++--- examples/recipes/linux/build.yml | 14 +++++++------- examples/recipes/make_ext4fs/build.yml | 8 ++++---- examples/recipes/mpc/build.yml | 14 +++++++------- examples/recipes/mpfr/build.yml | 14 +++++++------- examples/recipes/zlib/build.yml | 14 +++++++------- 16 files changed, 91 insertions(+), 91 deletions(-) (limited to 'examples') diff --git a/examples/recipes/binutils/build.yml b/examples/recipes/binutils/build.yml index fb69750..a82723f 100644 --- a/examples/recipes/binutils/build.yml +++ b/examples/recipes/binutils/build.yml @@ -3,10 +3,10 @@ meta: tasks: unpack: fetch: - - name: '{{basename}}-{{version}}.tar.xz' + - name: '{{name}}-{{version}}.tar.xz' sha256: 'ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450' run: | - tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz configure: args: @@ -21,9 +21,9 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - mkdir {{basename}}-build - cd {{basename}}-build - ../{{basename}}-{{version}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --target={{target.gnu_triplet}} \ @@ -47,7 +47,7 @@ tasks: inherit: task: 'configure' run: | - cd {{basename}}-build + cd {{name}}-build make find -name config.log -delete @@ -63,5 +63,5 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - cd {{basename}}-build + cd {{name}}-build make DESTDIR={{destdir}} install diff --git a/examples/recipes/busybox/build.yml b/examples/recipes/busybox/build.yml index 273ceb5..e8019bb 100644 --- a/examples/recipes/busybox/build.yml +++ b/examples/recipes/busybox/build.yml @@ -3,21 +3,21 @@ meta: tasks: unpack: fetch: - - name: '{{basename}}-{{version}}.tar.bz2' + - name: '{{name}}-{{version}}.tar.bz2' sha256: 'b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314' run: | - tar xf {{dldir}}/{{basename}}-{{version}}.tar.bz2 + tar xf {{dldir}}/{{name}}-{{version}}.tar.bz2 configure: inherit: task: 'unpack' run: | - mkdir {{basename}}-build - cd {{basename}}-build + mkdir {{name}}-build + cd {{name}}-build make \ - -f ../{{basename}}-{{version}}/Makefile \ - KBUILD_SRC=../{{basename}}-{{version}} \ + -f ../{{name}}-{{version}}/Makefile \ + KBUILD_SRC=../{{name}}-{{version}} \ defconfig compile: @@ -32,16 +32,16 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - cd {{basename}}-build + cd {{name}}-build make \ ARCH={{host.karch}} \ CROSS_COMPILE={{cross_compile}} \ EXTRA_CFLAGS='-DBB_EXTRA_VERSION=""' \ - {{basename}} busybox.links + {{name}} busybox.links sed -i \ -e 's@^/usr@@' \ -e 's@^/sbin@/bin@' \ - {{basename}}.links + {{name}}.links install: args: @@ -54,7 +54,7 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - cd {{basename}}-build + cd {{name}}-build make \ ARCH={{host.karch}} \ CROSS_COMPILE={{cross_compile}} \ diff --git a/examples/recipes/e2fsprogs/build.yml b/examples/recipes/e2fsprogs/build.yml index 5c916dc..e1fc0e0 100644 --- a/examples/recipes/e2fsprogs/build.yml +++ b/examples/recipes/e2fsprogs/build.yml @@ -3,10 +3,10 @@ meta: tasks: unpack: fetch: - - name: '{{basename}}-{{version}}.tar.xz' + - name: '{{name}}-{{version}}.tar.xz' sha256: '144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db' run: | - tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz configure: args: @@ -20,9 +20,9 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - mkdir {{basename}}-build - cd {{basename}}-build - ../{{basename}}-{{version}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --prefix={{host.prefix}} @@ -34,7 +34,7 @@ tasks: inherit: task: 'configure' run: | - cd {{basename}}-build + cd {{name}}-build make find -name config.log -delete @@ -49,6 +49,6 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - cd {{basename}}-build + cd {{name}}-build make DESTDIR={{destdir}} install diff --git a/examples/recipes/gcc/build.libgcc-initial.yml b/examples/recipes/gcc/build.libgcc-initial.yml index ed38266..38414aa 100644 --- a/examples/recipes/gcc/build.libgcc-initial.yml +++ b/examples/recipes/gcc/build.libgcc-initial.yml @@ -10,7 +10,7 @@ tasks: - recipe: 'gcc' task: 'header-stubs' run: | - cd {{basename}}-build + cd {{name}}-build make configure-target-libgcc # A hack borrowed from OpenEmbedded: @@ -31,7 +31,7 @@ tasks: inherit: task: 'configure' run: | - cd {{basename}}-build + cd {{name}}-build make all-target-libgcc install: @@ -43,7 +43,7 @@ tasks: output: default: {} run: | - cd {{basename}}-build + cd {{name}}-build make DESTDIR={{destdir}} install-target-libgcc - ln -s libgcc.a {{destdir}}{{host.prefix}}/lib/gcc/{{target.gnu_triplet}}/"$(cat ../{{basename}}-{{version}}/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/gcc/build.libgcc.yml b/examples/recipes/gcc/build.libgcc.yml index 0c8cfd6..ed7fa66 100644 --- a/examples/recipes/gcc/build.libgcc.yml +++ b/examples/recipes/gcc/build.libgcc.yml @@ -12,7 +12,7 @@ tasks: args: host: 'target' run: | - cd {{basename}}-build + cd {{name}}-build make all-target-libgcc install: @@ -24,7 +24,7 @@ tasks: output: default: {} run: | - cd {{basename}}-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/build.libs.yml b/examples/recipes/gcc/build.libs.yml index e69d318..4a20ad1 100644 --- a/examples/recipes/gcc/build.libs.yml +++ b/examples/recipes/gcc/build.libs.yml @@ -9,7 +9,7 @@ tasks: host: 'build' target: 'host' run: | - cd {{basename}}-build + cd {{name}}-build make all-target-libatomic all-target-libgomp all-target-libquadmath all-target-libstdc++-v3 install: @@ -21,7 +21,7 @@ tasks: default: path: 'sysroot' run: | - cd {{basename}}-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/build.yml b/examples/recipes/gcc/build.yml index 4931052..cd4166e 100644 --- a/examples/recipes/gcc/build.yml +++ b/examples/recipes/gcc/build.yml @@ -3,12 +3,12 @@ meta: tasks: unpack: fetch: - - name: '{{basename}}-{{version}}.tar.xz' + - name: '{{name}}-{{version}}.tar.xz' sha256: 'e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da' run: | - tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz - sed -i -e 's@^MULTILIB_OSDIRNAMES@# &@' {{basename}}-{{version}}/gcc/config/*/t-* + sed -i -e 's@^MULTILIB_OSDIRNAMES@# &@' {{name}}-{{version}}/gcc/config/*/t-* header-stubs: args: @@ -47,9 +47,9 @@ tasks: run: | export CXX_FOR_TARGET="$CXX_FOR_TARGET -nostdinc++" - mkdir {{basename}}-build - cd {{basename}}-build - ../{{basename}}-{{version}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --target={{target.gnu_triplet}} \ @@ -60,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 ../{{basename}}-{{version}}/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++ \ @@ -101,7 +101,7 @@ tasks: - task: 'header-stubs' noinherit: true run: | - cd {{basename}}-build + cd {{name}}-build make all-host find -name config.log -delete @@ -121,6 +121,6 @@ tasks: - recipe: 'zlib' task: 'install' run: | - cd {{basename}}-build + cd {{name}}-build make DESTDIR={{destdir}} install-host diff --git a/examples/recipes/glibc/build.yml b/examples/recipes/glibc/build.yml index 16f2706..3538d90 100644 --- a/examples/recipes/glibc/build.yml +++ b/examples/recipes/glibc/build.yml @@ -3,10 +3,10 @@ meta: tasks: unpack: fetch: - - name: '{{basename}}-{{version}}.tar.xz' + - name: '{{name}}-{{version}}.tar.xz' sha256: '92594ade540761f70d57de4f3a150128e7b7f7ed653a59d1acc23468ab70fae9' run: | - tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz configure: args: @@ -24,9 +24,9 @@ tasks: run: | export BUILD_CC="$CC_FOR_BUILD" - mkdir {{basename}}-build - cd {{basename}}-build - ../{{basename}}-{{version}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --prefix={{host.prefix}} \ @@ -50,7 +50,7 @@ tasks: inherit: task: 'configure' run: | - cd {{basename}}-build + cd {{name}}-build make install: @@ -64,5 +64,5 @@ tasks: - recipe: 'linux/uapi-headers' task: 'install' run: | - cd {{basename}}-build + cd {{name}}-build make install_root={{destdir}} install diff --git a/examples/recipes/gmp/build.yml b/examples/recipes/gmp/build.yml index f2585c2..3a07f44 100644 --- a/examples/recipes/gmp/build.yml +++ b/examples/recipes/gmp/build.yml @@ -3,10 +3,10 @@ meta: tasks: unpack: fetch: - - name: '{{basename}}-{{version}}.tar.xz' + - name: '{{name}}-{{version}}.tar.xz' sha256: 'a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898' run: | - tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz configure: args: @@ -20,9 +20,9 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - mkdir {{basename}}-build - cd {{basename}}-build - ../{{basename}}-{{version}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --prefix={{host.prefix}} @@ -34,7 +34,7 @@ tasks: inherit: task: 'configure' run: | - cd {{basename}}-build + cd {{name}}-build make install: @@ -48,7 +48,7 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - cd {{basename}}-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/image/build.yml b/examples/recipes/image/build.yml index 0d5fac4..a42899f 100644 --- a/examples/recipes/image/build.yml +++ b/examples/recipes/image/build.yml @@ -45,7 +45,7 @@ tasks: output: default: {} run: | - IMAGE={{destdir}}/{{basename}}.ext4 + IMAGE={{destdir}}/{{name}}.ext4 mkdir {{destdir}} make_ext4fs -l 2G -T "$SOURCE_DATE_EPOCH" -L root "$IMAGE" {{sysroot}} diff --git a/examples/recipes/linux/build.uapi-headers.yml b/examples/recipes/linux/build.uapi-headers.yml index 0203472..ea398d3 100644 --- a/examples/recipes/linux/build.uapi-headers.yml +++ b/examples/recipes/linux/build.uapi-headers.yml @@ -1,10 +1,10 @@ tasks: unpack: fetch: - - name: '{{basename}}-{{version}}.tar.xz' + - name: '{{name}}-{{version}}.tar.xz' sha256: '8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95' run: | - tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz install: args: @@ -14,6 +14,6 @@ tasks: output: default: {} run: | - cd {{basename}}-{{version}} + cd {{name}}-{{version}} make INSTALL_HDR_PATH={{destdir}}{{host.prefix}} ARCH={{host.karch}} headers_install diff --git a/examples/recipes/linux/build.yml b/examples/recipes/linux/build.yml index 53a0bd7..ad32813 100644 --- a/examples/recipes/linux/build.yml +++ b/examples/recipes/linux/build.yml @@ -3,10 +3,10 @@ meta: tasks: unpack: fetch: - - name: '{{basename}}-{{version}}.tar.xz' + - name: '{{name}}-{{version}}.tar.xz' sha256: '8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95' run: | - tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz configure: args: @@ -17,10 +17,10 @@ tasks: - recipe: 'gcc' task: 'install' run: | - mkdir {{basename}}-build - cd {{basename}}-build + mkdir {{name}}-build + cd {{name}}-build make \ - -f ../{{basename}}-{{version}}/Makefile \ + -f ../{{name}}-{{version}}/Makefile \ ARCH={{host.karch}} \ CROSS_COMPILE={{cross_compile}} \ defconfig @@ -33,7 +33,7 @@ tasks: run: | export KBUILD_BUILD_TIMESTAMP="@${SOURCE_DATE_EPOCH}" - cd {{basename}}-build + cd {{name}}-build make \ ARCH={{host.karch}} \ CROSS_COMPILE={{cross_compile}} \ @@ -50,7 +50,7 @@ tasks: modules: path: 'modules' run: | - cd {{basename}}-build + cd {{name}}-build mkdir -p {{destdir}}/boot make \ ARCH={{host.karch}} \ diff --git a/examples/recipes/make_ext4fs/build.yml b/examples/recipes/make_ext4fs/build.yml index f77fde4..f50fa85 100644 --- a/examples/recipes/make_ext4fs/build.yml +++ b/examples/recipes/make_ext4fs/build.yml @@ -3,10 +3,10 @@ meta: tasks: unpack: fetch: - - name: '{{basename}}-{{version}}.tar.gz' + - name: '{{name}}-{{version}}.tar.gz' sha256: 'bfe984cc757c676639090a5b34bdfc359cdef9b723de77efbce590872dce4132' run: | - tar xf {{dldir}}/{{basename}}-{{version}}.tar.gz + tar xf {{dldir}}/{{name}}-{{version}}.tar.gz compile: args: @@ -22,7 +22,7 @@ tasks: inherit: task: 'unpack' run: | - cd {{basename}}-{{version}} + cd {{name}}-{{version}} make install: @@ -38,7 +38,7 @@ tasks: - recipe: 'zlib' task: 'install' run: | - cd {{basename}}-{{version}} + cd {{name}}-{{version}} install -d {{destdir}}{{host.prefix}}/bin install -m755 make_ext4fs {{destdir}}{{host.prefix}}/bin/ diff --git a/examples/recipes/mpc/build.yml b/examples/recipes/mpc/build.yml index 0d17661..816bed0 100644 --- a/examples/recipes/mpc/build.yml +++ b/examples/recipes/mpc/build.yml @@ -3,10 +3,10 @@ meta: tasks: unpack: fetch: - - name: '{{basename}}-{{version}}.tar.gz' + - name: '{{name}}-{{version}}.tar.gz' sha256: 'ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8' run: | - tar xf {{dldir}}/{{basename}}-{{version}}.tar.gz + tar xf {{dldir}}/{{name}}-{{version}}.tar.gz configure: args: @@ -22,9 +22,9 @@ tasks: - recipe: 'mpfr' task: 'install' run: | - mkdir {{basename}}-build - cd {{basename}}-build - ../{{basename}}-{{version}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --prefix={{host.prefix}} @@ -36,7 +36,7 @@ tasks: inherit: task: 'configure' run: | - cd {{basename}}-build + cd {{name}}-build make install: @@ -52,7 +52,7 @@ tasks: - recipe: 'mpfr' task: 'install' run: | - cd {{basename}}-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/build.yml b/examples/recipes/mpfr/build.yml index 2c87912..b77cf81 100644 --- a/examples/recipes/mpfr/build.yml +++ b/examples/recipes/mpfr/build.yml @@ -3,10 +3,10 @@ meta: tasks: unpack: fetch: - - name: '{{basename}}-{{version}}.tar.xz' + - name: '{{name}}-{{version}}.tar.xz' sha256: '277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2' run: | - tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz + tar xf {{dldir}}/{{name}}-{{version}}.tar.xz configure: args: @@ -22,9 +22,9 @@ tasks: - recipe: 'gmp' task: 'install' run: | - mkdir {{basename}}-build - cd {{basename}}-build - ../{{basename}}-{{version}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --build={{build.gnu_triplet}} \ --host={{host.gnu_triplet}} \ --prefix={{host.prefix}} @@ -36,7 +36,7 @@ tasks: inherit: task: 'configure' run: | - cd {{basename}}-build + cd {{name}}-build make install: @@ -52,7 +52,7 @@ tasks: - recipe: 'gmp' task: 'install' run: | - cd {{basename}}-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/zlib/build.yml b/examples/recipes/zlib/build.yml index 65c0d19..a9f09d7 100644 --- a/examples/recipes/zlib/build.yml +++ b/examples/recipes/zlib/build.yml @@ -3,10 +3,10 @@ meta: tasks: unpack: fetch: - - name: '{{basename}}-{{version}}.tar.gz' + - name: '{{name}}-{{version}}.tar.gz' sha256: 'ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e' run: | - tar xf {{dldir}}/{{basename}}-{{version}}.tar.gz + tar xf {{dldir}}/{{name}}-{{version}}.tar.gz configure: args: @@ -20,9 +20,9 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - mkdir {{basename}}-build - cd {{basename}}-build - ../{{basename}}-{{version}}/configure \ + mkdir {{name}}-build + cd {{name}}-build + ../{{name}}-{{version}}/configure \ --prefix={{host.prefix}} find -name configure.log -delete @@ -32,7 +32,7 @@ tasks: inherit: task: 'configure' run: | - cd {{basename}}-build + cd {{name}}-build make install: @@ -46,7 +46,7 @@ tasks: - recipe: 'toolchain' task: 'depends' run: | - cd {{basename}}-build + cd {{name}}-build make DESTDIR={{destdir}} install rm {{destdir}}{{host.prefix}}/lib/*.a -- cgit v1.2.3