refactor: use runtime dependencies

There are two changes:

First:

* toolchain image & make stage are packed as `base` stage as runtime
deps
* every other stage now depends on `base` which pulls in `make` &
toolchain into every other build, so toolchain is referenced only once

Second:

* autoconf & automake now have runtime deps list which dries up
dependencies list for builds which depend on autoconf/automake

Signed-off-by: Andrey Smirnov <[email protected]>

Pkgfile

@@ -1 +1 @@
-# syntax = docker.io/autonomy/bldr:2b3b543-frontend
+# syntax = docker.io/autonomy/bldr:2b9366f-frontend

argp-standalone/pkg.yaml

@@ -1,7 +1,6 @@
 name: argp-standalone
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
   - stage: patch
 steps:
   - sources:

autoconf/pkg.yaml

@@ -1,9 +1,10 @@
 name: autoconf
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
   - stage: perl
+    runtime: yes
   - stage: m4
+    runtime: yes
 steps:
   - sources:
       - url: https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz

automake/pkg.yaml

@@ -1,10 +1,9 @@
 name: automake
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
   - stage: perl
+    runtime: yes
   - stage: autoconf
-  - stage: m4
 steps:
   - sources:
       - url: https://ftp.gnu.org/gnu/automake/automake-1.16.1.tar.xz

base/pkg.yaml

@@ -0,0 +1,6 @@
+name: base
+dependencies:
+  - image: docker.io/autonomy/toolchain:0714f82
+    runtime: true
+  - stage: make
+    runtime: true

bash/pkg.yaml

@@ -1,7 +1,6 @@
 name: bash
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz

bc/pkg.yaml

@@ -1,7 +1,6 @@
 name: bc
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
   - stage: texinfo
   - stage: perl
 steps:

bison/pkg.yaml

@@ -1,8 +1,7 @@
 name: bison
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
+  - stage: base
   - stage: m4
-  - stage: make
   - stage: perl
 steps:
   - sources:

bzip2/pkg.yaml

@@ -1,7 +1,6 @@
 name: bzip2
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz

coreutils/pkg.yaml

@@ -1,7 +1,6 @@
 name: coreutils
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://ftp.gnu.org/gnu/coreutils/coreutils-8.30.tar.xz

cpio/pkg.yaml

@@ -1,7 +1,6 @@
 name: cpio
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
   - stage: autoconf
 steps:
   - sources:

curl/pkg.yaml

@@ -1,10 +1,9 @@
 name: curl
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
+  - stage: base
   - stage: libressl
   - stage: zlib
   - stage: pkg-config
-  - stage: make
 steps:
   - sources:
       - url: https://curl.haxx.se/download/curl-7.63.0.tar.xz

dejagnu/pkg.yaml

@@ -1,7 +1,6 @@
 name: dejagnu
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
   - stage: expect
   - stage: tcl
 steps:

diffutils/pkg.yaml

@@ -1,7 +1,6 @@
 name: diffutils
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://ftp.gnu.org/gnu/diffutils/diffutils-3.6.tar.xz

dtc/pkg.yaml

@@ -1,11 +1,10 @@
 name: dtc
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
+  - stage: base
   - stage: m4
   - stage: bison
   - stage: flex
   - stage: pkg-config
-  - stage: make
 steps:
   - sources:
       - url: https://mirrors.edge.kernel.org/pub/software/utils/dtc/dtc-1.5.0.tar.xz

elfutils/pkg.yaml

@@ -1,16 +1,13 @@
 name: elfutils
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
+  - stage: base
   - stage: zlib
   - stage: argp-standalone
   - stage: musl-fts
   - stage: musl-obstack
-  - stage: make
   - stage: patch
   - stage: autoconf
   - stage: automake
-  - stage: perl
-  - stage: m4
 steps:
   - sources:
       - url: https://sourceware.org/ftp/elfutils/0.173/elfutils-0.173.tar.bz2

expect/pkg.yaml

@@ -1,8 +1,7 @@
 name: expect
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
+  - stage: base
   - stage: tcl
-  - stage: make
 steps:
   - sources:
       - url: https://downloads.sourceforge.net/project/expect/Expect/5.45.4/expect5.45.4.tar.gz

file/pkg.yaml

@@ -1,12 +1,9 @@
 name: file
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
   - stage: libtool
   - stage: autoconf
   - stage: automake
-  - stage: perl
-  - stage: m4
 steps:
   - sources:
       - url: https://github.com/file/file/archive/FILE5_34.tar.gz

findutils/pkg.yaml

@@ -1,7 +1,6 @@
 name: findutils
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://ftp.gnu.org/gnu/findutils/findutils-4.7.0.tar.xz

flex/pkg.yaml

@@ -1,7 +1,6 @@
 name: flex
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
   - stage: m4
 steps:
   - sources:

gawk/pkg.yaml

@@ -1,7 +1,6 @@
 name: gawk
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://ftp.gnu.org/gnu/gawk/gawk-4.2.1.tar.xz

gettext/pkg.yaml

@@ -1,7 +1,6 @@
 name: gettext
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://ftp.gnu.org/gnu/gettext/gettext-0.19.8.1.tar.xz

git/pkg.yaml

@@ -1,15 +1,12 @@
 name: git
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
+  - stage: base
   - stage: zlib
   - stage: tcl
   - stage: gettext
   - stage: libressl
   - stage: curl
-  - stage: make
   - stage: autoconf
-  - stage: perl
-  - stage: m4
 steps:
   - sources:
       - url: https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.20.1.tar.xz

golang/bootstrap/pkg.yaml

@@ -1,7 +1,6 @@
 name: golang-bootstrap
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz

golang/golang/pkg.yaml

@@ -1,8 +1,7 @@
 name: golang
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
+  - stage: base
   - stage: golang-bootstrap
-  - stage: make
 steps:
   - sources:
       - url: https://dl.google.com/go/go1.13.1.src.tar.gz

gperf/pkg.yaml

@@ -1,7 +1,6 @@
 name: gperf
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: http://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz

grep/pkg.yaml

@@ -1,7 +1,6 @@
 name: grep
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://ftp.gnu.org/gnu/grep/grep-3.1.tar.xz

gzip/pkg.yaml

@@ -1,7 +1,6 @@
 name: gzip
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://ftp.gnu.org/gnu/gzip/gzip-1.9.tar.xz

kmod/pkg.yaml

@@ -1,7 +1,6 @@
 name: kmod
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-25.tar.xz

libressl/pkg.yaml

@@ -1,7 +1,6 @@
 name: libressl
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.0.tar.gz

libtool/pkg.yaml

@@ -1,8 +1,8 @@
 name: libtool
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
   - stage: m4
+    runtime: true
 steps:
   - sources:
       - url: http://ftpmirror.gnu.org/libtool/libtool-2.4.6.tar.gz

m4/pkg.yaml

@@ -1,7 +1,6 @@
 name: m4
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.xz

musl-fts/pkg.yaml

@@ -1,13 +1,11 @@
 name: musl-fts
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
   - stage: m4
   - stage: libtool
   - stage: autoconf
   - stage: automake
   - stage: pkg-config
-  - stage: perl
 steps:
   - sources:
       - url: https://github.com/pullmoll/musl-fts/archive/v1.2.7/musl-fts-1.2.7.tar.gz

musl-obstack/pkg.yaml

@@ -1,13 +1,10 @@
 name: musl-obstack
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
   - stage: libtool
   - stage: autoconf
   - stage: automake
   - stage: pkg-config
-  - stage: perl
-  - stage: m4
 steps:
   - sources:
       - url: https://github.com/pullmoll/musl-obstack/archive/v1.1/musl-obstack-1.1.tar.gz

ncurses/pkg.yaml

@@ -1,7 +1,6 @@
 name: ncurses
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://ftp.gnu.org/gnu/ncurses/ncurses-6.1.tar.gz

patch/pkg.yaml

@@ -1,7 +1,6 @@
 name: patch
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://ftp.gnu.org/gnu/patch/patch-2.7.6.tar.xz

pcre/pkg.yaml

@@ -1,9 +1,8 @@
 name: pcre
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
+  - stage: base
   - stage: zlib
   - stage: bzip2
-  - stage: make
 steps:
   - sources:
       - url: https://ftp.pcre.org/pub/pcre/pcre-8.43.tar.bz2

perl/pkg.yaml

@@ -1,7 +1,6 @@
 name: perl
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://www.cpan.org/src/5.0/perl-5.28.2.tar.xz

pkg-config/pkg.yaml

@@ -1,7 +1,6 @@
 name: pkg-config
 dependencies:
-  - image: docker.io/autonomy/toolchain:0714f82
-  - stage: make
+  - stage: base
 steps:
   - sources:
       - url: https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz