summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-11-22 02:15:21 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-11-22 02:15:21 (GMT)
commit7c6ed78aaa6f7252212869ab576eae1559645a3e (patch)
tree5243c350f7139c1fff1baf27b240ec1c539471a7
parentf9d091316ddaac7b278080f576c37b733427de8b (diff)
downloadbusybox-7c6ed78aaa6f7252212869ab576eae1559645a3e.tar.gz
busybox-7c6ed78aaa6f7252212869ab576eae1559645a3e.tar.bz2
patch: remove out-of-file build machinery
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--editors/Config.src6
-rw-r--r--editors/Kbuild.src1
-rw-r--r--include/applets.src.h1
-rw-r--r--include/usage.src.h23
4 files changed, 0 insertions, 31 deletions
diff --git a/editors/Config.src b/editors/Config.src
index fc824cc..201ee6e 100644
--- a/editors/Config.src
+++ b/editors/Config.src
@@ -60,12 +60,6 @@ config ED
Small, simple, evil. Part of SUSv3. If you're not already using
this, you don't need it.
-config PATCH
- bool "patch"
- default y
- help
- Apply a unified diff formatted patch.
-
config SED
bool "sed"
default y
diff --git a/editors/Kbuild.src b/editors/Kbuild.src
index 9812806..2f23ae1 100644
--- a/editors/Kbuild.src
+++ b/editors/Kbuild.src
@@ -11,6 +11,5 @@ lib-$(CONFIG_AWK) += awk.o
lib-$(CONFIG_CMP) += cmp.o
lib-$(CONFIG_DIFF) += diff.o
lib-$(CONFIG_ED) += ed.o
-lib-$(CONFIG_PATCH) += patch.o
lib-$(CONFIG_SED) += sed.o
lib-$(CONFIG_VI) += vi.o
diff --git a/include/applets.src.h b/include/applets.src.h
index 879dbf7..06b4fff 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -261,7 +261,6 @@ IF_OD(APPLET(od, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_OPENVT(APPLET(openvt, _BB_DIR_USR_BIN, _BB_SUID_DROP))
//IF_PARSE(APPLET(parse, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_PASSWD(APPLET(passwd, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE))
-IF_PATCH(APPLET(patch, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_PGREP(APPLET(pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_PIDOF(APPLET(pidof, _BB_DIR_BIN, _BB_SUID_DROP))
IF_PING(APPLET(ping, _BB_DIR_BIN, _BB_SUID_MAYBE))
diff --git a/include/usage.src.h b/include/usage.src.h
index 37b9d07..30fef24 100644
--- a/include/usage.src.h
+++ b/include/usage.src.h
@@ -2817,29 +2817,6 @@ INSERT
"\n -m Use MD5 encryption instead of DES" \
)
-#define patch_trivial_usage \
- "[OPTIONS] [ORIGFILE [PATCHFILE]]"
-#define patch_full_usage "\n\n" \
- IF_LONG_OPTS( \
- " -p,--strip N Strip N leading components from file names" \
- "\n -i,--input DIFF Read DIFF instead of stdin" \
- "\n -R,--reverse Reverse patch" \
- "\n -N,--forward Ignore already applied patches" \
- "\n --dry-run Don't actually change files" \
- "\n -E,--remove-empty-files Remove output files if they become empty" \
- ) \
- IF_NOT_LONG_OPTS( \
- " -p N Strip N leading components from file names" \
- "\n -i DIFF Read DIFF instead of stdin" \
- "\n -R Reverse patch" \
- "\n -N Ignore already applied patches" \
- "\n -E Remove output files if they become empty" \
- )
-
-#define patch_example_usage \
- "$ patch -p1 < example.diff\n" \
- "$ patch -p0 -i example.diff"
-
#define pgrep_trivial_usage \
"[-flnovx] [-s SID|-P PPID|PATTERN]"
#define pgrep_full_usage "\n\n" \