From 632c674222763a4f0d8ca066862a39d221866ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 23 Mar 2015 04:05:00 +0000 Subject: Move 'tar' from webtools to coreutils-common stratum Change-Id: I18c5cb1185bf6c53032a7c4bd29f33598eac7031 --- strata/coreutils-common.morph | 7 +++++++ strata/coreutils-common/tar.morph | 10 ++++++++++ strata/webtools.morph | 5 ----- strata/webtools/tar.morph | 10 ---------- 4 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 strata/coreutils-common/tar.morph delete mode 100644 strata/webtools/tar.morph diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index f226f50b..430e3fe5 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -26,3 +26,10 @@ chunks: unpetrify-ref: baserock/v3.3 build-depends: - coreutils +- name: tar + morph: strata/coreutils-common/tar.morph + repo: upstream:tar + ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37 + unpetrify-ref: baserock/release_1_28 + build-depends: + - coreutils diff --git a/strata/coreutils-common/tar.morph b/strata/coreutils-common/tar.morph new file mode 100644 index 00000000..9219abeb --- /dev/null +++ b/strata/coreutils-common/tar.morph @@ -0,0 +1,10 @@ +name: tar +kind: chunk +configure-commands: +- bash bootstrap --skip-po +- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin + --disable-nls --disable-gcc-warnings +build-commands: +- make +install-commands: +- make DESTDIR="$DESTDIR" install diff --git a/strata/webtools.morph b/strata/webtools.morph index 68ce80d5..17a1abda 100644 --- a/strata/webtools.morph +++ b/strata/webtools.morph @@ -14,11 +14,6 @@ chunks: repo: upstream:libgit2 ref: 4b0a36e881506a02b43a4ae3c19c93c919b36eeb unpetrify-ref: master -- name: tar - morph: strata/webtools/tar.morph - repo: upstream:tar - ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37 - unpetrify-ref: baserock/release_1_28 - name: nginx morph: strata/webtools/nginx.morph repo: upstream:nginx diff --git a/strata/webtools/tar.morph b/strata/webtools/tar.morph deleted file mode 100644 index 9219abeb..00000000 --- a/strata/webtools/tar.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: tar -kind: chunk -configure-commands: -- bash bootstrap --skip-po -- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin - --disable-nls --disable-gcc-warnings -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install -- cgit v1.2.1