From e89894826eeccc319e7de35ee098290bc0c97738 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 19 Jul 2018 12:10:12 +0100 Subject: Sanitize build/runtime dependencies --- elements/bsp-generic/nasm.bst | 7 ++++++- elements/bsp-generic/syslinux.bst | 7 ++++++- elements/core/acl.bst | 21 ++++++++++++++------- elements/core/attr.bst | 20 +++++++++++++------- elements/core/autoconf-tarball.bst | 8 +++++++- elements/core/autoconf.bst | 20 +++++++++++++++----- elements/core/automake.bst | 13 +++++++++---- elements/core/bash.bst | 6 +++++- elements/core/bc.bst | 18 ++++++++++++------ elements/core/bison.bst | 32 +++++++++++++++++++++----------- elements/core/bzip2.bst | 6 +++++- elements/core/ca-certificates.bst | 13 ++++++++++--- elements/core/curl.bst | 22 +++++++++++++++------- elements/core/e2fsprogs.bst | 15 +++++++++++---- elements/core/file.bst | 14 ++++++++++---- elements/core/flex.bst | 22 +++++++++++++++------- elements/core/gdbm.bst | 6 +++++- elements/core/gettext-tarball.bst | 9 +++++++-- elements/core/git-minimal.bst | 24 ++++++++++++++++-------- elements/core/gperf.bst | 6 +++++- elements/core/help2man.bst | 15 ++++++++++----- elements/core/libcap2.bst | 31 +++++++++++++++++++++---------- elements/core/libexpat.bst | 19 +++++++++++++------ elements/core/libffi.bst | 17 +++++++++++++---- elements/core/libtool-tarball.bst | 6 +++++- elements/core/libtool.bst | 35 +++++++++++++++++++++++------------ elements/core/linux-pam.bst | 31 +++++++++++++++++++++---------- elements/core/mini-utils.bst | 6 +++++- elements/core/ncurses.bst | 6 +++++- elements/core/openssl-new.bst | 10 ++++++++-- elements/core/patch.bst | 23 +++++++++++++++-------- elements/core/perl.bst | 10 ++++++++-- elements/core/pkg-config.bst | 16 +++++++++++----- elements/core/python2.bst | 2 ++ elements/core/python3.bst | 27 +++++++++++++++++++-------- elements/core/readline.bst | 9 +++++++-- elements/core/shadow.bst | 34 +++++++++++++++++++++++----------- elements/core/sqlite3.bst | 14 ++++++++++---- elements/core/texinfo-tarball.bst | 12 +++++++++--- elements/core/util-linux.bst | 32 +++++++++++++++++++++----------- elements/core/xz.bst | 21 ++++++++++++++------- elements/coreutils.bst | 12 +++++++++++- elements/deploy-tools.bst | 4 ++++ elements/deploy-tools/mtools.bst | 6 +++++- elements/deploy-tools/parted.bst | 25 +++++++++++++++++++++++++ 45 files changed, 515 insertions(+), 197 deletions(-) (limited to 'elements') diff --git a/elements/bsp-generic/nasm.bst b/elements/bsp-generic/nasm.bst index 53bc68a4..06771afe 100644 --- a/elements/bsp-generic/nasm.bst +++ b/elements/bsp-generic/nasm.bst @@ -1,9 +1,14 @@ kind: autotools depends: -- gnu-toolchain.bst +- filename: gnu-toolchain.bst + type: build - filename: core/autoconf.bst type: build +- filename: core/automake.bst + type: build +- filename: core/libtool.bst + type: build sources: - kind: git diff --git a/elements/bsp-generic/syslinux.bst b/elements/bsp-generic/syslinux.bst index ef296e76..95d9132d 100644 --- a/elements/bsp-generic/syslinux.bst +++ b/elements/bsp-generic/syslinux.bst @@ -1,7 +1,8 @@ kind: manual depends: -- gnu-toolchain.bst +- filename: gnu-toolchain.bst + type: build - filename: core/perl.bst type: build - filename: core/python2.bst @@ -12,6 +13,10 @@ depends: type: build - filename: bsp-generic/nasm.bst type: build +- filename: core/git-minimal.bst + type: build +- filename: core/util-linux.bst + type: build sources: - kind: git diff --git a/elements/core/acl.bst b/elements/core/acl.bst index f0c06785..09b7329e 100644 --- a/elements/core/acl.bst +++ b/elements/core/acl.bst @@ -1,12 +1,19 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/gettext-tarball.bst -- core/libtool.bst -- core/attr.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/gettext-tarball.bst + type: build +- filename: core/libtool.bst + type: build +- filename: core/attr.bst + type: build + sources: - kind: git url: upstream:acl diff --git a/elements/core/attr.bst b/elements/core/attr.bst index d99432ca..14f512e7 100644 --- a/elements/core/attr.bst +++ b/elements/core/attr.bst @@ -1,12 +1,18 @@ kind: autotools depends: -- gnu-toolchain.bst -- core/file.bst -- core/autoconf.bst -- core/automake.bst -- core/gettext-tarball.bst -- core/libtool.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/file.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/gettext-tarball.bst + type: build +- filename: core/libtool.bst + type: build + sources: - kind: git url: upstream:attr diff --git a/elements/core/autoconf-tarball.bst b/elements/core/autoconf-tarball.bst index 7286afb4..7c10454c 100644 --- a/elements/core/autoconf-tarball.bst +++ b/elements/core/autoconf-tarball.bst @@ -1,12 +1,18 @@ kind: autotools + depends: -- gnu-toolchain.bst +- filename: gnu-toolchain.bst + type: build +# autorecof is a perl script, so perl is a runtime dependency +# for autoconf. - core/perl.bst + sources: - kind: git url: upstream:autoconf-tarball track: autoconf-2.69 ref: 55d1d2c339bc5f935f6d8d702e98b7bd5d968e9d + config: configure-commands: - ./configure --prefix="%{prefix}" diff --git a/elements/core/autoconf.bst b/elements/core/autoconf.bst index 5322f434..42e989da 100644 --- a/elements/core/autoconf.bst +++ b/elements/core/autoconf.bst @@ -1,16 +1,26 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf-tarball.bst -- core/automake.bst -- core/help2man.bst -- core/texinfo-tarball.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf-tarball.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/help2man.bst + type: build +- filename: core/texinfo-tarball.bst + type: build +# autorecof is a perl script, so perl is a runtime dependency +# for autoconf. - core/perl.bst + sources: - kind: git url: upstream:autoconf track: baserock/v2.69-texinfo-fix ref: 218f9347c9c34919c2b8eef8d9a0513ac567a3c1 + config: configure-commands: (<): diff --git a/elements/core/automake.bst b/elements/core/automake.bst index 85978f92..8cf6a314 100644 --- a/elements/core/automake.bst +++ b/elements/core/automake.bst @@ -1,14 +1,19 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf-tarball.bst -- core/perl.bst -- core/texinfo-tarball.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf-tarball.bst + type: build +- filename: core/texinfo-tarball.bst + type: build + sources: - kind: git url: upstream:automake track: v1.15 ref: db43dd473361d90d8b00362cfef5bac8e722000d + config: configure-commands: - ./bootstrap.sh diff --git a/elements/core/bash.bst b/elements/core/bash.bst index be1816fe..d646db98 100644 --- a/elements/core/bash.bst +++ b/elements/core/bash.bst @@ -1,11 +1,15 @@ kind: autotools + depends: -- gnu-toolchain.bst +- filename: gnu-toolchain.bst + type: build + sources: - kind: git url: upstream:bash track: baserock/bash-4.3-patch-27 ref: 3590145af6f1c9fa321dff231f69ae696e7e740b + config: configure-commands: - | diff --git a/elements/core/bc.bst b/elements/core/bc.bst index 4c5c885c..7fd86df7 100644 --- a/elements/core/bc.bst +++ b/elements/core/bc.bst @@ -1,11 +1,17 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/perl.bst -- core/flex.bst -- core/texinfo-tarball.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/flex.bst + type: build +- filename: core/texinfo-tarball.bst + type: build + sources: - kind: git url: upstream:bc-tarball diff --git a/elements/core/bison.bst b/elements/core/bison.bst index b441e36c..2f4f697e 100644 --- a/elements/core/bison.bst +++ b/elements/core/bison.bst @@ -1,16 +1,25 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/flex.bst -- core/gettext-tarball.bst -- core/git-minimal.bst -- core/openssl-new.bst -- core/help2man.bst -- core/mini-utils.bst -- core/perl.bst -- core/texinfo-tarball.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/flex.bst + type: build +- filename: core/gettext-tarball.bst + type: build +- filename: core/git-minimal.bst + type: build +- filename: core/help2man.bst + type: build +- filename: core/mini-utils.bst + type: build +- filename: core/texinfo-tarball.bst + type: build + sources: - kind: git url: upstream:bison @@ -21,6 +30,7 @@ sources: url: upstream:gnulib submodules/autoconf: url: upstream:autoconf + config: configure-commands: - sh bootstrap --skip-po --no-git --gnulib-srcdir=gnulib diff --git a/elements/core/bzip2.bst b/elements/core/bzip2.bst index e85a4db7..2cec49f4 100644 --- a/elements/core/bzip2.bst +++ b/elements/core/bzip2.bst @@ -1,11 +1,15 @@ kind: manual + depends: -- gnu-toolchain.bst +- filename: gnu-toolchain.bst + type: build + sources: - kind: git url: upstream:bzip2 track: baserock/morph ref: 8deafa68e52b230018c0318dc7959ff9af3ad2a5 + config: configure-commands: - sed -i -rf bzip2.morph-makefix.sed Makefile diff --git a/elements/core/ca-certificates.bst b/elements/core/ca-certificates.bst index 739d9616..2034f809 100644 --- a/elements/core/ca-certificates.bst +++ b/elements/core/ca-certificates.bst @@ -1,13 +1,19 @@ kind: manual + depends: -- gnu-toolchain.bst -- core/automake.bst -- core/python3.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/python3.bst + type: build + sources: - kind: git url: upstream:ca-certificates track: baserock/debian/20150426 ref: 642c21872876ce2f9ec323b1df44f1cd6c47e91c + config: build-commands: - make @@ -19,6 +25,7 @@ config: - | cd "%{install-root}"/usr/share/ca-certificates find * -type f > "%{install-root}"/etc/ca-certificates.conf + public: bst: integration-commands: diff --git a/elements/core/curl.bst b/elements/core/curl.bst index e5f4e744..97c08ed1 100644 --- a/elements/core/curl.bst +++ b/elements/core/curl.bst @@ -1,17 +1,25 @@ kind: manual + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/file.bst -- core/libtool-tarball.bst -- core/openssl-new.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/file.bst + type: build +- filename: core/libtool-tarball.bst + type: build +- filename: core/openssl-new.bst + type: build + sources: - kind: git url: upstream:curl track: curl-7_52_1 ref: 44b9b4d4f56d6f6de92c89636994c03984e9cd01 + config: configure-commands: - ./buildconf diff --git a/elements/core/e2fsprogs.bst b/elements/core/e2fsprogs.bst index 567f9562..ded8cac5 100644 --- a/elements/core/e2fsprogs.bst +++ b/elements/core/e2fsprogs.bst @@ -1,14 +1,21 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/pkg-config.bst -- core/util-linux.bst -- core/file.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/pkg-config.bst + type: build +- filename: core/util-linux.bst + type: build +- filename: core/file.bst + type: build + sources: - kind: git url: upstream:e2fsprogs track: v1.43.7 ref: 3427917edca335d2cc4258cff8ab105c840298a4 + config: configure-commands: - | diff --git a/elements/core/file.bst b/elements/core/file.bst index a41994d8..d2cf5d04 100644 --- a/elements/core/file.bst +++ b/elements/core/file.bst @@ -1,9 +1,15 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/libtool-tarball.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/libtool-tarball.bst + type: build + sources: - kind: git url: upstream:file diff --git a/elements/core/flex.bst b/elements/core/flex.bst index 469aaedf..aceeda59 100644 --- a/elements/core/flex.bst +++ b/elements/core/flex.bst @@ -1,17 +1,25 @@ kind: manual + depends: -- gnu-toolchain.bst -- core/perl.bst -- core/autoconf.bst -- core/automake.bst -- core/file.bst -- core/gettext-tarball.bst -- core/texinfo-tarball.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/file.bst + type: build +- filename: core/gettext-tarball.bst + type: build +- filename: core/texinfo-tarball.bst + type: build + sources: - kind: git url: upstream:flex track: baserock/build-essential ref: de10f98e8a2dc2a021796811490d0f30c3cd90bf + config: configure-commands: - autoreconf -ivf diff --git a/elements/core/gdbm.bst b/elements/core/gdbm.bst index 35b69f11..a97ce9c0 100644 --- a/elements/core/gdbm.bst +++ b/elements/core/gdbm.bst @@ -1,11 +1,15 @@ kind: manual + depends: -- gnu-toolchain.bst +- filename: gnu-toolchain.bst + type: build + sources: - kind: git url: upstream:gdbm-tarball track: gdbm-1.11 ref: e5faeaaf75ecfb705a9b643b3e4cb881ebb69f48 + config: configure-commands: - ./configure --prefix="%{prefix}" --enable-libgdbm-compat --disable-nls diff --git a/elements/core/gettext-tarball.bst b/elements/core/gettext-tarball.bst index e98f7246..a77c7ec9 100644 --- a/elements/core/gettext-tarball.bst +++ b/elements/core/gettext-tarball.bst @@ -1,12 +1,17 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/libexpat.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/libexpat.bst + type: build + sources: - kind: git url: upstream:gettext-tarball track: gettext-0.19.8.1 ref: 500500ec9b7b0d0cef90b48c9b4ddc8866b5f19c + config: configure-commands: - ./configure --prefix="%{prefix}" diff --git a/elements/core/git-minimal.bst b/elements/core/git-minimal.bst index 2c819ccb..7744454e 100644 --- a/elements/core/git-minimal.bst +++ b/elements/core/git-minimal.bst @@ -1,18 +1,26 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/python3.bst -- core/curl.bst -- core/gettext-tarball.bst -- core/libexpat.bst -- core/openssl-new.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/python3.bst + type: build +- filename: core/curl.bst + type: build +- filename: core/gettext-tarball.bst + type: build +- filename: core/libexpat.bst + type: build +- filename: core/openssl-new.bst + sources: - kind: git url: upstream:git track: v2.8.0-rc2 ref: ed9067f705aa51819c7dfff7e4190dd267beaf5d + config: configure-commands: (<): diff --git a/elements/core/gperf.bst b/elements/core/gperf.bst index d8817355..3605ee75 100644 --- a/elements/core/gperf.bst +++ b/elements/core/gperf.bst @@ -1,11 +1,15 @@ kind: autotools + depends: -- gnu-toolchain.bst +- filename: gnu-toolchain.bst + type: build + sources: - kind: git url: upstream:gperf track: baserock/morph ref: 5094e4a539adf845111013f82c2c4fcaec637983 + config: configure-commands: - ./configure --prefix="%{prefix}" diff --git a/elements/core/help2man.bst b/elements/core/help2man.bst index 7243a81e..2ae2f53c 100644 --- a/elements/core/help2man.bst +++ b/elements/core/help2man.bst @@ -1,10 +1,15 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf-tarball.bst -- core/automake.bst -- core/perl.bst -- core/texinfo-tarball.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf-tarball.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/texinfo-tarball.bst + type: build + sources: - kind: git url: upstream:help2man diff --git a/elements/core/libcap2.bst b/elements/core/libcap2.bst index 7e30cfda..2131fc28 100644 --- a/elements/core/libcap2.bst +++ b/elements/core/libcap2.bst @@ -1,20 +1,31 @@ kind: manual + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/gettext-tarball.bst -- core/libtool.bst -- core/pkg-config.bst -- core/attr.bst -- core/acl.bst -- core/linux-pam.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/gettext-tarball.bst + type: build +- filename: core/libtool.bst + type: build +- filename: core/pkg-config.bst + type: build +- filename: core/attr.bst + type: build +- filename: core/acl.bst + type: build +- filename: core/linux-pam.bst + type: build + sources: - kind: git url: upstream:libcap2 track: baserock/morph ref: 4f7cca1bc9c2a274edb39d351b65747010d3ba7b + config: build-commands: - make prefix="%{prefix}" diff --git a/elements/core/libexpat.bst b/elements/core/libexpat.bst index 5e1149eb..7d4b1515 100644 --- a/elements/core/libexpat.bst +++ b/elements/core/libexpat.bst @@ -1,16 +1,23 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/file.bst -- core/libtool-tarball.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/file.bst + type: build +- filename: core/libtool-tarball.bst + type: build + sources: - kind: git url: upstream:libexpat track: R_2_1_0 ref: 7cfc09db3e258129ab05811f2f9e351746ddab9f + config: configure-commands: (<): diff --git a/elements/core/libffi.bst b/elements/core/libffi.bst index a224395b..ba980619 100644 --- a/elements/core/libffi.bst +++ b/elements/core/libffi.bst @@ -1,14 +1,23 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/libtool-tarball.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/libtool-tarball.bst + type: build +- filename: core/texinfo-tarball.bst + type: build + sources: - kind: git url: upstream:libffi track: v3.2.1 ref: 20562ac0427c3578250d04c6e34fb0127d4551cf + config: install-commands: - make DESTDIR="%{install-root}"/ install diff --git a/elements/core/libtool-tarball.bst b/elements/core/libtool-tarball.bst index e1d0e197..f5151e30 100644 --- a/elements/core/libtool-tarball.bst +++ b/elements/core/libtool-tarball.bst @@ -1,11 +1,15 @@ kind: autotools + depends: -- gnu-toolchain.bst +- filename: gnu-toolchain.bst + type: build + sources: - kind: git url: upstream:libtool-tarball track: libtool-2.4.6 ref: c026ca36e37d2643623a75d0d3e9e451023139f3 + config: configure-commands: - ./configure --prefix="%{prefix}" diff --git a/elements/core/libtool.bst b/elements/core/libtool.bst index 230a1a5f..e9f2c1bd 100644 --- a/elements/core/libtool.bst +++ b/elements/core/libtool.bst @@ -1,17 +1,27 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/file.bst -- core/help2man.bst -- core/git-minimal.bst -- core/openssl-new.bst -- core/patch.bst -- core/texinfo-tarball.bst -- core/xz.bst -- core/perl.bst -- core/mini-utils.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/file.bst + type: build +- filename: core/help2man.bst + type: build +- filename: core/git-minimal.bst + type: build +- filename: core/patch.bst + type: build +- filename: core/texinfo-tarball.bst + type: build +- filename: core/xz.bst + type: build +- filename: core/mini-utils.bst + type: build + sources: - kind: git url: upstream:libtool @@ -20,6 +30,7 @@ sources: submodules: gnulib: url: upstream:gnulib + config: configure-commands: - export NOCONFIGURE=1; export MAKEFLAGS="-j 1"; ./bootstrap diff --git a/elements/core/linux-pam.bst b/elements/core/linux-pam.bst index 10470420..f6cdc857 100644 --- a/elements/core/linux-pam.bst +++ b/elements/core/linux-pam.bst @@ -1,20 +1,31 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/gettext-tarball.bst -- core/libtool.bst -- core/pkg-config.bst -- core/flex.bst -- core/attr.bst -- core/acl.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/gettext-tarball.bst + type: build +- filename: core/libtool.bst + type: build +- filename: core/pkg-config.bst + type: build +- filename: core/flex.bst + type: build +- filename: core/attr.bst + type: build +- filename: core/acl.bst + type: build + sources: - kind: git url: upstream:linux-pam track: Linux-PAM-1.1.8 ref: b1521c97e73b10469f7b34c0571d51c647eca83c + config: configure-commands: - autoreconf -ivf diff --git a/elements/core/mini-utils.bst b/elements/core/mini-utils.bst index 7f7c7e79..f6c5e0d0 100644 --- a/elements/core/mini-utils.bst +++ b/elements/core/mini-utils.bst @@ -1,11 +1,15 @@ kind: manual + depends: -- gnu-toolchain.bst +- filename: gnu-toolchain.bst + type: build + sources: - kind: git url: baserock:baserock/mini-utils track: master ref: 5293265b29bbf468ab9d7f3302b19dbc81d0f8b8 + config: build-commands: - make diff --git a/elements/core/ncurses.bst b/elements/core/ncurses.bst index 3f8dd214..94cffe12 100644 --- a/elements/core/ncurses.bst +++ b/elements/core/ncurses.bst @@ -1,11 +1,15 @@ kind: manual + depends: -- gnu-toolchain.bst +- filename: gnu-toolchain.bst + type: build + sources: - kind: git url: upstream:ncurses track: ncurses-5.9-20150131 ref: f6d73a10a980bc78969c3af93665cbe7d06c3646 + config: configure-commands: - LDCONFIG=true ./configure --with-shared --without-debug --enable-widec diff --git a/elements/core/openssl-new.bst b/elements/core/openssl-new.bst index 9bad3cd2..257d0baa 100644 --- a/elements/core/openssl-new.bst +++ b/elements/core/openssl-new.bst @@ -1,14 +1,20 @@ kind: manual + depends: -- gnu-toolchain.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/perl.bst + type: build + sources: - kind: git url: upstream:openssl-new track: OpenSSL_1_0_2k ref: 081314d07705aa58912845c213a48414d8f616a9 + variables: notparallel: true + config: configure-commands: - sed -i -e 's,^LIBNAMES=\\(.*\\) padlock \\(.*\\),LIBNAMES=\\1 \\2,g' engines/Makefile diff --git a/elements/core/patch.bst b/elements/core/patch.bst index 5f316abf..efa4aa7a 100644 --- a/elements/core/patch.bst +++ b/elements/core/patch.bst @@ -1,13 +1,19 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/bison.bst -- core/git-minimal.bst -- core/openssl-new.bst -- core/mini-utils.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/bison.bst + type: build +- filename: core/git-minimal.bst + type: build +- filename: core/mini-utils.bst + type: build + sources: - kind: git url: upstream:patch @@ -16,6 +22,7 @@ sources: submodules: gnulib: url: upstream:gnulib + config: configure-commands: (<): diff --git a/elements/core/perl.bst b/elements/core/perl.bst index 8f04ea9b..28b3339e 100644 --- a/elements/core/perl.bst +++ b/elements/core/perl.bst @@ -1,14 +1,20 @@ kind: manual + depends: -- gnu-toolchain.bst -- core/gdbm.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/gdbm.bst + type: build + sources: - kind: git url: upstream:perl track: v5.22.0 ref: 70f63a4c7dba89e8e48b44de7978faae4319e693 + variables: notparallel: true + config: configure-commands: - sh Configure -des -Dprefix="%{prefix}" -Darchlib="%{prefix}/lib/perl" -Dprivlib="%{prefix}/share/perl" diff --git a/elements/core/pkg-config.bst b/elements/core/pkg-config.bst index bca39d84..8b31d721 100644 --- a/elements/core/pkg-config.bst +++ b/elements/core/pkg-config.bst @@ -1,15 +1,21 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/libtool.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/libtool.bst + type: build + sources: - kind: git url: upstream:pkg-config track: pkg-config-0.28 ref: 74ceac54ef6f9247c00f08eecd8cca811a3c5934 + config: configure-commands: - ./autogen.sh --prefix="%{prefix}" --with-internal-glib diff --git a/elements/core/python2.bst b/elements/core/python2.bst index fc524b10..b9475cf1 100644 --- a/elements/core/python2.bst +++ b/elements/core/python2.bst @@ -2,6 +2,8 @@ kind: autotools depends: - filename: core/bash.bst type: build +- filename: gnu-toolchain.bst + type: build sources: - kind: git url: upstream:cpython diff --git a/elements/core/python3.bst b/elements/core/python3.bst index 0027e825..4e798a36 100644 --- a/elements/core/python3.bst +++ b/elements/core/python3.bst @@ -1,18 +1,29 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/openssl-new.bst -- core/bzip2.bst -- core/libexpat.bst -- core/libffi.bst -- core/sqlite3.bst -- core/ncurses.bst -- core/readline.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/openssl-new.bst + type: build +- filename: core/bzip2.bst + type: build +- filename: core/libexpat.bst + type: build +- filename: core/libffi.bst + type: build +- filename: core/sqlite3.bst + type: build +- filename: core/ncurses.bst + type: build +- filename: core/readline.bst + type: build + sources: - kind: git url: upstream:cpython track: v3.5.2 ref: 609bc370055e03b3c74c4321a5990929c29a226d + config: configure-commands: - | diff --git a/elements/core/readline.bst b/elements/core/readline.bst index a79039c6..5e09faeb 100644 --- a/elements/core/readline.bst +++ b/elements/core/readline.bst @@ -1,12 +1,17 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/automake.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/automake.bst + type: build + sources: - kind: git url: upstream:readline track: baserock/genivi/baseline ref: 518937ab89be812ccd45e9b8c1ce4ad721d35ef6 + config: configure-commands: - cp /usr/share/automake*/config.guess support diff --git a/elements/core/shadow.bst b/elements/core/shadow.bst index d55d0466..275f6ad3 100644 --- a/elements/core/shadow.bst +++ b/elements/core/shadow.bst @@ -1,21 +1,33 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/gettext-tarball.bst -- core/libtool.bst -- core/bison.bst -- core/attr.bst -- core/acl.bst -- core/linux-pam.bst -- core/libcap2.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/gettext-tarball.bst + type: build +- filename: core/libtool.bst + type: build +- filename: core/bison.bst + type: build +- filename: core/attr.bst + type: build +- filename: core/acl.bst + type: build +- filename: core/linux-pam.bst + type: build +- filename: core/libcap2.bst + type: build + sources: - kind: git url: upstream:shadow track: upstream/4.2.1 ref: bfaa59229d61adb7fa0c570f0d94fd324c6e05aa + config: configure-commands: - autoreconf -vfi diff --git a/elements/core/sqlite3.bst b/elements/core/sqlite3.bst index 5ecf4f9a..3d0a8e74 100644 --- a/elements/core/sqlite3.bst +++ b/elements/core/sqlite3.bst @@ -1,9 +1,15 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/libtool-tarball.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/libtool-tarball.bst + type: build + sources: - kind: git url: upstream:sqlite3 diff --git a/elements/core/texinfo-tarball.bst b/elements/core/texinfo-tarball.bst index 02aa9e9a..f7760a07 100644 --- a/elements/core/texinfo-tarball.bst +++ b/elements/core/texinfo-tarball.bst @@ -1,13 +1,19 @@ kind: manual + depends: -- gnu-toolchain.bst -- core/ncurses.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/ncurses.bst + type: build +- filename: core/perl.bst + type: build + sources: - kind: git url: upstream:texinfo-tarball track: texinfo-5.2 ref: 6a55f074b1f67d02149c13931eb1df9f0e539b15 + config: configure-commands: - ./configure --prefix="%{prefix}" diff --git a/elements/core/util-linux.bst b/elements/core/util-linux.bst index eec44f37..1bd26a7d 100644 --- a/elements/core/util-linux.bst +++ b/elements/core/util-linux.bst @@ -1,21 +1,31 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/gettext-tarball.bst -- core/git-minimal.bst -- core/openssl-new.bst -- core/libtool.bst -- core/pkg-config.bst -- core/linux-pam.bst -- core/shadow.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/gettext-tarball.bst + type: build +- filename: core/git-minimal.bst + type: build +- filename: core/libtool.bst + type: build +- filename: core/pkg-config.bst + type: build +- filename: core/linux-pam.bst + type: build +- filename: core/shadow.bst + type: build + sources: - kind: git url: upstream:util-linux track: v2.28 ref: 44338f7fe6a529cef1f206dccd95e7282625c483 + config: configure-commands: - ./autogen.sh diff --git a/elements/core/xz.bst b/elements/core/xz.bst index 5437c5f7..05427d8e 100644 --- a/elements/core/xz.bst +++ b/elements/core/xz.bst @@ -1,12 +1,19 @@ kind: autotools + depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/file.bst -- core/gettext-tarball.bst -- core/libtool-tarball.bst -- core/perl.bst +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/file.bst + type: build +- filename: core/gettext-tarball.bst + type: build +- filename: core/libtool-tarball.bst + type: build + sources: - kind: git url: upstream:xz diff --git a/elements/coreutils.bst b/elements/coreutils.bst index f1a18041..5b063b6f 100644 --- a/elements/coreutils.bst +++ b/elements/coreutils.bst @@ -1,4 +1,5 @@ kind: autotools + depends: - filename: core/bash.bst type: build @@ -18,6 +19,14 @@ depends: type: build - filename: core/gperf.bst type: build +## EXTRA DEPENDENCIES +- filename: gnu-toolchain.bst + type: build +- filename: core/texinfo-tarball.bst + type: build +- filename: core/mini-utils.bst + type: build + sources: - kind: git url: upstream:coreutils @@ -26,10 +35,11 @@ sources: submodules: gnulib: url: upstream:gnulib + config: configure-commands: - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf - - bash bootstrap --skip-po --no-git --gnulib-srcdir=gnulib + - bash bootstrap --skip-po --no-git --no-bootstrap-sync --gnulib-srcdir=gnulib - FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="%{prefix}" --disable-nls build-commands: - make WERROR_CFLAGS= diff --git a/elements/deploy-tools.bst b/elements/deploy-tools.bst index 1c8d7c42..b2cc5557 100644 --- a/elements/deploy-tools.bst +++ b/elements/deploy-tools.bst @@ -2,9 +2,13 @@ kind: stack description: Deployment tooling depends: +- gnu-toolchain.bst - core/e2fsprogs.bst - coreutils.bst - deploy-tools/mtools.bst - deploy-tools/parted.bst - bsp-generic/nasm.bst - bsp-generic/syslinux.bst +- core/util-linux.bst +- core/readline.bst +- core/ncurses.bst diff --git a/elements/deploy-tools/mtools.bst b/elements/deploy-tools/mtools.bst index 354a1cfa..0560b64b 100644 --- a/elements/deploy-tools/mtools.bst +++ b/elements/deploy-tools/mtools.bst @@ -1,11 +1,15 @@ kind: autotools + depends: -- gnu-toolchain.bst +- filename: gnu-toolchain.bst + type: build + sources: - kind: git url: upstream:mtools track: mtools-4.0.18 ref: af0c3edb9706e470b45a9c8dd6debcc9e2d543c2 + config: configure-commands: - ./configure --prefix="%{prefix}" diff --git a/elements/deploy-tools/parted.bst b/elements/deploy-tools/parted.bst index 7e2f7b64..02c6b07a 100644 --- a/elements/deploy-tools/parted.bst +++ b/elements/deploy-tools/parted.bst @@ -1,4 +1,5 @@ kind: autotools + depends: - filename: core/bash.bst type: build @@ -10,6 +11,29 @@ depends: type: build - filename: core/bc.bst type: build +- filename: gnu-toolchain.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/gettext-tarball.bst + type: build +- filename: core/texinfo-tarball.bst + type: build +- filename: core/mini-utils.bst + type: build +- filename: core/util-linux.bst + type: build +- filename: core/ncurses.bst + type: build +- filename: core/readline.bst + type: build +- filename: core/file.bst + type: build +- filename: core/pkg-config.bst + type: build + sources: - kind: git url: upstream:parted @@ -18,6 +42,7 @@ sources: submodules: gnulib: url: upstream:gnulib + config: configure-commands: - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf -- cgit v1.2.1