mirror of
https://github.com/topjohnwu/ndk-busybox.git
synced 2024-12-13 23:08:53 +00:00
patch: remove out-of-file build machinery
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
f9d091316d
commit
7c6ed78aaa
@ -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
|
||||
|
@ -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
|
||||
|
@ -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))
|
||||
|
@ -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" \
|
||||
|
Loading…
Reference in New Issue
Block a user