summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-08-22 15:06:43 (GMT)
committerJavier Jardón <jjardon@gnome.org>2016-08-22 15:43:49 (GMT)
commitaf41a2b08266be193a5618ab224d7a199a08f4b7 (patch)
treeab34cc6144c87c2554ad2db8eb081d12e7aa1230
parent3a610540dcedd99e8e81e15166413c76af31b1d3 (diff)
downloaddefinitions-jjardon/usr-merge-pre.tar.gz
Change-Id: Ifd430e3714822380111f721824488e1bbcbbec1e
-rw-r--r--strata/coreutils-common/coreutils.morph5
-rw-r--r--strata/coreutils-common/sed.morph5
2 files changed, 0 insertions, 10 deletions
diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph
index 3071cb9..ad6b2c3 100644
--- a/strata/coreutils-common/coreutils.morph
+++ b/strata/coreutils-common/coreutils.morph
@@ -10,8 +10,3 @@ build-commands:
- make WERROR_CFLAGS=
install-commands:
- make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install
-# This hack is for supporting "fdatasync" argument in "dd" command
-# which busybox "dd" does not support.
-# This hack should dissappear when we merge /usr/bin and /bin.
-- mkdir -p "$DESTDIR"/bin/
-- ln -sf ../usr/bin/dd "$DESTDIR"/bin/
diff --git a/strata/coreutils-common/sed.morph b/strata/coreutils-common/sed.morph
index 75b969d..87ace80 100644
--- a/strata/coreutils-common/sed.morph
+++ b/strata/coreutils-common/sed.morph
@@ -6,8 +6,3 @@ pre-configure-commands:
- ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
configure-commands:
- ./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/