From 1a23c1e68d46c2f9b2ccb4b7cdd61fadc44a7530 Mon Sep 17 00:00:00 2001
From: MyungJoo Ham <myungjoo.ham@samsung.com>
Date: Wed, 10 Aug 2016 17:14:08 +0900
Subject: [PATCH] Defragment per-profile dependencies

General packages especially at lower layers should avoid
being direclty dependent on profile information, which
enforces build system to build things redundantly and
makes much difficult to configure a system.

Change-Id: I5ee2715c537c4ad61c903a436bd8f8552111bd49
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
---
 packaging/bin_tv.links  |  2 --
 packaging/sbin_tv.links |  2 --
 packaging/toybox.spec   | 54 ++++++++++++++++++++++++++++++++++++++-----------
 packaging/usrbin.links  |  2 ++
 4 files changed, 44 insertions(+), 16 deletions(-)
 delete mode 100644 packaging/bin_tv.links
 delete mode 100644 packaging/sbin_tv.links

diff --git a/packaging/bin_tv.links b/packaging/bin_tv.links
deleted file mode 100644
index 5c3aa65..0000000
--- a/packaging/bin_tv.links
+++ /dev/null
@@ -1,2 +0,0 @@
-ping
-ping6
diff --git a/packaging/sbin_tv.links b/packaging/sbin_tv.links
deleted file mode 100644
index 5c3aa65..0000000
--- a/packaging/sbin_tv.links
+++ /dev/null
@@ -1,2 +0,0 @@
-ping
-ping6
diff --git a/packaging/toybox.spec b/packaging/toybox.spec
index c94e836..78a2f24 100644
--- a/packaging/toybox.spec
+++ b/packaging/toybox.spec
@@ -7,13 +7,8 @@ License: BSD-2.0
 URL: http://www.landley.net/toybox/
 Source: %{name}-%{version}.tar.bz2
 Source1: config
-%if "%{?profile}"=="tv"
-Source2: bin_tv.links
-Source3: sbin_tv.links
-%else
 Source2: bin.links
 Source3: sbin.links
-%endif
 Source4: usrbin.links
 Source5: usrsbin.links
 Source1001: toybox.manifest
@@ -43,6 +38,30 @@ Requires: %{name} = %{version}-%{release}
 %description symlinks-dhcpd
 ToyBox symlinks for utilities corresponding to 'dhcpd' package.
 
+%package symlinks-ping
+Group: Base/Utilities
+Summary: ToyBox symlinks to provide 'ping'
+Requires: %{name} = %{version}-%{release}
+
+%description symlinks-ping
+ToyBox symlinks for utilities corresponding to 'ping' package.
+
+%package symlinks-ping6
+Group: Base/Utilities
+Summary: ToyBox symlinks to provide 'ping6'
+Requires: %{name} = %{version}-%{release}
+
+%description symlinks-ping6
+ToyBox symlinks for utilities corresponding to 'ping6' package.
+
+%package symlinks-nslookup
+Group: Base/Utilities
+Summary: ToyBox symlinks to provide 'nslookup'
+Requires: %{name} = %{version}-%{release}
+
+%description symlinks-nslookup
+ToyBox symlinks for utilities corresponding to 'nslookup' package.
+
 %prep
 %setup -q
 
@@ -77,13 +96,6 @@ popd
 %license LICENSE.BSD
 %defattr(-,root,root,-)
 /bin/toybox
-/usr/bin/nslookup
-%if "%{?profile}"=="tv"
-/sbin/ping
-/bin/ping
-/sbin/ping6
-/bin/ping6
-%endif
 
 %files symlinks-dhcp
 %manifest toybox.manifest
@@ -97,3 +109,21 @@ popd
 %defattr(-,root,root,-)
 %{_bindir}/dumpleases
 %{_sbindir}/dhcpd
+
+%files symlinks-ping
+%manifest toybox.manifest
+%license LICENSE.BSD
+%defattr(-,root,root,-)
+%{_bindir}/ping
+
+%files symlinks-ping6
+%manifest toybox.manifest
+%license LICENSE.BSD
+%defattr(-,root,root,-)
+%{_bindir}/ping6
+
+%files symlinks-nslookup
+%manifest toybox.manifest
+%license LICENSE.BSD
+%defattr(-,root,root,-)
+%{_bindir}/nslookup
diff --git a/packaging/usrbin.links b/packaging/usrbin.links
index 2ed0e8d..4df9fd8 100644
--- a/packaging/usrbin.links
+++ b/packaging/usrbin.links
@@ -1,3 +1,5 @@
 dumpleases
 dhcp
 nslookup
+ping
+ping6
-- 
2.7.4