summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHurnjoo Lee <hurnjoo.lee@samsung.com>2015-12-17 11:37:39 +0900
committerHurnjoo Lee <hurnjoo.lee@samsung.com>2015-12-17 11:40:38 +0900
commit754aabd8e38dc3d6d9d8bd275347c8db174c9ad0 (patch)
tree486bedf019d896cb483a08e68abfe0f0bed65ee2
parentdb57410065811e90515b62e22945f9b96140a3ac (diff)
downloadtoybox-754aabd8e38dc3d6d9d8bd275347c8db174c9ad0.tar.gz
toybox-754aabd8e38dc3d6d9d8bd275347c8db174c9ad0.tar.bz2
toybox-754aabd8e38dc3d6d9d8bd275347c8db174c9ad0.zip
Revert "Support patch, diff, sed, grep, egrep, fgrep, find commands"
This reverts commit db57410065811e90515b62e22945f9b96140a3ac. Change-Id: I71086db47d303cce381d769566988e68846d0dd9 Signed-off-by: Hurnjoo Lee <hurnjoo.lee@samsung.com>
-rw-r--r--packaging/config18
-rw-r--r--packaging/toybox.spec15
-rw-r--r--packaging/usrbin.links8
3 files changed, 9 insertions, 32 deletions
diff --git a/packaging/config b/packaging/config
index d46a18f..4004694 100644
--- a/packaging/config
+++ b/packaging/config
@@ -49,10 +49,10 @@ CONFIG_INSTALL_Z=y
# CONFIG_ENV is not set
# CONFIG_EXPAND is not set
# CONFIG_FALSE is not set
-CONFIG_FIND=y
-CONFIG_GREP=y
-CONFIG_EGREP=y
-CONFIG_FGREP=y
+# CONFIG_FIND is not set
+# CONFIG_GREP is not set
+# CONFIG_EGREP is not set
+# CONFIG_FGREP is not set
# CONFIG_HEAD is not set
# CONFIG_ID is not set
# CONFIG_ID_Z is not set
@@ -74,13 +74,13 @@ CONFIG_MKFIFO_Z=y
# CONFIG_NOHUP is not set
# CONFIG_OD is not set
# CONFIG_PASTE is not set
-CONFIG_PATCH=y
+# CONFIG_PATCH is not set
# CONFIG_PRINTF is not set
# CONFIG_PWD is not set
# CONFIG_RENICE is not set
CONFIG_RM=y
# CONFIG_RMDIR is not set
-CONFIG_SED=y
+# CONFIG_SED is not set
# CONFIG_SLEEP is not set
# CONFIG_SLEEP_FLOAT is not set
# CONFIG_SORT is not set
@@ -102,12 +102,12 @@ CONFIG_SED=y
# CONFIG_UUENCODE is not set
# CONFIG_WC is not set
# CONFIG_WHO is not set
-CONFIG_XARGS=y
+# CONFIG_XARGS is not set
# CONFIG_XARGS_PEDANTIC is not set
#
# pending (see toys/pending/README)
-
+#
# CONFIG_ARP is not set
# CONFIG_ARPING is not set
# CONFIG_BOOTCHARTD is not set
@@ -124,7 +124,7 @@ CONFIG_XARGS=y
CONFIG_DHCP=y
CONFIG_DHCPD=y
CONFIG_DEBUG_DHCP=y
-CONFIG_DIFF=y
+# CONFIG_DIFF is not set
CONFIG_DUMPLEASES=y
# CONFIG_EXPR is not set
# CONFIG_FDISK is not set
diff --git a/packaging/toybox.spec b/packaging/toybox.spec
index 8d8f99b..dd6d12f 100644
--- a/packaging/toybox.spec
+++ b/packaging/toybox.spec
@@ -25,12 +25,6 @@ Source1003: klogd.manifest
BuildRequires : smack-devel
BuildRequires : libattr-devel
-Provides : findutils
-Provides : sed
-Provides : diffutils
-Provides : patch
-Provides : grep
-
%description
Toybox is a single binary which includes versions of a large number
of system commands, including a shell. This package can be very
@@ -124,15 +118,6 @@ cat LICENSE > $RPM_BUILD_ROOT%{_datadir}/license/toybox-symlinks-dhcpd
%{_datadir}/license/toybox
/bin/toybox
/usr/bin/nslookup
-/usr/bin/patch
-/usr/bin/diff
-/usr/bin/sed
-/usr/bin/grep
-/usr/bin/egrep
-/usr/bin/fgrep
-/usr/bin/find
-/usr/bin/xargs
-
%if "%{?profile}"=="tv"
/sbin/ping
/bin/ping
diff --git a/packaging/usrbin.links b/packaging/usrbin.links
index 2457d92..2ed0e8d 100644
--- a/packaging/usrbin.links
+++ b/packaging/usrbin.links
@@ -1,11 +1,3 @@
dumpleases
dhcp
nslookup
-patch
-diff
-sed
-grep
-egrep
-fgrep
-find
-xargs