examples: use {{pn}} and {{pv}} throughout recipes

10 files changed, 74 insertions, 55 deletions

diff --git a/examples/binutils.yml b/examples/binutils.yml
index b3d0265..78fd37b 100644
--- a/examples/binutils.yml
+++ b/examples/binutils.yml
@@ -1,10 +1,12 @@
+meta:
+  version: '2.37'
 tasks:
   unpack:
     fetch:
-      - name: 'binutils-2.37.tar.xz'
+      - name: '{{pn}}-{{pv}}.tar.xz'
         sha256: '820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c'
     run: |
-      tar xf {{dldir}}/binutils-2.37.tar.xz
+      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
 
   configure:
     args:
@@ -13,9 +15,9 @@ tasks:
     inherit:
       task: 'unpack'
     run: |
-      mkdir binutils-build
-      cd binutils-build
-      ../binutils-2.37/configure \
+      mkdir {{pn}}-build
+      cd {{pn}}-build
+      ../{{pn}}-{{pv}}/configure \
         --build={{build.gnu_triplet}} \
         --host={{host.gnu_triplet}} \
         --target={{target.gnu_triplet}} \
@@ -38,7 +40,7 @@ tasks:
     inherit:
       task: 'configure'
     run: |
-      cd binutils-build
+      cd {{pn}}-build
       make -j8
 
   install:
@@ -50,5 +52,5 @@ tasks:
     output:
       default: {}
     run: |
-      cd binutils-build
+      cd {{pn}}-build
       make DESTDIR={{destdir}} install
diff --git a/examples/busybox.yml b/examples/busybox.yml
index 96a6f33..004c60f 100644
--- a/examples/busybox.yml
+++ b/examples/busybox.yml
@@ -1,21 +1,23 @@
+meta:
+  version: '1.34.0'
 tasks:
   unpack:
     fetch:
-      - name: 'busybox-1.34.0.tar.bz2'
+      - name: '{{pn}}-{{pv}}.tar.bz2'
         sha256: 'ec8d1615edb045b83b81966604759c4d4ac921434ab4011da604f629c06074ce'
     run: |
-      tar xf {{dldir}}/busybox-1.34.0.tar.bz2
+      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.bz2
 
 
   configure:
     inherit:
       task: 'unpack'
     run: |
-      mkdir busybox-build
-      cd busybox-build
+      mkdir {{pn}}-build
+      cd {{pn}}-build
       make \
-        -f ../busybox-1.34.0/Makefile \
-        KBUILD_SRC=../busybox-1.34.0 \
+        -f ../{{pn}}-{{pv}}/Makefile \
+        KBUILD_SRC=../{{pn}}-{{pv}} \
         defconfig
 
   compile:
@@ -30,15 +32,15 @@ tasks:
       - recipe: 'toolchain'
         task: 'depends'
     run: |
-      cd busybox-build
+      cd {{pn}}-build
       make \
         ARCH={{host.karch}} \
         CROSS_COMPILE={{cross_compile}} \
-        busybox busybox.links -j8
+        {{pn}} busybox.links -j8
       sed -i \
         -e 's@^/usr@@' \
         -e 's@^/sbin@/bin@' \
-        busybox.links
+        {{pn}}.links
 
   install:
     args:
@@ -51,7 +53,7 @@ tasks:
           - recipe: 'toolchain'
             task: 'depends'
     run: |
-      cd busybox-build
+      cd {{pn}}-build
       make \
         ARCH={{host.karch}} \
         CROSS_COMPILE={{cross_compile}} \
diff --git a/examples/e2fsprogs.yml b/examples/e2fsprogs.yml
index 72a7695..1069bb8 100644
--- a/examples/e2fsprogs.yml
+++ b/examples/e2fsprogs.yml
@@ -1,10 +1,12 @@
+meta:
+  version: '1.46.4'
 tasks:
   unpack:
     fetch:
-      - name: 'e2fsprogs-1.46.4.tar.xz'
+      - name: '{{pn}}-{{pv}}.tar.xz'
         sha256: 'b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713'
     run: |
-      tar xf {{dldir}}/e2fsprogs-1.46.4.tar.xz
+      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
 
   configure:
     args:
@@ -25,9 +27,9 @@ tasks:
       export RANLIB={{cross_compile}}ranlib
       export STRIP={{cross_compile}}strip
 
-      mkdir e2fsprogs-build
-      cd e2fsprogs-build
-      ../e2fsprogs-1.46.4/configure \
+      mkdir {{pn}}-build
+      cd {{pn}}-build
+      ../{{pn}}-{{pv}}/configure \
         --build={{build.gnu_triplet}} \
         --host={{host.gnu_triplet}} \
         --prefix={{host.prefix}}
@@ -38,7 +40,7 @@ tasks:
     inherit:
       task: 'configure'
     run: |
-      cd e2fsprogs-build
+      cd {{pn}}-build
       make -j8
 
   install:
@@ -52,6 +54,6 @@ tasks:
           - recipe: 'toolchain'
             task: 'depends'
     run: |
-      cd e2fsprogs-build
+      cd {{pn}}-build
       make DESTDIR={{destdir}} install
 
diff --git a/examples/gcc-libs.yml b/examples/gcc-libs.yml
index 7ef1726..e2a9906 100644
--- a/examples/gcc-libs.yml
+++ b/examples/gcc-libs.yml
@@ -1,3 +1,5 @@
+meta:
+  name: 'gcc'
 tasks:
   compile:
     args:
@@ -12,7 +14,7 @@ tasks:
         args:
           host: 'target'
     run: |
-      cd gcc-build
+      cd {{pn}}-build
       make -j8 all-target-libgcc all-target-libstdc++-v3 all-target-libgomp all-target-libquadmath all-target-libatomic
 
   install-gcc:
@@ -24,7 +26,7 @@ tasks:
     output:
       default: {}
     run: |
-      cd gcc-build
+      cd {{pn}}-build
       make DESTDIR={{destdir}} install-target-libgcc install-target-libstdc++-v3 install-target-libgomp install-target-libquadmath install-target-libatomic
 
       mv {{destdir}}{{host.prefix}}/{{target.gnu_triplet}} ../gcc-sysroot
diff --git a/examples/gcc.yml b/examples/gcc.yml
index 8e6105a..77f2245 100644
--- a/examples/gcc.yml
+++ b/examples/gcc.yml
@@ -1,12 +1,14 @@
+meta:
+  version: '11.2.0'
 tasks:
   unpack:
     fetch:
-      - name: 'gcc-11.2.0.tar.xz'
+      - name: '{{pn}}-{{pv}}.tar.xz'
         sha256: 'd08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b'
     run: |
-      tar xf {{dldir}}/gcc-11.2.0.tar.xz
+      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
 
-      sed -i -e 's@^MULTILIB_OSDIRNAMES@# &@' gcc-11.2.0/gcc/config/*/t-*
+      sed -i -e 's@^MULTILIB_OSDIRNAMES@# &@' {{pn}}-{{pv}}/gcc/config/*/t-*
 
   header-stubs:
     args:
@@ -32,9 +34,9 @@ tasks:
       - task: 'header-stubs'
         noinherit: true
     run: |
-      mkdir gcc-build
-      cd gcc-build
-      ../gcc-11.2.0/configure \
+      mkdir {{pn}}-build
+      cd {{pn}}-build
+      ../{{pn}}-{{pv}}/configure \
         --build={{build.gnu_triplet}} \
         --host={{host.gnu_triplet}} \
         --target={{target.gnu_triplet}} \
@@ -84,7 +86,7 @@ tasks:
       - task: 'header-stubs'
         noinherit: true
     run: |
-      cd gcc-build
+      cd {{pn}}-build
       make -j8 all-host
 
   install:
@@ -99,6 +101,6 @@ tasks:
           - recipe: 'binutils'
             task: 'install'
     run: |
-      cd gcc-build
+      cd {{pn}}-build
       make DESTDIR={{destdir}} install-host
 
diff --git a/examples/glibc.yml b/examples/glibc.yml
index 337ae2f..ad189b3 100644
--- a/examples/glibc.yml
+++ b/examples/glibc.yml
@@ -1,10 +1,12 @@
+meta:
+  version: '2.34'
 tasks:
   unpack:
     fetch:
-      - name: 'glibc-2.34.tar.xz'
+      - name: '{{pn}}-{{pv}}.tar.xz'
         sha256: '44d26a1fe20b8853a48f470ead01e4279e869ac149b195dda4e44a195d981ab2'
     run: |
-      tar xf {{dldir}}/glibc-2.34.tar.xz
+      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
 
   configure:
     args:
@@ -28,9 +30,9 @@ tasks:
       export RANLIB={{cross_compile}}ranlib
       export READELF={{cross_compile}}readelf
 
-      mkdir glibc-build
-      cd glibc-build
-      ../glibc-2.34/configure \
+      mkdir {{pn}}-build
+      cd {{pn}}-build
+      ../{{pn}}-{{pv}}/configure \
         --build={{build.gnu_triplet}} \
         --host={{host.gnu_triplet}} \
         --prefix={{host.prefix}} \
@@ -56,7 +58,7 @@ tasks:
     inherit:
       task: 'configure'
     run: |
-      cd glibc-build
+      cd {{pn}}-build
       make -j8
 
   install:
@@ -70,5 +72,5 @@ tasks:
           - recipe: 'linux-uapi-headers'
             task: 'install'
     run: |
-      cd glibc-build
+      cd {{pn}}-build
       make install_root={{destdir}} install
diff --git a/examples/libgcc-initial.yml b/examples/libgcc-initial.yml
index 96d683b..3a2ae91 100644
--- a/examples/libgcc-initial.yml
+++ b/examples/libgcc-initial.yml
@@ -1,3 +1,5 @@
+meta:
+  name: 'gcc'
 tasks:
   configure:
     args:
@@ -10,7 +12,7 @@ tasks:
       - recipe: 'gcc'
         task: 'header-stubs'
     run: |
-      cd gcc-build
+      cd {{pn}}-build
       make configure-target-libgcc
 
       # A hack borrowed from OpenEmbedded:
@@ -31,7 +33,7 @@ tasks:
     inherit:
       task: 'configure'
     run: |
-      cd gcc-build
+      cd {{pn}}-build
       make -j8 all-target-libgcc
 
   install:
@@ -43,6 +45,6 @@ tasks:
     output:
       default: {}
     run: |
-      cd gcc-build
+      cd {{pn}}-build
       make DESTDIR={{destdir}} install-target-libgcc
       ln -s libgcc.a {{destdir}}{{host.prefix}}/lib/gcc/{{target.gnu_triplet}}/11.2.0/libgcc_eh.a
diff --git a/examples/linux-uapi-headers.yml b/examples/linux-uapi-headers.yml
index b3f0466..fdd9a8e 100644
--- a/examples/linux-uapi-headers.yml
+++ b/examples/linux-uapi-headers.yml
@@ -1,10 +1,13 @@
+meta:
+  name: 'linux'
+  version: '5.10.66'
 tasks:
   unpack:
     fetch:
-      - name: 'linux-5.10.66.tar.xz'
+      - name: '{{pn}}-{{pv}}.tar.xz'
         sha256: '5dfa06bbbbd164b9ea669ec637b1e6d05fb5fea8ef3aeb6729f2cbcd0dfcc8a7'
     run: |
-      tar xf {{dldir}}/linux-5.10.66.tar.xz
+      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
 
   install:
     args:
@@ -14,6 +17,6 @@ tasks:
     output:
       default: {}
     run: |
-      cd linux-5.10.66
+      cd {{pn}}-{{pv}}
       make INSTALL_HDR_PATH={{destdir}}{{host.prefix}} ARCH={{host.karch}} headers_install
 
diff --git a/examples/linux.yml b/examples/linux.yml
index 6019021..391d15e 100644
--- a/examples/linux.yml
+++ b/examples/linux.yml
@@ -1,10 +1,12 @@
+meta:
+  version: '5.10.66'
 tasks:
   unpack:
     fetch:
-      - name: 'linux-5.10.66.tar.xz'
+      - name: '{{pn}}-{{pv}}.tar.xz'
         sha256: '5dfa06bbbbd164b9ea669ec637b1e6d05fb5fea8ef3aeb6729f2cbcd0dfcc8a7'
     run: |
-      tar xf {{dldir}}/linux-5.10.66.tar.xz
+      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
 
   configure:
     args:
@@ -15,10 +17,10 @@ tasks:
       - recipe: 'gcc'
         task: 'install'
     run: |
-      mkdir linux-build
-      cd linux-build
+      mkdir {{pn}}-build
+      cd {{pn}}-build
       make \
-        -f ../linux-5.10.66/Makefile \
+        -f ../{{pn}}-{{pv}}/Makefile \
         ARCH={{host.karch}} \
         CROSS_COMPILE={{cross_compile}} \
         defconfig
@@ -29,7 +31,7 @@ tasks:
     inherit:
       task: 'configure'
     run: |
-      cd linux-build
+      cd {{pn}}-build
       make \
         ARCH={{host.karch}} \
         CROSS_COMPILE={{cross_compile}} \
@@ -46,7 +48,7 @@ tasks:
       modules:
         path: 'modules'
     run: |
-      cd linux-build
+      cd {{pn}}-build
       mkdir -p {{destdir}}/boot
       make \
         ARCH={{host.karch}} \
diff --git a/examples/rootfs.yml b/examples/rootfs.yml
index 0481f8f..ae831da 100644
--- a/examples/rootfs.yml
+++ b/examples/rootfs.yml
@@ -40,6 +40,6 @@ tasks:
     run: |
       mkdir {{destdir}}
 
-      IMAGE={{destdir}}/rootfs.ext4
+      IMAGE={{destdir}}/{{pn}}.ext4
       truncate -s 1G "$IMAGE"
       {{build.prefix}}/sbin/mkfs.ext4 -d {{sysroot}} "$IMAGE"