diff options
| author | Magnus Kroken <mkroken@gmail.com> | 2017-01-15 02:21:41 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-01-29 14:09:38 +0100 |
| commit | 84da2a677a7133426829a05954af64dd533bf7a5 (patch) | |
| tree | 474210544d3977e9c4aeb753d5da6c10fba79337 /package/utils/busybox/config/findutils | |
| parent | 5d2a9d2a3a21bd360cc0956bd31335e7e3396d1d (diff) | |
| download | upstream-84da2a677a7133426829a05954af64dd533bf7a5.tar.gz upstream-84da2a677a7133426829a05954af64dd533bf7a5.tar.bz2 upstream-84da2a677a7133426829a05954af64dd533bf7a5.zip | |
busybox: update to 1.26.2
Refresh patches, delete patches that have been applied upstream.
Signed-off-by: Magnus Kroken <mkroken@gmail.com>
Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name> [fix defaults]
Diffstat (limited to 'package/utils/busybox/config/findutils')
| -rw-r--r-- | package/utils/busybox/config/findutils/Config.in | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/package/utils/busybox/config/findutils/Config.in b/package/utils/busybox/config/findutils/Config.in index 85ee1db2c3..7d636d1ac4 100644 --- a/package/utils/busybox/config/findutils/Config.in +++ b/package/utils/busybox/config/findutils/Config.in @@ -194,28 +194,22 @@ config BUSYBOX_CONFIG_GREP help grep is used to search files for a specified pattern. -config BUSYBOX_CONFIG_FEATURE_GREP_EGREP_ALIAS - bool "Enable extended regular expressions (egrep & grep -E)" - default BUSYBOX_DEFAULT_FEATURE_GREP_EGREP_ALIAS - depends on BUSYBOX_CONFIG_GREP +config BUSYBOX_CONFIG_EGREP + bool "egrep" + default BUSYBOX_DEFAULT_EGREP help - Enabled support for extended regular expressions. Extended - regular expressions allow for alternation (foo|bar), grouping, - and various repetition operators. + Alias to "grep -E" -config BUSYBOX_CONFIG_FEATURE_GREP_FGREP_ALIAS - bool "Alias fgrep to grep -F" - default BUSYBOX_DEFAULT_FEATURE_GREP_FGREP_ALIAS - depends on BUSYBOX_CONFIG_GREP +config BUSYBOX_CONFIG_FGREP + bool "fgrep" + default BUSYBOX_DEFAULT_FGREP help - fgrep sees the search pattern as a normal string rather than - regular expressions. - grep -F always works, this just creates the fgrep alias. + Alias to "grep -F" config BUSYBOX_CONFIG_FEATURE_GREP_CONTEXT bool "Enable before and after context flags (-A, -B and -C)" default BUSYBOX_DEFAULT_FEATURE_GREP_CONTEXT - depends on BUSYBOX_CONFIG_GREP + depends on BUSYBOX_CONFIG_GREP || BUSYBOX_CONFIG_EGREP help Print the specified number of leading (-B) and/or trailing (-A) context surrounding our matching lines. |