Preset: level realignment: profiles are under "Smart Devices"

Change-Id: Ice93c0dfe8f1a54d3591233c2f4eeceb5e9b43b9
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

9 files changed, 117 insertions, 99 deletions

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index e5167d7..f799940 100644
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -36,6 +36,7 @@ Source3500:	platform-preset-iot.inc
 Source3600:	platform-preset-common.inc
 Source3700:	platform-preset-home_appliance.inc
 Source3800:	platform-preset-boards.inc
+Source3900:	platform-preset-smart.inc
 
 # To get .ks files
 BuildRequires:	image-configurations
@@ -97,13 +98,8 @@ and to most domains.
 %package	category-Preset
 Summary:	Tizen Presets
 Suggests:	%{name}-root-Preset_boards
-Suggests:	%{name}-root-Preset_mobile
-Suggests:	%{name}-root-Preset_tv
-Suggests:	%{name}-root-Preset_wearable
-Suggests:	%{name}-root-Preset_ivi
+Suggests:	%{name}-root-Preset_sd
 Suggests:	%{name}-root-Preset_iot
-Suggests:	%{name}-root-Preset_common
-Suggests:	%{name}-root-Preset_home_appliance
 %description	category-Preset
 This meta pacakge lists all Tizen blocks (meta packages) designating
 Tizen platform presets, HAL/device-support presets, and
diff --git a/packaging/platform-preset-common.inc b/packaging/platform-preset-common.inc
index 379662c..e1f7e6a 100644
--- a/packaging/platform-preset-common.inc
+++ b/packaging/platform-preset-common.inc
@@ -2,13 +2,14 @@
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
 
-%package root-Preset_common
-Summary:	Common Profile Presets
-Conflicts:	%{name}-root-Preset_mobile
-Conflicts:	%{name}-root-Preset_tv
-Conflicts:	%{name}-root-Preset_wearable
-Conflicts:	%{name}-root-Preset_iot
-Conflicts:	%{name}-root-Preset_ivi
-%description root-Preset_common
+%package sub1-Preset_sd-common
+Summary:	Common Profile Presets (not included elsewhere)
+Conflicts:	%{name}-sub1-Preset_sd-mobile
+Conflicts:	%{name}-sub1-Preset_sd-tv
+Conflicts:	%{name}-sub1-Preset_sd-wearable
+Conflicts:	%{name}-sub1-Preset_sd-home_appliance
+Conflicts:	%{name}-root-Preset-iot
+Conflicts:	%{name}-sub1-Preset_sd-ivi
+%description sub1-Preset_sd-common
 Tizen Platform Presets for "Common Profile"
-%files root-Preset_common
+%files sub1-Preset_sd-common
diff --git a/packaging/platform-preset-home_appliance.inc b/packaging/platform-preset-home_appliance.inc
index 616f0d2..8b40056 100644
--- a/packaging/platform-preset-home_appliance.inc
+++ b/packaging/platform-preset-home_appliance.inc
@@ -2,14 +2,14 @@
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
 
-%package root-Preset_home_appliance
-Summary:	Presets for Home Appliances
-Conflicts:	%{name}-root-Preset_mobile
-Conflicts:	%{name}-root-Preset_tv
-Conflicts:	%{name}-root-Preset_wearable
-Conflicts:	%{name}-root-Preset_iot
-Conflicts:	%{name}-root-Preset_ivi
-Conflicts:	%{name}-root-Preset_common
-%description root-Preset_home_appliance
+%package sub1-Preset_sd-home_appliance
+Summary:	Home Appliances Presets (no profile)
+Conflicts:	%{name}-sub1-Preset_sd-mobile
+Conflicts:	%{name}-sub1-Preset_sd-tv
+Conflicts:	%{name}-sub1-Preset_sd-wearable
+Conflicts:	%{name}-root-Preset-iot
+Conflicts:	%{name}-sub1-Preset_sd-ivi
+Conflicts:	%{name}-sub1-Preset_sd-common
+%description sub1-Preset_sd-home_appliance
 Tizen Platform Presets for "Home Appliances"
-%files root-Preset_home_appliance
+%files sub1-Preset_sd-home_appliance
diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index 555019f..f2e9ffc 100644
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -2,7 +2,8 @@
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
 %package root-Preset_iot
-Summary:	IOT Device Presets
+Summary:	Presets for IOT Devices
+Conflicts:	%{name}-root-Preset_sd
 Conflicts:	%{name}-root-Preset_mobile
 Conflicts:	%{name}-root-Preset_tv
 Conflicts:	%{name}-root-Preset_wearable
diff --git a/packaging/platform-preset-ivi.inc b/packaging/platform-preset-ivi.inc
index 32260f0..c5ac5d1 100644
--- a/packaging/platform-preset-ivi.inc
+++ b/packaging/platform-preset-ivi.inc
@@ -1,22 +1,23 @@
 # Maintainer: Tizen IVI PM
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
-%package root-Preset_ivi
+%package sub1-Preset_sd-ivi
 Summary:	IVI Profile Presets
-Conflicts:	%{name}-root-Preset_mobile
-Conflicts:	%{name}-root-Preset_tv
-Conflicts:	%{name}-root-Preset_wearable
-Conflicts:	%{name}-root-Preset_iot
-Suggests:	%{name}-sub1-Preset_ivi-proto
-%description root-Preset_ivi
+Conflicts:	%{name}-sub1-Preset_sd-mobile
+Conflicts:	%{name}-sub1-Preset_sd-tv
+Conflicts:	%{name}-sub1-Preset_sd-wearable
+Conflicts:	%{name}-sub1-Preset_sd-home_appliance
+Conflicts:	%{name}-root-Preset-iot
+Suggests:	%{name}-sub2-Preset_sd-ivi-proto
+%description sub1-Preset_sd-ivi
 Tizen IVI Platform Presets
-%files root-Preset_ivi
+%files sub1-Preset_sd-ivi
 
-%package sub1-Preset_ivi-proto
-Summary:	IVI OdroidXU3 Prototype Preset
+%package sub2-Preset_sd-ivi-proto
+Summary:	IVI OdroidXU3 Prototype
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/ivi-target-odroidxu3.ks
-%description sub1-Preset_ivi-proto
-Tizen IVI Prototype Preset
-%files sub1-Preset_ivi-proto
+%description sub2-Preset_sd-ivi-proto
+Tizen IVI Prototype Preset from OdroidXU3 as an example
+%files sub2-Preset_sd-ivi-proto
 
diff --git a/packaging/platform-preset-mobile.inc b/packaging/platform-preset-mobile.inc
index 93a45f5..23eab09 100644
--- a/packaging/platform-preset-mobile.inc
+++ b/packaging/platform-preset-mobile.inc
@@ -1,29 +1,29 @@
 # Maintainer: Tizen Mobile PM
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
-%package root-Preset_mobile
+%package sub1-Preset_sd-mobile
 Summary:	Mobile Profile Presets
-Conflicts:	%{name}-root-Preset_tv
-Conflicts:	%{name}-root-Preset_wearable
-Conflicts:	%{name}-root-Preset_ivi
+Conflicts:	%{name}-sub1-Preset_sd-tv
+Conflicts:	%{name}-sub1-Preset_sd-wearable
+Conflicts:	%{name}-sub1-Preset_sd-ivi
 Conflicts:	%{name}-root-Preset_iot
-Suggests:	%{name}-sub1-Preset_mobile-tm1
-Suggests:	%{name}-sub1-Preset_mobile-tm2_aarch64
-Suggests:	%{name}-sub1-Preset_mobile-tm2_armv7l
-Suggests:	%{name}-sub1-Preset_mobile-minimal
-%description root-Preset_mobile
+Suggests:	%{name}-sub2-Preset_sd-mobile-tm1
+Suggests:	%{name}-sub2-Preset_sd-mobile-tm2_aarch64
+Suggests:	%{name}-sub2-Preset_sd-mobile-tm2_armv7l
+Suggests:	%{name}-sub2-Preset_sd-mobile-minimal
+%description sub1-Preset_sd-mobile
 Tizen Mobile Platform Presets
-%files root-Preset_mobile
+%files sub1-Preset_sd-mobile
 
 
-%package sub1-Preset_mobile-tm1
-Summary:	Mobile-TM1 Preset
-Conflicts:	%{name}-sub1-Preset_mobile-tm2_aarch64
-Conflicts:	%{name}-sub1-Preset_mobile-tm2_armv7l
-Conflicts:	%{name}-sub1-Preset_mobile-minimal
+%package sub2-Preset_sd-mobile-tm1
+Summary:	Mobile-TM1
+Conflicts:	%{name}-sub2-Preset_sd-mobile-tm2_aarch64
+Conflicts:	%{name}-sub2-Preset_sd-mobile-tm2_armv7l
+Conflicts:	%{name}-sub2-Preset_sd-mobile-minimal
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/mobile-wayland-armv7l-tm1.ks
-%description sub1-Preset_mobile-tm1
+%description sub2-Preset_sd-mobile-tm1
 Tizen Mobile TM1 Preset, which is using armv7l.
 You may use this preset for other architectures; however,
 please note that the TM1 model itself is for armv7l only.
@@ -31,40 +31,40 @@ This block is allowed for other architectures only to let
 other arch devices start with TM1 packages.
 You may need mobile + tm1 MIC post script as well.
 (TIC RECIPE for POST is not READY YET)
-%files sub1-Preset_mobile-tm1
+%files sub2-Preset_sd-mobile-tm1
 
-%package sub1-Preset_mobile-tm2_aarch64
-Summary:	Mobile-TM2 Preset (aarch64. 64bit)
-Conflicts:	%{name}-sub1-Preset_mobile-tm1
-Conflicts:	%{name}-sub1-Preset_mobile-tm2_armv7l
-Conflicts:	%{name}-sub1-Preset_mobile-minimal
+%package sub2-Preset_sd-mobile-tm2_aarch64
+Summary:	Mobile-TM2 (aarch64. 64bit)
+Conflicts:	%{name}-sub2-Preset_sd-mobile-tm1
+Conflicts:	%{name}-sub2-Preset_sd-mobile-tm2_armv7l
+Conflicts:	%{name}-sub2-Preset_sd-mobile-minimal
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/mobile-wayland-arm64-tm2.ks
-%description sub1-Preset_mobile-tm2_aarch64
+%description sub2-Preset_sd-mobile-tm2_aarch64
 Tizen Mobile TM2 Preset. This is for aarch64 architecture only.
 For architectural/post-script note, please refer to tm1 twin.
-%files sub1-Preset_mobile-tm2_aarch64
+%files sub2-Preset_sd-mobile-tm2_aarch64
 
-%package sub1-Preset_mobile-tm2_armv7l
-Summary:	Mobile-TM2 Preset (armv7l. 32bit)
-Conflicts:	%{name}-sub1-Preset_mobile-tm1
-Conflicts:	%{name}-sub1-Preset_mobile-tm2_aarch64
-Conflicts:	%{name}-sub1-Preset_mobile-minimal
+%package sub2-Preset_sd-mobile-tm2_armv7l
+Summary:	Mobile-TM2 (armv7l. 32bit)
+Conflicts:	%{name}-sub2-Preset_sd-mobile-tm1
+Conflicts:	%{name}-sub2-Preset_sd-mobile-tm2_aarch64
+Conflicts:	%{name}-sub2-Preset_sd-mobile-minimal
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/mobile-wayland-armv7l-tm2.ks
-%description sub1-Preset_mobile-tm2_armv7l
+%description sub2-Preset_sd-mobile-tm2_armv7l
 Tizen Mobile TM2 Preset. This is for armv7l architecture only.
 Although TM2 has 64bit processor, we may use 32bit userspace binaries for it.
 For architectural/post-script note, please refer to tm1 twin.
-%files sub1-Preset_mobile-tm2_armv7l
+%files sub2-Preset_sd-mobile-tm2_armv7l
 
-%package sub1-Preset_mobile-minimal
+%package sub2-Preset_sd-mobile-minimal
 Summary:	Mobile Minimal Preset
-Conflicts:	%{name}-sub1-Preset_mobile-tm1
-Conflicts:	%{name}-sub1-Preset_mobile-tm2
-%description sub1-Preset_mobile-minimal
+Conflicts:	%{name}-sub2-Preset_sd-mobile-tm1
+Conflicts:	%{name}-sub2-Preset_sd-mobile-tm2
+%description sub2-Preset_sd-mobile-minimal
 Tizen Mobile Minimal Platform Preset
 
 Mobile-PM: fill in minimal API sets for mobile profile.
 
-%files sub1-Preset_mobile-minimal
+%files sub2-Preset_sd-mobile-minimal
diff --git a/packaging/platform-preset-smart.inc b/packaging/platform-preset-smart.inc
new file mode 100644
index 0000000..cb2ba35
--- /dev/null
+++ b/packaging/platform-preset-smart.inc
@@ -0,0 +1,17 @@
+# Maintainer: Tizen PM
+# You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
+
+%package root-Preset_sd
+Summary:	Presets for Smart Devices (w/ Tizen Profiles)
+Conflicts:	%{name}-root-Preset_iot
+Suggests:	%{name}-sub1-Preset_sd-mobile
+Suggests:	%{name}-sub1-Preset_sd-wearable
+Suggests:	%{name}-sub1-Preset_sd-tv
+Suggests:	%{name}-sub1-Preset_sd-ivi
+Suggests:	%{name}-sub1-Preset_sd-common
+Suggests:	%{name}-sub1-Preset_sd-home_appliance
+%description root-Preset_sd
+Non-IoT, Traditional "Smart" Device Presets of Tizen
+Most of these are being expressed with "Tizen Profile".
+%files root-Preset_sd
+
diff --git a/packaging/platform-preset-tv.inc b/packaging/platform-preset-tv.inc
index 4837aca..c580193 100644
--- a/packaging/platform-preset-tv.inc
+++ b/packaging/platform-preset-tv.inc
@@ -1,23 +1,24 @@
 # Maintainer: Tizen TV PM
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
-%package root-Preset_tv
+%package sub1-Preset_sd-tv
 Summary:	TV Profile Presets
-Conflicts:	%{name}-root-Preset_mobile
-Conflicts:	%{name}-root-Preset_wearable
-Conflicts:	%{name}-root-Preset_ivi
-Conflicts:	%{name}-root-Preset_iot
-Suggests:	%{name}-sub1-Preset_tv-odroid
-%description root-Preset_tv
+Conflicts:	%{name}-sub1-Preset_sd-mobile
+Conflicts:	%{name}-sub1-Preset_sd-wearable
+Conflicts:	%{name}-sub1-Preset_sd-ivi
+Conflicts:	%{name}-sub1-Preset_sd-home_appliance
+Conflicts:	%{name}-root-Preset-iot
+Suggests:	%{name}-sub2-Preset_sd-tv-odroid
+%description sub1-Preset_sd-tv
 Tizen TV Platform Presets
-%files root-Preset_tv
+%files sub1-Preset_sd-tv
 
 
-%package sub1-Preset_tv-odroid
-Summary:	TV-Odroid Preset
+%package sub2-Preset_sd-tv-odroid
+Summary:	TV-Odroid
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/tv-wayland-armv7l-odroidu3.ks
-%description sub1-Preset_tv-odroid
+%description sub2-Preset_sd-tv-odroid
 Tizen TV Odroid Preset
-%files sub1-Preset_tv-odroid
+%files sub2-Preset_sd-tv-odroid
 
diff --git a/packaging/platform-preset-wearable.inc b/packaging/platform-preset-wearable.inc
index ba4be32..1a580e3 100644
--- a/packaging/platform-preset-wearable.inc
+++ b/packaging/platform-preset-wearable.inc
@@ -1,23 +1,24 @@
 # Maintainer: Tizen Wearable PM
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
-%package root-Preset_wearable
+%package sub1-Preset_sd-wearable
 Summary:	Wearable Profile Presets
-Conflicts:	%{name}-root-Preset_mobile
-Conflicts:	%{name}-root-Preset_tv
-Conflicts:	%{name}-root-Preset_ivi
-Conflicts:	%{name}-root-Preset_iot
-Suggests:	%{name}-sub1-Preset_wearable-tw2
-%description root-Preset_wearable
+Conflicts:	%{name}-sub1-Preset_sd-mobile
+Conflicts:	%{name}-sub1-Preset_sd-tv
+Conflicts:	%{name}-sub1-Preset_sd-ivi
+Conflicts:	%{name}-sub1-Preset_sd-home_appliance
+Conflicts:	%{name}-root-Preset-iot
+Suggests:	%{name}-sub2-Preset_sd-wearable-tw2
+%description sub1-Preset_sd-wearable
 Tizen Wearable Platform Presets
-%files root-Preset_wearable
+%files sub1-Preset_sd-wearable
 
 
-%package sub1-Preset_wearable-tw2
-Summary:	Wearable-TW2 Preset
+%package sub2-Preset_sd-wearable-tw2
+Summary:	Wearable-TW2
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/wearable-wayland-armv7l-tw2.ks
-%description sub1-Preset_wearable-tw2
+%description sub2-Preset_sd-wearable-tw2
 Tizen Wearable TW1 (Gear 2) Preset
-%files sub1-Preset_wearable-tw2
+%files sub2-Preset_sd-wearable-tw2