From d7c37a3159c949f01d802a5119fbfc575a6aff79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 27 Oct 2014 00:45:52 +0000 Subject: Move "patch" to strata/core from strata/coreutils-common --- strata/core.morph | 8 ++++++++ strata/core/patch.morph | 9 +++++++++ strata/coreutils-common.morph | 9 +-------- strata/coreutils-common/patch.morph | 9 --------- 4 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 strata/core/patch.morph delete mode 100644 strata/coreutils-common/patch.morph diff --git a/strata/core.morph b/strata/core.morph index 96731777..6f66adbc 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -302,3 +302,11 @@ chunks: - gettext - libtool - bison +- name: patch + morph: strata/core/patch.morph + repo: upstream:patch + ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f + unpetrify-ref: baserock/v2.7.1 + build-depends: + - bash + - shadow diff --git a/strata/core/patch.morph b/strata/core/patch.morph new file mode 100644 index 00000000..01d977c4 --- /dev/null +++ b/strata/core/patch.morph @@ -0,0 +1,9 @@ +name: patch +kind: chunk +configure-commands: +- bash bootstrap --skip-po +- ./configure --prefix="$PREFIX" --disable-nls +build-commands: +- make +install-commands: +- make DESTDIR="$DESTDIR" install diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index bbaabe42..9c5c38fe 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -7,16 +7,9 @@ description: | build-depends: - morph: strata/core.morph chunks: -- name: patch - morph: strata/coreutils-common/patch.morph - repo: upstream:patch - ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f - unpetrify-ref: baserock/v2.7.1 - build-depends: [] - name: coreutils morph: strata/coreutils-common/coreutils.morph repo: upstream:coreutils ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 unpetrify-ref: baserock/8.23 - build-depends: - - patch + build-depends: [] diff --git a/strata/coreutils-common/patch.morph b/strata/coreutils-common/patch.morph deleted file mode 100644 index 01d977c4..00000000 --- a/strata/coreutils-common/patch.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: patch -kind: chunk -configure-commands: -- bash bootstrap --skip-po -- ./configure --prefix="$PREFIX" --disable-nls -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install -- cgit v1.2.1