From db57410065811e90515b62e22945f9b96140a3ac Mon Sep 17 00:00:00 2001 From: Hurnjoo Lee Date: Wed, 11 Nov 2015 18:01:34 +0900 Subject: [PATCH] Support patch, diff, sed, grep, egrep, fgrep, find commands Change-Id: I13abf52981096e383bf2abb0afb013a9f02d5e05 Signed-off-by: Hurnjoo Lee --- packaging/config | 18 +++++++++--------- packaging/toybox.spec | 15 +++++++++++++++ packaging/usrbin.links | 8 ++++++++ 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/packaging/config b/packaging/config index 4004694..d46a18f 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 is not set -# CONFIG_GREP is not set -# CONFIG_EGREP is not set -# CONFIG_FGREP is not set +CONFIG_FIND=y +CONFIG_GREP=y +CONFIG_EGREP=y +CONFIG_FGREP=y # 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 is not set +CONFIG_PATCH=y # 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 is not set +CONFIG_SED=y # CONFIG_SLEEP is not set # CONFIG_SLEEP_FLOAT is not set # CONFIG_SORT is not set @@ -102,12 +102,12 @@ CONFIG_RM=y # CONFIG_UUENCODE is not set # CONFIG_WC is not set # CONFIG_WHO is not set -# CONFIG_XARGS is not set +CONFIG_XARGS=y # 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_RM=y CONFIG_DHCP=y CONFIG_DHCPD=y CONFIG_DEBUG_DHCP=y -# CONFIG_DIFF is not set +CONFIG_DIFF=y CONFIG_DUMPLEASES=y # CONFIG_EXPR is not set # CONFIG_FDISK is not set diff --git a/packaging/toybox.spec b/packaging/toybox.spec index dd6d12f..8d8f99b 100644 --- a/packaging/toybox.spec +++ b/packaging/toybox.spec @@ -25,6 +25,12 @@ 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 @@ -118,6 +124,15 @@ 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 2ed0e8d..2457d92 100644 --- a/packaging/usrbin.links +++ b/packaging/usrbin.links @@ -1,3 +1,11 @@ dumpleases dhcp nslookup +patch +diff +sed +grep +egrep +fgrep +find +xargs -- 2.7.4