diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-11-22 03:15:21 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-11-22 03:15:21 +0100 |
commit | 7c6ed78aaa6f7252212869ab576eae1559645a3e (patch) | |
tree | 5243c350f7139c1fff1baf27b240ec1c539471a7 | |
parent | f9d091316ddaac7b278080f576c37b733427de8b (diff) | |
download | busybox-w32-7c6ed78aaa6f7252212869ab576eae1559645a3e.tar.gz busybox-w32-7c6ed78aaa6f7252212869ab576eae1559645a3e.tar.bz2 busybox-w32-7c6ed78aaa6f7252212869ab576eae1559645a3e.zip |
patch: remove out-of-file build machinery
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | editors/Config.src | 6 | ||||
-rw-r--r-- | editors/Kbuild.src | 1 | ||||
-rw-r--r-- | include/applets.src.h | 1 | ||||
-rw-r--r-- | include/usage.src.h | 23 |
4 files changed, 0 insertions, 31 deletions
diff --git a/editors/Config.src b/editors/Config.src index fc824ccd5..201ee6eb9 100644 --- a/editors/Config.src +++ b/editors/Config.src | |||
@@ -60,12 +60,6 @@ config ED | |||
60 | Small, simple, evil. Part of SUSv3. If you're not already using | 60 | Small, simple, evil. Part of SUSv3. If you're not already using |
61 | this, you don't need it. | 61 | this, you don't need it. |
62 | 62 | ||
63 | config PATCH | ||
64 | bool "patch" | ||
65 | default y | ||
66 | help | ||
67 | Apply a unified diff formatted patch. | ||
68 | |||
69 | config SED | 63 | config SED |
70 | bool "sed" | 64 | bool "sed" |
71 | default y | 65 | default y |
diff --git a/editors/Kbuild.src b/editors/Kbuild.src index 98128064d..2f23ae12f 100644 --- a/editors/Kbuild.src +++ b/editors/Kbuild.src | |||
@@ -11,6 +11,5 @@ lib-$(CONFIG_AWK) += awk.o | |||
11 | lib-$(CONFIG_CMP) += cmp.o | 11 | lib-$(CONFIG_CMP) += cmp.o |
12 | lib-$(CONFIG_DIFF) += diff.o | 12 | lib-$(CONFIG_DIFF) += diff.o |
13 | lib-$(CONFIG_ED) += ed.o | 13 | lib-$(CONFIG_ED) += ed.o |
14 | lib-$(CONFIG_PATCH) += patch.o | ||
15 | lib-$(CONFIG_SED) += sed.o | 14 | lib-$(CONFIG_SED) += sed.o |
16 | lib-$(CONFIG_VI) += vi.o | 15 | lib-$(CONFIG_VI) += vi.o |
diff --git a/include/applets.src.h b/include/applets.src.h index 879dbf760..06b4fff35 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)) | |||
261 | IF_OPENVT(APPLET(openvt, _BB_DIR_USR_BIN, _BB_SUID_DROP)) | 261 | IF_OPENVT(APPLET(openvt, _BB_DIR_USR_BIN, _BB_SUID_DROP)) |
262 | //IF_PARSE(APPLET(parse, _BB_DIR_USR_BIN, _BB_SUID_DROP)) | 262 | //IF_PARSE(APPLET(parse, _BB_DIR_USR_BIN, _BB_SUID_DROP)) |
263 | IF_PASSWD(APPLET(passwd, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE)) | 263 | IF_PASSWD(APPLET(passwd, _BB_DIR_USR_BIN, _BB_SUID_REQUIRE)) |
264 | IF_PATCH(APPLET(patch, _BB_DIR_USR_BIN, _BB_SUID_DROP)) | ||
265 | IF_PGREP(APPLET(pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP)) | 264 | IF_PGREP(APPLET(pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP)) |
266 | IF_PIDOF(APPLET(pidof, _BB_DIR_BIN, _BB_SUID_DROP)) | 265 | IF_PIDOF(APPLET(pidof, _BB_DIR_BIN, _BB_SUID_DROP)) |
267 | IF_PING(APPLET(ping, _BB_DIR_BIN, _BB_SUID_MAYBE)) | 266 | IF_PING(APPLET(ping, _BB_DIR_BIN, _BB_SUID_MAYBE)) |
diff --git a/include/usage.src.h b/include/usage.src.h index 37b9d0747..30fef2440 100644 --- a/include/usage.src.h +++ b/include/usage.src.h | |||
@@ -2817,29 +2817,6 @@ INSERT | |||
2817 | "\n -m Use MD5 encryption instead of DES" \ | 2817 | "\n -m Use MD5 encryption instead of DES" \ |
2818 | ) | 2818 | ) |
2819 | 2819 | ||
2820 | #define patch_trivial_usage \ | ||
2821 | "[OPTIONS] [ORIGFILE [PATCHFILE]]" | ||
2822 | #define patch_full_usage "\n\n" \ | ||
2823 | IF_LONG_OPTS( \ | ||
2824 | " -p,--strip N Strip N leading components from file names" \ | ||
2825 | "\n -i,--input DIFF Read DIFF instead of stdin" \ | ||
2826 | "\n -R,--reverse Reverse patch" \ | ||
2827 | "\n -N,--forward Ignore already applied patches" \ | ||
2828 | "\n --dry-run Don't actually change files" \ | ||
2829 | "\n -E,--remove-empty-files Remove output files if they become empty" \ | ||
2830 | ) \ | ||
2831 | IF_NOT_LONG_OPTS( \ | ||
2832 | " -p N Strip N leading components from file names" \ | ||
2833 | "\n -i DIFF Read DIFF instead of stdin" \ | ||
2834 | "\n -R Reverse patch" \ | ||
2835 | "\n -N Ignore already applied patches" \ | ||
2836 | "\n -E Remove output files if they become empty" \ | ||
2837 | ) | ||
2838 | |||
2839 | #define patch_example_usage \ | ||
2840 | "$ patch -p1 < example.diff\n" \ | ||
2841 | "$ patch -p0 -i example.diff" | ||
2842 | |||
2843 | #define pgrep_trivial_usage \ | 2820 | #define pgrep_trivial_usage \ |
2844 | "[-flnovx] [-s SID|-P PPID|PATTERN]" | 2821 | "[-flnovx] [-s SID|-P PPID|PATTERN]" |
2845 | #define pgrep_full_usage "\n\n" \ | 2822 | #define pgrep_full_usage "\n\n" \ |