summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-18 21:06:39 +0000
committerJavier Jardón <jjardon@gnome.org>2015-02-18 21:08:17 +0000
commit35e72ecf8935d92b73af2438f9ac2f8c83e52fc5 (patch)
tree3455c30b0b25d2e2b2aef4018470cbb4fe2ccacb
parent6e934a1b4d9d6725c095c2d0b019ac43e4d652a7 (diff)
parent8d2e6b6c7a764284e7dacc15698452d6e19be977 (diff)
downloaddefinitions-35e72ecf8935d92b73af2438f9ac2f8c83e52fc5.tar.gz
Merge branch 'baserock/jjardon/sed_diff'
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed by: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@gmail.com>
-rw-r--r--strata/coreutils-common.morph14
-rw-r--r--strata/coreutils-common/diff.morph6
-rw-r--r--strata/coreutils-common/sed.morph11
3 files changed, 31 insertions, 0 deletions
diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph
index 9c5c38fe..2051cf50 100644
--- a/strata/coreutils-common.morph
+++ b/strata/coreutils-common.morph
@@ -13,3 +13,17 @@ chunks:
ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22
unpetrify-ref: baserock/8.23
build-depends: []
+- name: sed
+ morph: strata/coreutils-common/sed.morph
+ repo: upstream:sed
+ ref: ed4b1d7c04f92b330b940d4f0d02cd51d2473ce9
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - coreutils
+- name: diff
+ morph: strata/coreutils-common/diff.morph
+ repo: upstream:diffutils
+ ref: bd86eb1a1e87ab85a7c8dbb658fa829ce69c252e
+ unpetrify-ref: baserock/v3.3
+ build-depends:
+ - coreutils
diff --git a/strata/coreutils-common/diff.morph b/strata/coreutils-common/diff.morph
new file mode 100644
index 00000000..7d783d71
--- /dev/null
+++ b/strata/coreutils-common/diff.morph
@@ -0,0 +1,6 @@
+name: diff
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./bootstrap --skip-po
+- ./configure --prefix="$PREFIX"
diff --git a/strata/coreutils-common/sed.morph b/strata/coreutils-common/sed.morph
new file mode 100644
index 00000000..e426afe7
--- /dev/null
+++ b/strata/coreutils-common/sed.morph
@@ -0,0 +1,11 @@
+me: sed
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./bootstrap --skip-po
+- ./configure --prefix="$PREFIX" --disable-gcc-warnings
+post-install-commands:
+# This hack is to use GNU sed instead the busybox one.
+# This will dissappear when we merge /usr/bin and /bin.
+- mkdir -p "$DESTDIR"/bin/
+- ln -sf ../usr/bin/sed "$DESTDIR"/bin/