From c9eeb560fbe6f56a710bbe726e23226c8ff85fef Mon Sep 17 00:00:00 2001 From: Esben Haabendal Date: Wed, 21 Oct 2015 10:02:04 +0200 Subject: [PATCH 1/5] busybox: Enable fgrep alias by default Signed-off-by: Esben Haabendal --- recipes/busybox/busybox-configure.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/busybox/busybox-configure.inc b/recipes/busybox/busybox-configure.inc index ee873e209..ebacbfd00 100644 --- a/recipes/busybox/busybox-configure.inc +++ b/recipes/busybox/busybox-configure.inc @@ -668,7 +668,7 @@ BUSYBOX_SIMPLE_USE_FLAGS += "grep=1:util/" BUSYBOX_SIMPLE_USE_FLAGS += "feature_grep_egrep_alias=1" # USE flag: enable feature grep fgrep alias -BUSYBOX_SIMPLE_USE_FLAGS += "feature_grep_fgrep_alias" +BUSYBOX_SIMPLE_USE_FLAGS += "feature_grep_fgrep_alias=1" # USE flag: enable feature grep context BUSYBOX_SIMPLE_USE_FLAGS += "feature_grep_context" From 19a68183de964582c0c3cab7f59424d6033f5659 Mon Sep 17 00:00:00 2001 From: Esben Haabendal Date: Wed, 21 Oct 2015 10:24:50 +0200 Subject: [PATCH 2/5] busybox: Add busybox_gzip USE flag * Keep gzip command enabled by default, but support disable with USE flag * USE flag also enables seamless gzip support Signed-off-by: Esben Haabendal --- recipes/busybox/busybox-1.23.1/defconfig | 2 +- recipes/busybox/busybox-configure.inc | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/busybox/busybox-1.23.1/defconfig b/recipes/busybox/busybox-1.23.1/defconfig index b9501752b..5dbe7b770 100644 --- a/recipes/busybox/busybox-1.23.1/defconfig +++ b/recipes/busybox/busybox-1.23.1/defconfig @@ -134,7 +134,7 @@ CONFIG_FEATURE_SEAMLESS_GZ=y # CONFIG_DPKG_DEB is not set # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set # CONFIG_GUNZIP is not set -CONFIG_GZIP=y +# CONFIG_GZIP is not set # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set # CONFIG_LZOP is not set # CONFIG_LZOP_COMPR_HIGH is not set diff --git a/recipes/busybox/busybox-configure.inc b/recipes/busybox/busybox-configure.inc index ebacbfd00..4910639fe 100644 --- a/recipes/busybox/busybox-configure.inc +++ b/recipes/busybox/busybox-configure.inc @@ -553,6 +553,11 @@ BUSYBOX_SIMPLE_USE_FLAGS += "traceroute:util/" # USE flag: enable cttyhack utility BUSYBOX_SIMPLE_USE_FLAGS += "cttyhack:util/" +# USE flag: enable gzip utility +BUSYBOX_SIMPLE_USE_FLAGS += "gzip=1:util/:\ +CONFIG_GZIP,\ +CONFIG_FEATURE_TAR_SEAMLESS_GZ" + # USE flag: enable gunzip utility BUSYBOX_SIMPLE_USE_FLAGS += "gunzip:util/" From 9cff01a8e31a0863ad716cd41f814fcae4b258b8 Mon Sep 17 00:00:00 2001 From: Esben Haabendal Date: Wed, 21 Oct 2015 10:25:50 +0200 Subject: [PATCH 3/5] busybox: Add gunzip USE flag and default it to enabled Signed-off-by: Esben Haabendal --- recipes/busybox/busybox-configure.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/busybox/busybox-configure.inc b/recipes/busybox/busybox-configure.inc index 4910639fe..0adf96c22 100644 --- a/recipes/busybox/busybox-configure.inc +++ b/recipes/busybox/busybox-configure.inc @@ -559,7 +559,10 @@ CONFIG_GZIP,\ CONFIG_FEATURE_TAR_SEAMLESS_GZ" # USE flag: enable gunzip utility -BUSYBOX_SIMPLE_USE_FLAGS += "gunzip:util/" +BUSYBOX_SIMPLE_USE_FLAGS += "gunzip=1:util/:\ +CONFIG_GUNZIP,\ +CONFIG_FEATURE_TAR_SEAMLESS_GZ,\ +CONFIG_FEATURE_TAR_AUTODETECT" # USE flag: enable bzip2 utility BUSYBOX_SIMPLE_USE_FLAGS += "bzip2:util/" From b8c49e743b79a3eb92a7911d65902b32abe5e09a Mon Sep 17 00:00:00 2001 From: Esben Haabendal Date: Wed, 21 Oct 2015 10:27:53 +0200 Subject: [PATCH 4/5] busybox: Add support for seamless bzip2/bunzip2 Signed-off-by: Esben Haabendal --- recipes/busybox/busybox-configure.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes/busybox/busybox-configure.inc b/recipes/busybox/busybox-configure.inc index 0adf96c22..bd92d52ab 100644 --- a/recipes/busybox/busybox-configure.inc +++ b/recipes/busybox/busybox-configure.inc @@ -565,10 +565,15 @@ CONFIG_FEATURE_TAR_SEAMLESS_GZ,\ CONFIG_FEATURE_TAR_AUTODETECT" # USE flag: enable bzip2 utility -BUSYBOX_SIMPLE_USE_FLAGS += "bzip2:util/" +BUSYBOX_SIMPLE_USE_FLAGS += "bzip2:util/:\ +CONFIG_BZIP2,\ +CONFIG_FEATURE_TAR_SEAMLESS_BZ2" # USE flag: enable bunzip2 utility -BUSYBOX_SIMPLE_USE_FLAGS += "bunzip2:util/" +BUSYBOX_SIMPLE_USE_FLAGS += "bunzip2:util/:\ +CONFIG_BUNZIP2,\ +CONFIG_FEATURE_TAR_SEAMLESS_BZ2,\ +CONFIG_FEATURE_TAR_AUTODETECT" # USE flag: enable tar oldgnu compatibility BUSYBOX_SIMPLE_USE_FLAGS += "feature_tar_oldgnu_compatibility" From 731f233b589f20ff8e066384b0d1d5bfbea38fb4 Mon Sep 17 00:00:00 2001 From: Esben Haabendal Date: Wed, 21 Oct 2015 10:28:23 +0200 Subject: [PATCH 5/5] busybox: Enable clear command by default It is really small, and generally useful. Signed-off-by: Esben Haabendal --- recipes/busybox/busybox-configure.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/busybox/busybox-configure.inc b/recipes/busybox/busybox-configure.inc index bd92d52ab..07d507e19 100644 --- a/recipes/busybox/busybox-configure.inc +++ b/recipes/busybox/busybox-configure.inc @@ -654,7 +654,7 @@ BUSYBOX_SIMPLE_USE_FLAGS += "feature_preserve_hardlinks" BUSYBOX_SIMPLE_USE_FLAGS += "chvt:util/" # USE flag: enable clear utility -BUSYBOX_SIMPLE_USE_FLAGS += "clear:util/" +BUSYBOX_SIMPLE_USE_FLAGS += "clear=1:util/" # USE flag: enable deallocvt utility BUSYBOX_SIMPLE_USE_FLAGS += "deallocvt:util/"