From a71285febaa039bf0c4508b0c8afb981808a7555 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Wed, 18 Jul 2018 14:25:28 +0100 Subject: Remove coreutils-common stack Only coreutils.bst is used in another element, remove unnecessary elements. --- elements/coreutils-common.bst | 13 ------------- elements/coreutils-common/coreutils.bst | 20 -------------------- elements/coreutils-common/diff.bst | 17 ----------------- elements/coreutils-common/findutils.bst | 11 ----------- elements/coreutils-common/jq.bst | 8 -------- elements/coreutils-common/less.bst | 8 -------- elements/coreutils-common/sed.bst | 17 ----------------- elements/coreutils-common/tar.bst | 21 --------------------- elements/coreutils.bst | 20 ++++++++++++++++++++ elements/deploy-tools.bst | 2 +- 10 files changed, 21 insertions(+), 116 deletions(-) delete mode 100644 elements/coreutils-common.bst delete mode 100644 elements/coreutils-common/coreutils.bst delete mode 100644 elements/coreutils-common/diff.bst delete mode 100644 elements/coreutils-common/findutils.bst delete mode 100644 elements/coreutils-common/jq.bst delete mode 100644 elements/coreutils-common/less.bst delete mode 100644 elements/coreutils-common/sed.bst delete mode 100644 elements/coreutils-common/tar.bst create mode 100644 elements/coreutils.bst diff --git a/elements/coreutils-common.bst b/elements/coreutils-common.bst deleted file mode 100644 index b10dbed2..00000000 --- a/elements/coreutils-common.bst +++ /dev/null @@ -1,13 +0,0 @@ -kind: stack -description: |- - We need to split this so we can build stuff using coreutils but we can not - having it in the final systems (for example in genivi ones that do not - accept GPLv3 code) -depends: -- coreutils-common/coreutils.bst -- coreutils-common/sed.bst -- coreutils-common/diff.bst -- coreutils-common/tar.bst -- coreutils-common/findutils.bst -- coreutils-common/less.bst -- coreutils-common/jq.bst diff --git a/elements/coreutils-common/coreutils.bst b/elements/coreutils-common/coreutils.bst deleted file mode 100644 index 26f4b51f..00000000 --- a/elements/coreutils-common/coreutils.bst +++ /dev/null @@ -1,20 +0,0 @@ -kind: autotools -depends: -- core.bst -sources: -- kind: git - url: upstream:coreutils - track: v8.25 - ref: 68f73f23866d6137e9c8d88d86073b33588d7b56 - 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 - - FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="%{prefix}" --disable-nls - build-commands: - - make WERROR_CFLAGS= - install-commands: - - make INSTALL_PROGRAM=install DESTDIR="%{install-root}" install diff --git a/elements/coreutils-common/diff.bst b/elements/coreutils-common/diff.bst deleted file mode 100644 index edbc7aaf..00000000 --- a/elements/coreutils-common/diff.bst +++ /dev/null @@ -1,17 +0,0 @@ -kind: autotools -depends: -- core.bst -- coreutils-common/coreutils.bst -sources: -- kind: git - url: upstream:diffutils - track: baserock/v3.3 - ref: bd86eb1a1e87ab85a7c8dbb658fa829ce69c252e - submodules: - gnulib: - url: upstream:gnulib -config: - configure-commands: - - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf - - ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib - - ./configure --prefix="%{prefix}" --disable-gcc-warnings diff --git a/elements/coreutils-common/findutils.bst b/elements/coreutils-common/findutils.bst deleted file mode 100644 index 85e6b52b..00000000 --- a/elements/coreutils-common/findutils.bst +++ /dev/null @@ -1,11 +0,0 @@ -kind: autotools -depends: -- core.bst -sources: -- kind: git - url: upstream:findutils - track: v4.6.0 - ref: 992a6b62ab8061531dc0ad40325b8e4c222fce66 - submodules: - gnulib: - url: upstream:gnulib diff --git a/elements/coreutils-common/jq.bst b/elements/coreutils-common/jq.bst deleted file mode 100644 index fff95f60..00000000 --- a/elements/coreutils-common/jq.bst +++ /dev/null @@ -1,8 +0,0 @@ -kind: autotools -depends: -- core.bst -sources: -- kind: git - url: upstream:jq - track: jq-1.5 - ref: a5b5cbefb83935ce95ec62b9cadc8ec73026d33a diff --git a/elements/coreutils-common/less.bst b/elements/coreutils-common/less.bst deleted file mode 100644 index d960080c..00000000 --- a/elements/coreutils-common/less.bst +++ /dev/null @@ -1,8 +0,0 @@ -kind: autotools -depends: -- core.bst -sources: -- kind: git - url: upstream:less - track: baserock/morph - ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 diff --git a/elements/coreutils-common/sed.bst b/elements/coreutils-common/sed.bst deleted file mode 100644 index c2ee9626..00000000 --- a/elements/coreutils-common/sed.bst +++ /dev/null @@ -1,17 +0,0 @@ -kind: autotools -depends: -- core.bst -- coreutils-common/coreutils.bst -sources: -- kind: git - url: upstream:sed - track: baserock/morph - ref: ed4b1d7c04f92b330b940d4f0d02cd51d2473ce9 - submodules: - gnulib: - url: upstream:gnulib -config: - configure-commands: - - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf - - ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib - - ./configure --prefix="%{prefix}" --disable-gcc-warnings diff --git a/elements/coreutils-common/tar.bst b/elements/coreutils-common/tar.bst deleted file mode 100644 index 22ac46a3..00000000 --- a/elements/coreutils-common/tar.bst +++ /dev/null @@ -1,21 +0,0 @@ -kind: autotools -depends: -- core.bst -- coreutils-common/coreutils.bst -sources: -- kind: git - url: upstream:tar - track: baserock/release_1_29 - ref: 20b55f0679d314568ec21ae6db1ea635494e292b - submodules: - gnulib: - url: upstream:gnulib - paxutils: - url: upstream:paxutils -config: - configure-commands: - - bash bootstrap --skip-po --gnulib-srcdir="$(pwd)/gnulib" - - | - `# [1]` env FORCE_UNSAFE_CONFIGURE=1 \ - ./configure --prefix="%{prefix}" \ - `# [2]` --disable-gcc-warnings diff --git a/elements/coreutils.bst b/elements/coreutils.bst new file mode 100644 index 00000000..26f4b51f --- /dev/null +++ b/elements/coreutils.bst @@ -0,0 +1,20 @@ +kind: autotools +depends: +- core.bst +sources: +- kind: git + url: upstream:coreutils + track: v8.25 + ref: 68f73f23866d6137e9c8d88d86073b33588d7b56 + 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 + - FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="%{prefix}" --disable-nls + build-commands: + - make WERROR_CFLAGS= + install-commands: + - make INSTALL_PROGRAM=install DESTDIR="%{install-root}" install diff --git a/elements/deploy-tools.bst b/elements/deploy-tools.bst index 84de2e7f..1c8d7c42 100644 --- a/elements/deploy-tools.bst +++ b/elements/deploy-tools.bst @@ -3,7 +3,7 @@ description: Deployment tooling depends: - core/e2fsprogs.bst -- coreutils-common/coreutils.bst +- coreutils.bst - deploy-tools/mtools.bst - deploy-tools/parted.bst - bsp-generic/nasm.bst -- cgit v1.2.1