From 40918e6ada4fb9a9322b3807314a96b32d6bd9f8 Mon Sep 17 00:00:00 2001 From: Ben Brewer Date: Wed, 18 Jul 2018 16:05:53 +0100 Subject: Remove unused core dependencies --- elements/bsp-generic/syslinux.bst | 4 ++++ elements/core.bst | 50 --------------------------------------- elements/core/XML-Parser.bst | 10 -------- elements/core/cmake.bst | 15 ------------ elements/core/cython.bst | 9 ------- elements/core/gzip.bst | 20 ---------------- elements/core/intltool.bst | 13 ---------- elements/core/libseccomp.bst | 12 ---------- elements/core/libxml2.bst | 17 ------------- elements/core/libxslt.bst | 15 ------------ elements/coreutils.bst | 19 ++++++++++++++- elements/deploy-tools/parted.bst | 11 ++++++++- 12 files changed, 32 insertions(+), 163 deletions(-) delete mode 100644 elements/core.bst delete mode 100644 elements/core/XML-Parser.bst delete mode 100644 elements/core/cmake.bst delete mode 100644 elements/core/cython.bst delete mode 100644 elements/core/gzip.bst delete mode 100644 elements/core/intltool.bst delete mode 100644 elements/core/libseccomp.bst delete mode 100644 elements/core/libxml2.bst delete mode 100644 elements/core/libxslt.bst diff --git a/elements/bsp-generic/syslinux.bst b/elements/bsp-generic/syslinux.bst index 5bcf718a..ef296e76 100644 --- a/elements/bsp-generic/syslinux.bst +++ b/elements/bsp-generic/syslinux.bst @@ -6,6 +6,10 @@ depends: type: build - filename: core/python2.bst type: build +- filename: core/e2fsprogs.bst + type: build +- filename: core/xz.bst + type: build - filename: bsp-generic/nasm.bst type: build diff --git a/elements/core.bst b/elements/core.bst deleted file mode 100644 index 0b5057ac..00000000 --- a/elements/core.bst +++ /dev/null @@ -1,50 +0,0 @@ -kind: stack -description: Core components of a Baserock base system that are build tools required - for the BSP and Foundation strata, but a step above build-essential -depends: -- core/gdbm.bst -- core/perl.bst -- core/ncurses.bst -- core/texinfo-tarball.bst -- core/autoconf-tarball.bst -- core/automake.bst -- core/help2man.bst -- core/autoconf.bst -- core/libtool-tarball.bst -- core/file.bst -- core/libexpat.bst -- core/openssl-new.bst -- core/bzip2.bst -- core/readline.bst -- core/libffi.bst -- core/sqlite3.bst -- core/python3.bst -- core/ca-certificates.bst -- core/curl.bst -- core/gettext-tarball.bst -- core/git-minimal.bst -- core/mini-utils.bst -- core/gzip.bst -- core/flex.bst -- core/bison.bst -- core/patch.bst -- core/xz.bst -- core/libtool.bst -- core/pkg-config.bst -- core/attr.bst -- core/acl.bst -- core/linux-pam.bst -- core/libcap2.bst -- core/shadow.bst -- core/util-linux.bst -- core/e2fsprogs.bst -- core/libxml2.bst -- core/libxslt.bst -- core/XML-Parser.bst -- core/intltool.bst -- core/bash.bst -- core/cmake.bst -- core/cython.bst -- core/gperf.bst -- core/bc.bst -- core/libseccomp.bst diff --git a/elements/core/XML-Parser.bst b/elements/core/XML-Parser.bst deleted file mode 100644 index 80f06f0d..00000000 --- a/elements/core/XML-Parser.bst +++ /dev/null @@ -1,10 +0,0 @@ -kind: makemaker -depends: -- gnu-toolchain.bst -- core/libexpat.bst -- core/perl.bst -sources: -- kind: git - url: upstream:XML-Parser - track: baserock/morph - ref: e1a3ec157140a699e3020836475a0df622f70f1b diff --git a/elements/core/cmake.bst b/elements/core/cmake.bst deleted file mode 100644 index 80ce122d..00000000 --- a/elements/core/cmake.bst +++ /dev/null @@ -1,15 +0,0 @@ -kind: manual -depends: -- gnu-toolchain.bst -sources: -- kind: git - url: upstream:cmake - track: v3.8.2 - ref: 0d5a2252ef8a586f4fc70a66aabd17fb3fd52110 -config: - configure-commands: - - ./bootstrap --prefix="%{prefix}" --docdir=/share/doc/cmake --mandir=/share/man - build-commands: - - make - install-commands: - - make DESTDIR="%{install-root}" install diff --git a/elements/core/cython.bst b/elements/core/cython.bst deleted file mode 100644 index cdf90359..00000000 --- a/elements/core/cython.bst +++ /dev/null @@ -1,9 +0,0 @@ -kind: distutils -depends: -- gnu-toolchain.bst -- core/python3.bst -sources: -- kind: git - url: upstream:cython - track: '0.22' - ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d diff --git a/elements/core/gzip.bst b/elements/core/gzip.bst deleted file mode 100644 index 4816456a..00000000 --- a/elements/core/gzip.bst +++ /dev/null @@ -1,20 +0,0 @@ -kind: autotools -depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/gettext-tarball.bst -- core/git-minimal.bst -- core/mini-utils.bst -sources: -- kind: git - url: upstream:gzip - track: master - ref: e360d3795658e14fb15705876393b9384843971e - submodules: - gnulib: - url: upstream:gnulib -config: - configure-commands: - (<): - - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf - - ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib diff --git a/elements/core/intltool.bst b/elements/core/intltool.bst deleted file mode 100644 index f23b078b..00000000 --- a/elements/core/intltool.bst +++ /dev/null @@ -1,13 +0,0 @@ -kind: autotools -depends: -- gnu-toolchain.bst -- core/libexpat.bst -- core/XML-Parser.bst -- core/autoconf.bst -- core/automake.bst -- core/perl.bst -sources: -- kind: git - url: upstream:intltool - track: baserock/morph - ref: 12f04c88be9ff8a578d8fd6990ee2448c66dc5f4 diff --git a/elements/core/libseccomp.bst b/elements/core/libseccomp.bst deleted file mode 100644 index 0d04a57f..00000000 --- a/elements/core/libseccomp.bst +++ /dev/null @@ -1,12 +0,0 @@ -kind: autotools -depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/libtool.bst -- core/perl.bst -sources: -- kind: git - url: upstream:libseccomp - track: v2.3.2 - ref: 2331d104bc0cbde5f6c54e504a038e52bfe8e12d diff --git a/elements/core/libxml2.bst b/elements/core/libxml2.bst deleted file mode 100644 index fc444a19..00000000 --- a/elements/core/libxml2.bst +++ /dev/null @@ -1,17 +0,0 @@ -kind: autotools -depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/automake.bst -- core/file.bst -- core/libtool.bst -- core/libexpat.bst -- core/pkg-config.bst -- core/python3.bst -- core/xz.bst -- core/perl.bst -sources: -- kind: git - url: upstream:libxml2 - track: v2.9.3 - ref: 6657afe83a38278f124ace71dc85f60420beb2d5 diff --git a/elements/core/libxslt.bst b/elements/core/libxslt.bst deleted file mode 100644 index d74ef7b4..00000000 --- a/elements/core/libxslt.bst +++ /dev/null @@ -1,15 +0,0 @@ -kind: autotools -depends: -- gnu-toolchain.bst -- core/autoconf.bst -- core/libtool.bst -- core/automake.bst -- core/file.bst -- core/libxml2.bst -- core/xz.bst -- core/perl.bst -sources: -- kind: git - url: upstream:libxslt - track: master - ref: 73e08bf7c36a9145d38f51d37e66529b873c011a diff --git a/elements/coreutils.bst b/elements/coreutils.bst index 26f4b51f..f1a18041 100644 --- a/elements/coreutils.bst +++ b/elements/coreutils.bst @@ -1,6 +1,23 @@ kind: autotools depends: -- core.bst +- filename: core/bash.bst + type: build +- filename: core/perl.bst + type: build +- filename: core/automake.bst + type: build +- filename: core/autoconf.bst + type: build +- filename: core/gettext-tarball.bst + type: build +- filename: core/bison.bst + type: build +- filename: core/patch.bst + type: build +- filename: core/xz.bst + type: build +- filename: core/gperf.bst + type: build sources: - kind: git url: upstream:coreutils diff --git a/elements/deploy-tools/parted.bst b/elements/deploy-tools/parted.bst index e1024f90..7e2f7b64 100644 --- a/elements/deploy-tools/parted.bst +++ b/elements/deploy-tools/parted.bst @@ -1,6 +1,15 @@ kind: autotools depends: -- core.bst +- filename: core/bash.bst + type: build +- filename: core/libtool.bst + type: build +- filename: core/e2fsprogs.bst + type: build +- filename: core/gperf.bst + type: build +- filename: core/bc.bst + type: build sources: - kind: git url: upstream:parted -- cgit v1.2.1