summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-02-18 16:16:55 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-02-19 10:46:52 +0000
commit6fb1dcb95adc5be6ff9f2e7d9f3a49236f31eed2 (patch)
tree541238dd6884a76fead8437f3638709a18bd3a8a
parenteeb9014f28e3aa00673a0fad127e7420da4392db (diff)
downloadbusybox-baserock/pedroalvarez/enable-patch.tar.gz
Install 'busybox patch' but remove the symlinkbaserock/pedroalvarez/enable-patch
-rw-r--r--busybox.morph8
1 files changed, 4 insertions, 4 deletions
diff --git a/busybox.morph b/busybox.morph
index 74da16ddc..c53802c38 100644
--- a/busybox.morph
+++ b/busybox.morph
@@ -17,10 +17,6 @@ configure-commands:
# Depends on stuff that was removed since eglibc 2.14.
- sed -e 's/CONFIG_INETD=y.*/# CONFIG_INETD is not set/' -i .config
- # Busybox Patch is incompatible enough with GNU Patch that it can't be
- # used for GNULib projects built from Git.
- - sed -e 's/CONFIG_PATCH=y.*/# CONFIG_PATCH is not set/' -i .config
-
# None of this is needed because we have kmod; and it actually breaks the
# Linux build because depmod isn't compatible enough with util-linux's.
- sed -e 's/CONFIG_DEPMOD=y.*/# CONFIG_DEPMOD is not set/' -i .config
@@ -116,3 +112,7 @@ install-commands:
MANDATORY_MANPATH /usr/share/man
MANDATORY_MANPATH /usr/local/share/man
EOF
+
+ # Busybox Patch is incompatible enough with GNU Patch that it can't be
+ # used for GNULib projects built from Git.
+ - rm "$DESTDIR$PREFIX"/bin/patch