Preset-boards: make BSP presets independent from profile (platform type)submit/tizen/20170406.054455submit/tizen/20170406.054349accepted/tizen/unified/20170406.173342

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

3 files changed, 124 insertions, 58 deletions

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index 01e9bba..f46023a 100644
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -35,6 +35,7 @@ Source3400:	platform-preset-ivi.inc
 Source3500:	platform-preset-iot.inc
 Source3600:	platform-preset-common.inc
 Source3700:	platform-preset-home_appliance.inc
+Source3800:	platform-preset-boards.inc
 
 # To get .ks files
 BuildRequires:	image-configurations
@@ -95,6 +96,7 @@ and to most domains.
 
 %package	category-presets
 Summary:	Tizen Presets
+Suggests:	%{name}-root-preset_boards
 Suggests:	%{name}-root-preset_mobile
 Suggests:	%{name}-root-preset_tv
 Suggests:	%{name}-root-preset_wearable
@@ -200,5 +202,6 @@ python ./rule_checker.py
 %include_if_mainbuild %{SOURCE3500}
 %include_if_mainbuild %{SOURCE3600}
 %include_if_mainbuild %{SOURCE3700}
+%include_if_mainbuild %{SOURCE3800}
 
 
diff --git a/packaging/platform-preset-boards.inc b/packaging/platform-preset-boards.inc
new file mode 100644
index 0000000..30ba6f4
--- /dev/null
+++ b/packaging/platform-preset-boards.inc
@@ -0,0 +1,89 @@
+# Maintainer: Tizen PM?
+# You need ACK (+1) from the maintainer to be reviewed by building-block maintainers.
+
+%package root-preset_boards
+Summary:	Board (Hardware Set) Support Packages (BSP) Presets
+%ifarch armv7l aarch64
+Suggests:	%{name}-sub1-preset_boards-RPI3_headlessBSP
+Suggests:	%{name}-sub1-preset_boards-RPI3_fullBSP
+%endif
+%ifarch armv7l
+Suggests:	%{name}-sub1-preset_boards-ARTIK_fullBSP
+Suggests:	%{name}-sub1-preset_boards-OdroidXU3_fullBSP
+Suggests:	%{name}-sub1-preset_boards-TM1_fullBSP
+%endif
+%ifarch armv7l aarch64
+Suggests:	%{name}-sub1-preset_boards-TM2_fullBSP
+Suggests:	%{name}-sub1-preset_boards-TM3_fullBSP
+%endif
+%ifarch armv7l
+Suggests:	%{name}-sub1-preset_boards-TW1_fullBSP
+Suggests:	%{name}-sub1-preset_boards-TW2_fullBSP
+%endif
+%description root-preset_boards
+Note that kernel binaries may be required to be installed in a separated partition
+and you might be not allowed to include kernel binaries in the platform image.
+%files root-preset_boards
+
+%ifarch armv7l aarch64
+%package sub1-preset_boards-RPI3_headlessBSP
+Summary:	BSP for RPI3 (headless)
+%description sub1-preset_boards-RPI3_headlessBSP
+%files sub1-preset_boards-RPI3_headlessBSP
+%endif
+
+%ifarch armv7l aarch64
+%package sub1-preset_boards-RPI3_fullBSP
+Summary:	BSP for RPI3 (full)
+%description sub1-preset_boards-RPI3_fullBSP
+%files sub1-preset_boards-RPI3_fullBSP
+%endif
+
+%ifarch armv7l
+%package sub1-preset_boards-ARTIK_fullBSP
+Summary:	BSP for ARTIK (full)
+%description sub1-preset_boards-ARTIK_fullBSP
+%files sub1-preset_boards-ARTIK_fullBSP
+%endif
+
+%ifarch armv7l
+%package sub1-preset_boards-OdroidXU3_fullBSP
+Summary:	BSP for OdroidXU3 (full)
+%description sub1-preset_boards-OdroidXU3_fullBSP
+%files sub1-preset_boards-OdroidXU3_fullBSP
+%endif
+
+%ifarch armv7l
+%package sub1-preset_boards-TM1_fullBSP
+Summary:	BSP for TM1 (Z3-variant)
+%description sub1-preset_boards-TM1_fullBSP
+%files sub1-preset_boards-TM1_fullBSP
+%endif
+
+%ifarch armv7l aarch64
+%package sub1-preset_boards-TM2_fullBSP
+Summary:	BSP for TM2 (Exynos7)
+%description sub1-preset_boards-TM2_fullBSP
+%files sub1-preset_boards-TM2_fullBSP
+%endif
+
+%ifarch armv7l aarch64
+%package sub1-preset_boards-TM3_fullBSP
+Summary:	BSP for TM3 (Exynos9)
+%description sub1-preset_boards-TM3_fullBSP
+%files sub1-preset_boards-TM3_fullBSP
+%endif
+
+%ifarch armv7l
+%package sub1-preset_boards-TW1_fullBSP
+Summary:	BSP for TW1 (Gear 2)
+%description sub1-preset_boards-TW1_fullBSP
+%files sub1-preset_boards-TW1_fullBSP
+%endif
+
+%ifarch armv7l
+%package sub1-preset_boards-TW2_fullBSP
+Summary:	BSP for TW2 (Gear S3)
+%description sub1-preset_boards-TW2_fullBSP
+%files sub1-preset_boards-TW2_fullBSP
+%endif
diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index 3e7be3a..6acfc3d 100644
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -7,22 +7,12 @@ 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-boards
 Suggests:	%{name}-sub1-preset_iot-platforms
-Suggests:	%{name}-sub1-preset_iot-combined
+Suggests:	%{name}-sub1-preset_iot-examples
 %description root-preset_iot
 Tizen IoT Device Presets
 %files root-preset_iot
 
-%package sub1-preset_iot-boards
-Summary:	IOT Device Board (BSP) Presets
-Suggests:	%{name}-sub2-preset_iot-boards-RPI3_headlessBSP
-Suggests:	%{name}-sub2-preset_iot-boards-RPI3_fullBSP
-Suggests:	%{name}-sub2-preset_iot-boards-OdroidXU3_fullBSP
-%description sub1-preset_iot-boards
-Tizen IoT Device Board Support Packages (BSP) Presets
-%files sub1-preset_iot-boards
-
 
 %package sub1-preset_iot-platforms
 Summary:	IOT Software Platform Presets
@@ -33,39 +23,23 @@ Suggests:	%{name}-sub2-preset_iot-platforms-headed_minimal
 Tizen IoT Presets of Software Plaforms independent from specific hardware/BSPs.
 %files sub1-preset_iot-platforms
 
-%package sub1-preset_iot-combined
+%package sub1-preset_iot-examples
 Summary:	IOT Device Board and SW Platform Presets
 %ifarch aarch64 armv7l
-Suggests:	%{name}-sub2-preset_iot-combined-RPI3_headless_devboard
-Suggests:	%{name}-sub2-preset_iot-combined-RPI3_headless_networkhub
-Suggests:	%{name}-sub2-preset_iot-combined-RPI3_headless_minimal
-Suggests:	%{name}-sub2-preset_iot-combined-RPI3_headless
+Suggests:	%{name}-sub2-preset_iot-examples-RPI3_headless_devboard
+Suggests:	%{name}-sub2-preset_iot-examples-RPI3_headless_networkhub
+Suggests:	%{name}-sub2-preset_iot-examples-RPI3_headless_minimal
+Suggests:	%{name}-sub2-preset_iot-examples-RPI3_headless
 %endif
 %ifarch armv7l
-Suggests:	%{name}-sub2-preset_iot-combined-ARTIK_headless
-Suggests:	%{name}-sub2-preset_iot-combined-ARTIK_headed_full
-Suggests:	%{name}-sub2-preset_iot-combined-ODROID_headed_full
+Suggests:	%{name}-sub2-preset_iot-examples-ARTIK_headless
+Suggests:	%{name}-sub2-preset_iot-examples-ARTIK_headed_full
+Suggests:	%{name}-sub2-preset_iot-examples-ODROID_headed_full
 %endif
-%description sub1-preset_iot-combined
+%description sub1-preset_iot-examples
 Tizen IoT Presets of specific devices, which have both BSPs and software platforms.
 An item in this section is intended to represent a whole OS image.
-%files sub1-preset_iot-combined
-
-
-%package sub2-preset_iot-boards-RPI3_headlessBSP
-Summary:	IoT BSP for RPI3 (headless)
-%description sub2-preset_iot-boards-RPI3_headlessBSP
-%files sub2-preset_iot-boards-RPI3_headlessBSP
-
-%package sub2-preset_iot-boards-RPI3_fullBSP
-Summary:	IoT BSP for RPI3 (full)
-%description sub2-preset_iot-boards-RPI3_fullBSP
-%files sub2-preset_iot-boards-RPI3_fullBSP
-
-%package sub2-preset_iot-boards-OdroidXU3_fullBSP
-Summary:	IoT BSP for OdroidXU3 (full)
-%description sub2-preset_iot-boards-OdroidXU3_fullBSP
-%files sub2-preset_iot-boards-OdroidXU3_fullBSP
+%files sub1-preset_iot-examples
 
 
 
@@ -94,7 +68,7 @@ Tizen IoT Headed/Minimal Preset
 
 
 %ifarch aarch64 armv7l
-%package sub2-preset_iot-combined-RPI3_headless_devboard
+%package sub2-preset_iot-examples-RPI3_headless_devboard
 Summary:	RPI3 Headless for Developers
 Requires:	%{name}-sub2-preset_iot-platforms-headless_minimal
 Requires:	%{name}-sub2-preset_iot-boards-RPI3_headlessBSP
@@ -102,69 +76,69 @@ Requires:	rpm
 Suggests:	gcc
 Suggests:	make
 Suggests:	cmake
-%description sub2-preset_iot-combined-RPI3_headless_devboard
-%files sub2-preset_iot-combined-RPI3_headless_devboard
+%description sub2-preset_iot-examples-RPI3_headless_devboard
+%files sub2-preset_iot-examples-RPI3_headless_devboard
 %endif
 
 %ifarch aarch64 armv7l
-%package sub2-preset_iot-combined-RPI3_headless_networkhub
+%package sub2-preset_iot-examples-RPI3_headless_networkhub
 Summary:	RPI3 Headless Network Hub
 Requires:	%{name}-sub2-preset_iot-platforms-headless_minimal
 Requires:	%{name}-sub2-preset_iot-boards-RPI3_headlessBSP
 Requires:	%{name}-root-network
-%description sub2-preset_iot-combined-RPI3_headless_networkhub
-%files sub2-preset_iot-combined-RPI3_headless_networkhub
+%description sub2-preset_iot-examples-RPI3_headless_networkhub
+%files sub2-preset_iot-examples-RPI3_headless_networkhub
 %endif
 
 %ifarch aarch64 armv7l
-%package sub2-preset_iot-combined-RPI3_headless_minimal
+%package sub2-preset_iot-examples-RPI3_headless_minimal
 Summary:	RPI3 Minimal Headless
 Requires:	%{name}-sub2-preset_iot-platforms-headless_minimal
 Requires:	%{name}-sub2-preset_iot-boards-RPI3_headlessBSP
-%description sub2-preset_iot-combined-RPI3_headless_minimal
-%files sub2-preset_iot-combined-RPI3_headless_minimal
+%description sub2-preset_iot-examples-RPI3_headless_minimal
+%files sub2-preset_iot-examples-RPI3_headless_minimal
 %endif
 
 %ifarch aarch64 armv7l
-%package sub2-preset_iot-combined-RPI3_headless
+%package sub2-preset_iot-examples-RPI3_headless
 Summary:	RPI3 Headless Tizen Official Example
 %list_with_require %{_datadir}/image-configurations/common-headless-2parts-armv7l-rpi3.ks
-%description sub2-preset_iot-combined-RPI3_headless
+%description sub2-preset_iot-examples-RPI3_headless
 Replication of Tizen IoT RPI3 Snapshot Release (download.tizen.org/snapshots/tizen/unified)
 This is from common-headless-2parts-armv7l-rpi3. (armv7l)
 Userspace rootfs only.
-%files sub2-preset_iot-combined-RPI3_headless
+%files sub2-preset_iot-examples-RPI3_headless
 %endif
 
 %ifarch armv7l
-%package sub2-preset_iot-combined-ARTIK_headless
+%package sub2-preset_iot-examples-ARTIK_headless
 Summary:	ARTIK Headless Tizen Official Example
 %list_with_require %{_datadir}/image-configurations/common-headless-3parts-armv7l-artik.ks
-%description sub2-preset_iot-combined-ARTIK_headless
+%description sub2-preset_iot-examples-ARTIK_headless
 Replication of Tizen IoT ARTIK Snapshot Release (download.tizen.org/snapshots/tizen/unified)
 This is from common-headless-3parts-armv7l-artik. (armv7l)
 Userspace rootfs only
-%files sub2-preset_iot-combined-ARTIK_headless
+%files sub2-preset_iot-examples-ARTIK_headless
 %endif
 
 %ifarch armv7l
-%package sub2-preset_iot-combined-ARTIK_headed_full
+%package sub2-preset_iot-examples-ARTIK_headed_full
 Summary:	ARTIK Headed Tizen Official Example (common/full)
 %list_with_require %{_datadir}/image-configurations/common-wayland-3parts-armv7l-artik.ks
-%description sub2-preset_iot-combined-ARTIK_headed_full
+%description sub2-preset_iot-examples-ARTIK_headed_full
 Replication of Tizen IoT ARTIK Headed/Wayland Snapshot Release (download.tizen.org/snapshots/tizen/unified)
 This is from common-wayland-3parts-armv7l-artik. (armv7l)
 Userspace rootfs only
-%files sub2-preset_iot-combined-ARTIK_headed_full
+%files sub2-preset_iot-examples-ARTIK_headed_full
 %endif
 
 %ifarch armv7l
-%package sub2-preset_iot-combined-ODROID_headed_full
+%package sub2-preset_iot-examples-ODROID_headed_full
 Summary:	ODROID U3/XU3 Headed Tizen Official Example (common/full)
 %list_with_require %{_datadir}/image-configurations/common-wayland-3parts-armv7l-odroidu3.ks
-%description sub2-preset_iot-combined-ODROID_headed_full
+%description sub2-preset_iot-examples-ODROID_headed_full
 Replication of Tizen IoT Odroid U3/XU3 Headed/Wayland Snapshot Release (download.tizen.org/snapshots/tizen/unified)
 This is from common-wayland-3parts-armv7l-odroidu3. (armv7l)
 Userspace rootfs only
-%files sub2-preset_iot-combined-ODROID_headed_full
+%files sub2-preset_iot-examples-ODROID_headed_full
 %endif