diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-01-14 13:58:13 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-01-21 11:35:05 +0000 |
| commit | 758342a7973cb185ad6d68263abc29dd3664a531 (patch) | |
| tree | 0cd4b0f6643c5a25f2ceb7179485a8150b0e5258 | |
| parent | 1b030e11ee7c0846b05a31a9cc14b268fc4de0ea (diff) | |
| download | busybox-758342a7973cb185ad6d68263abc29dd3664a531.tar.gz | |
Disable patch, so GNU patch is used
Busybox patch doesn't implement some semantic that gnulib-tool depends on.
However, the order in which staging areas are constructed is currently
undefined, so even though we install GNU patch we must also disable
Busybox patch to avoid the possibility of the latter overwriting the
former in the staging area.
| -rw-r--r-- | busybox-devel.morph | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/busybox-devel.morph b/busybox-devel.morph index 0a63fface..8cbf6bdb4 100644 --- a/busybox-devel.morph +++ b/busybox-devel.morph @@ -8,7 +8,8 @@ "sed -e 's/.*FEATURE_COMPRESS_USAGE=.*/CONFIG_FEATURE_COMPRESS_USAGE=y/' -i .config", "sed -e 's/.*FEATURE_PREFER_APPLETS=.*/# CONFIG_FEATURE_PREFER_APPLETS is not set/' -i .config", "sed -e 's/.*FEATURE_MOUNT_CIFS=.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config", - "sed -e 's/.*CONFIG_AWK=.*/# CONFIG_AWK is not set/' -i .config" + "sed -e 's/.*CONFIG_AWK=.*/# CONFIG_AWK is not set/' -i .config", + "sed -e 's/.*CONFIG_PATCH=./# CONFIG_PATCH is not set/' -i .config" ], "build-commands": [ "for f in systemd-units/ifup@.service; do sed -e 's|@rootprefix@||g' \"$f.in\" >\"$f\"; done", |