Preset: refactored and releveled

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

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index 04d923b5ea96a80d0e6b0c0c07f116196e0c3509..64f73e7b11d2532dce932d9f166d9b922debfe3c 100644 (file)
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -96,7 +96,13 @@ and to most domains.
 
 %package       category-presets
 Summary:       Tizen Presets
-Suggests:      %{name}-root-preset
+Suggests:      %{name}-root-preset-mobile
+Suggests:      %{name}-root-preset-tv
+Suggests:      %{name}-root-preset-wearable
+Suggests:      %{name}-root-preset-ivi
+Suggests:      %{name}-root-preset-iot
+Suggests:      %{name}-root-preset-common
+Suggests:      %{name}-root-preset-home_appliance
 %description   category-presets
 This meta pacakge lists all Tizen blocks (meta packages) designating
 Tizen platform presets, HAL/device-support presets, and
@@ -177,6 +183,12 @@ python ./rule_checker.py
 
 # Tizen Platform Presets.
 # Unlike Preset-Recipes of TIC, you cannot deselect packages from these presets.
-%include_if_mainbuild %{SOURCE3000}
+%include_if_mainbuild %{SOURCE3100}
+%include_if_mainbuild %{SOURCE3200}
+%include_if_mainbuild %{SOURCE3300}
+%include_if_mainbuild %{SOURCE3400}
+%include_if_mainbuild %{SOURCE3500}
+%include_if_mainbuild %{SOURCE3600}
+%include_if_mainbuild %{SOURCE3700}
 
 

diff --git a/packaging/platform-preset-common.inc b/packaging/platform-preset-common.inc
index 1b476a8bb29a06df0032b793d8e318704beaf6b5..ccf93ab91c399ff36c279c90daeba820252c7771 100644 (file)
--- a/packaging/platform-preset-common.inc
+++ b/packaging/platform-preset-common.inc
@@ -2,13 +2,13 @@
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
 
-%package sub1-preset-common
+%package root-preset-common
 Summary:       Common Profile Presets
-Conflicts:     %{name}-sub1-preset-mobile
-Conflicts:     %{name}-sub1-preset-tv
-Conflicts:     %{name}-sub1-preset-wearable
-Conflicts:     %{name}-sub1-preset-iot
-Conflicts:     %{name}-sub1-preset-ivi
-%description sub1-preset-common
+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
 Tizen Platform Presets for "Common Profile"
-%files sub1-preset-common
+%files root-preset-common

diff --git a/packaging/platform-preset-home_appliance.inc b/packaging/platform-preset-home_appliance.inc
index 200638607d8182c762bf9ec13212a326d2677f25..956f7d69694b4a263ec781a0639b25886b345b87 100644 (file)
--- 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 sub1-preset-home_appliance
+%package root-preset-home_appliance
 Summary:       Common Profile Presets
-Conflicts:     %{name}-sub1-preset-mobile
-Conflicts:     %{name}-sub1-preset-tv
-Conflicts:     %{name}-sub1-preset-wearable
-Conflicts:     %{name}-sub1-preset-iot
-Conflicts:     %{name}-sub1-preset-ivi
-Conflicts:     %{name}-sub1-preset-common
-%description sub1-preset-home_appliance
+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
 Tizen Platform Presets for "Home Appliances"
-%files sub1-preset-home_appliance
+%files root-preset-home_appliance

diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index cfc60b6fec8506c9ccd8b079876080304d5ab94f..731f003312c3071299d4f61ec5d26835e2730108 100644 (file)
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -1,22 +1,23 @@
 # Maintainer: Tizen IoT PM
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
-%package sub1-preset-iot
+%package root-preset-iot
 Summary:       IOT Device Presets
-Conflicts:     %{name}-sub1-preset-mobile
-Conflicts:     %{name}-sub1-preset-tv
-Conflicts:     %{name}-sub1-preset-wearable
-Conflicts:     %{name}-sub1-preset-ivi
-Suggests:      %{name}-sub2-preset-iot-rpi3_minimal
-%description sub1-preset-iot
+Conflicts:     %{name}-root-preset-mobile
+Conflicts:     %{name}-root-preset-tv
+Conflicts:     %{name}-root-preset-wearable
+Conflicts:     %{name}-root-preset-ivi
+Suggests:      %{name}-sub1-preset-iot-headless_minimal
+%description root-preset-iot
 Tizen IoT Device Presets
-%files sub1-preset-iot
+%files root-preset-iot
 
 
-%package sub2-preset-iot-rpi3_minimal
-Summary:       IoT RPI3 Headless/Minimal Preset
-%description sub2-preset-iot-rpi3_minimal
-Tizen IoT Headless/Minimal Preset for RPI3
-%files sub2-preset-iot-rpi3_minimal
+%package sub1-preset-iot-headless_minimal
+Summary:       IoT Headless Minimal Preset
+Requires:      %{name}-root-feature_Headless
+%description sub1-preset-iot-headless3_minimal
+Tizen IoT Headless/Minimal Preset
+%files sub1-preset-iot-headless_minimal
 
 

diff --git a/packaging/platform-preset-ivi.inc b/packaging/platform-preset-ivi.inc
index 59d4a851977f9fd02e3f8f15ee93a50b7c012655..d84749ef82a859484da6e2d8007d8e7c5ce74e6a 100644 (file)
--- a/packaging/platform-preset-ivi.inc
+++ b/packaging/platform-preset-ivi.inc
@@ -1,22 +1,22 @@
 # Maintainer: Tizen IVI PM
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
-%package sub1-preset-ivi
+%package root-preset-ivi
 Summary:       IVI Profile Presets
-Conflicts:     %{name}-sub1-preset-mobile
-Conflicts:     %{name}-sub1-preset-tv
-Conflicts:     %{name}-sub1-preset-wearable
-Conflicts:     %{name}-sub1-preset-iot
-Suggests:      %{name}-sub2-preset-ivi-proto
-%description sub1-preset-ivi
+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
 Tizen IVI Platform Presets
-%files sub1-preset-ivi
+%files root-preset-ivi
 
-%package sub2-preset-ivi-proto
-Summary:       IVI Prototype Preset
+%package sub1-preset-ivi-proto
+Summary:       IVI OdroidXU3 Prototype Preset
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/ivi-target-odroidxu3.ks
-%description sub2-preset-ivi-proto
+%description sub1-preset-ivi-proto
 Tizen IVI Prototype Preset
-%files sub2-preset-ivi-proto
+%files sub1-preset-ivi-proto
 

diff --git a/packaging/platform-preset-mobile.inc b/packaging/platform-preset-mobile.inc
index 738d2c1bf462d7b54a031045a40283f9862f9426..c919aff49ba012662fa8e7f23ba19b0b13790262 100644 (file)
--- 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 sub1-preset-mobile
+%package root-preset-mobile
 Summary:       Mobile Profile Presets
-Conflicts:     %{name}-sub1-preset-tv
-Conflicts:     %{name}-sub1-preset-wearable
-Conflicts:     %{name}-sub1-preset-ivi
-Conflicts:     %{name}-sub1-preset-iot
-Suggests:      %{name}-sub2-preset-mobile-tm1
-Suggests:      %{name}-sub2-preset-mobile-tm2_aarch64
-Suggests:      %{name}-sub2-preset-mobile-tm2_armv7l
-Suggests:      %{name}-sub2-preset-mobile-minimal
-%description sub1-preset-mobile
+Conflicts:     %{name}-root-preset-tv
+Conflicts:     %{name}-root-preset-wearable
+Conflicts:     %{name}-root-preset-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
 Tizen Mobile Platform Presets
-%files sub1-preset-mobile
+%files root-preset-mobile
 
 
-%package sub2-preset-mobile-tm1
+%package sub1-preset-mobile-tm1
 Summary:       Mobile-TM1 Preset
-Conflicts:     %{name}-sub2-preset-mobile-tm2_aarch64
-Conflicts:     %{name}-sub2-preset-mobile-tm2_armv7l
-Conflicts:     %{name}-sub2-preset-mobile-minimal
+Conflicts:     %{name}-sub1-preset-mobile-tm2_aarch64
+Conflicts:     %{name}-sub1-preset-mobile-tm2_armv7l
+Conflicts:     %{name}-sub1-preset-mobile-minimal
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/mobile-wayland-armv7l-tm1.ks
-%description sub2-preset-mobile-tm1
+%description sub1-preset-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 sub2-preset-mobile-tm1
+%files sub1-preset-mobile-tm1
 
-%package sub2-preset-mobile-tm2_aarch64
+%package sub1-preset-mobile-tm2_aarch64
 Summary:       Mobile-TM2 Preset
-Conflicts:     %{name}-sub2-preset-mobile-tm1
-Conflicts:     %{name}-sub2-preset-mobile-tm2_armv7l
-Conflicts:     %{name}-sub2-preset-mobile-minimal
+Conflicts:     %{name}-sub1-preset-mobile-tm1
+Conflicts:     %{name}-sub1-preset-mobile-tm2_armv7l
+Conflicts:     %{name}-sub1-preset-mobile-minimal
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/mobile-wayland-arm64-tm2.ks
-%description sub2-preset-mobile-tm2_aarch64
+%description sub1-preset-mobile-tm2_aarch64
 Tizen Mobile TM2 Preset. This is for aarch64 architecture only.
 For architectural/post-script note, please refer to tm1 twin.
-%files sub2-preset-mobile-tm2_aarch64
+%files sub1-preset-mobile-tm2_aarch64
 
-%package sub2-preset-mobile-tm2_armv7l
+%package sub1-preset-mobile-tm2_armv7l
 Summary:       Mobile-TM2 Preset
-Conflicts:     %{name}-sub2-preset-mobile-tm1
-Conflicts:     %{name}-sub2-preset-mobile-tm2_aarch64
-Conflicts:     %{name}-sub2-preset-mobile-minimal
+Conflicts:     %{name}-sub1-preset-mobile-tm1
+Conflicts:     %{name}-sub1-preset-mobile-tm2_aarch64
+Conflicts:     %{name}-sub1-preset-mobile-minimal
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/mobile-wayland-armv7l-tm2.ks
-%description sub2-preset-mobile-tm2_armv7l
+%description sub1-preset-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 sub2-preset-mobile-tm2_armv7l
+%files sub1-preset-mobile-tm2_armv7l
 
-%package sub2-preset-mobile-minimal
+%package sub1-preset-mobile-minimal
 Summary:       Mobile Minimal Preset
-Conflicts:     %{name}-sub2-preset-mobile-tm1
-Conflicts:     %{name}-sub2-preset-mobile-tm2
-%description sub2-preset-mobile-minimal
+Conflicts:     %{name}-sub1-preset-mobile-tm1
+Conflicts:     %{name}-sub1-preset-mobile-tm2
+%description sub1-preset-mobile-minimal
 Tizen Mobile Minimal Platform Preset
 
 Mobile-PM: fill in minimal API sets for mobile profile.
 
-%files sub2-preset-mobile-minimal
+%files sub1-preset-mobile-minimal

diff --git a/packaging/platform-preset-tv.inc b/packaging/platform-preset-tv.inc
index 6c2751d67835a29044897e768435b616f2627dbb..ffd42a521e85dd3191441c3dd34f9cb381806b8e 100644 (file)
--- a/packaging/platform-preset-tv.inc
+++ b/packaging/platform-preset-tv.inc
@@ -1,24 +1,24 @@
 # Maintainer: Tizen TV PM
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
-%package sub1-preset-tv
+%package root-preset-tv
 Summary:       TV Profile Presets
-Conflicts:     %{name}-sub1-preset-mobile
-Conflicts:     %{name}-sub1-preset-wearable
-Conflicts:     %{name}-sub1-preset-ivi
-Conflicts:     %{name}-sub1-preset-iot
-Suggests:      %{name}-sub2-preset-tv-odroid
+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
 %list_with_require %{SOURCE4001}
-%description sub1-preset-tv
+%description root-preset-tv
 Tizen TV Platform Presets
-%files sub1-preset-tv
+%files root-preset-tv
 
 
-%package sub2-preset-tv-odroid
+%package sub1-preset-tv-odroid
 Summary:       TV-Odroid Preset
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/tv-wayland-armv7l-odroidu3.ks
-%description sub2-preset-tv-odroid
+%description sub1-preset-tv-odroid
 Tizen TV Odroid Preset
-%files sub2-preset-tv-odroid
+%files sub1-preset-tv-odroid
 

diff --git a/packaging/platform-preset-wearable.inc b/packaging/platform-preset-wearable.inc
index e55252378cbf35a8a4ecc9c1c56745072e1eee5f..b9a3588398e6a6d24fcbbbac764791561c98053b 100644 (file)
--- a/packaging/platform-preset-wearable.inc
+++ b/packaging/platform-preset-wearable.inc
@@ -1,23 +1,23 @@
 # Maintainer: Tizen Wearable PM
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
-%package sub1-preset-wearable
+%package root-preset-wearable
 Summary:       Wearable Profile Presets
-Conflicts:     %{name}-sub1-preset-mobile
-Conflicts:     %{name}-sub1-preset-tv
-Conflicts:     %{name}-sub1-preset-ivi
-Conflicts:     %{name}-sub1-preset-iot
-Suggests:      %{name}-sub2-preset-wearable-tw2
-%description sub1-preset-wearable
+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
 Tizen Wearable Platform Presets
-%files sub1-preset-wearable
+%files root-preset-wearable
 
 
-%package sub2-preset-wearable-tw2
+%package sub1-preset-wearable-tw2
 Summary:       Wearable-TW2 Preset
 # image-configuration must have this file supplied.
 %list_with_require %{_datadir}/image-configurations/wearable-wayland-armv7l-tw2.ks
-%description sub2-preset-wearable-tw2
+%description sub1-preset-wearable-tw2
 Tizen Wearable TW1 (Gear 2) Preset
-%files sub2-preset-wearable-tw2
+%files sub1-preset-wearable-tw2
 

diff --git a/packaging/platform-preset.inc b/packaging/platform-preset.inc
deleted file mode 100644 (file)
index 0a11fa8..0000000
--- a/packaging/platform-preset.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: MyungJoo Ham <myungjoo.ham@samsung.com> : Awaiting for successor.
-# You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
-
-
-%package root-preset
-Summary:       Tizen Platform Presets
-Suggests:      %{name}-sub1-preset-mobile
-Suggests:      %{name}-sub1-preset-tv
-Suggests:      %{name}-sub1-preset-wearable
-Suggests:      %{name}-sub1-preset-ivi
-Suggests:      %{name}-sub1-preset-iot
-Suggests:      %{name}-sub1-preset-common
-Suggests:      %{name}-sub1-preset-home_appliance
-%description root-preset
-Tizen Platform Presets as Package Selection Example
-%files root-preset
-
-%include_if_mainbuild %{SOURCE3100}
-%include_if_mainbuild %{SOURCE3200}
-%include_if_mainbuild %{SOURCE3300}
-%include_if_mainbuild %{SOURCE3400}
-%include_if_mainbuild %{SOURCE3500}
-%include_if_mainbuild %{SOURCE3600}
-%include_if_mainbuild %{SOURCE3700}
-