Merge "Rename and relocate system-plugin rpms" into tizensubmit/tizen/20180109.160602accepted/tizen/unified/20180109.180252

5 files changed, 17 insertions, 18 deletions

diff --git a/packaging/platform-preset-boards-artik530.inc b/packaging/platform-preset-boards-artik530.inc
index 64e9d7c..2e7c6c8 100644
--- a/packaging/platform-preset-boards-artik530.inc
+++ b/packaging/platform-preset-boards-artik530.inc
@@ -72,17 +72,15 @@ Firstly select HALs and Feature to add to your image.
 ### ARTIK530-System ###
 %package sub2-Preset_boards-ARTIK530-System
 Summary:	ARTIK530_System
-Requires:	system-plugin-profile-iot-headless
 Requires:	system-plugin-config-udev-sdbd
-Requires:	system-plugin-exynos
-Suggests:	system-plugin-u3
+Requires:	system-plugin-device-u3
 Requires:	model-config-default
-Suggests:	system-plugin-init_wrapper
+Suggests:	system-plugin-feature-init_wrapper
 
 %description sub2-Preset_boards-ARTIK530-System
 Packages for System HAL and Feature. They are mandatory.
-If you select 3 partitions, please select system-plugin-u3.
-If you don't use initrd partition, please select system-plugin-init_wrapper.
+If you select 3 partitions, please select system-plugin-device-u3.
+If you don't use initrd partition, please select system-plugin-feature-init_wrapper.
 %files sub2-Preset_boards-ARTIK530-System
 
 ### ARTIK530-System_Device ###
diff --git a/packaging/platform-preset-boards-rpi3.inc b/packaging/platform-preset-boards-rpi3.inc
index a1de42c..9bdbadd 100644
--- a/packaging/platform-preset-boards-rpi3.inc
+++ b/packaging/platform-preset-boards-rpi3.inc
@@ -72,9 +72,9 @@ Firstly select HALs and Feature to add to your image.
 ### RPI3-System ###
 %package sub2-Preset_boards-RPI3-System
 Summary:	RPI3_System
-Requires:	system-plugin-profile-iot-headless
+Requires:	system-plugin-config-env-headless
 Requires:   system-plugin-config-udev-sdbd
-Suggests:   system-plugin-u3
+Suggests:   system-plugin-device-u3
 Requires:	model-config-default
 
 %description sub2-Preset_boards-RPI3-System
diff --git a/packaging/platform-preset-boards-tm1.inc b/packaging/platform-preset-boards-tm1.inc
index 9a5ca1b..822f308 100644
--- a/packaging/platform-preset-boards-tm1.inc
+++ b/packaging/platform-preset-boards-tm1.inc
@@ -60,13 +60,11 @@ Firstly select HALs and Feature to add to your image.
 %tizen_feature tizen.org/feature/sensor.proximity true
 %tizen_feature tizen.org/feature/sensor.temperature false
 
-
-
 ### TM1-System ###
 %package sub2-Preset_boards-TM1-System
 Summary:	TM1_System
-Requires:	system-plugin-profile-iot-headless
-Requires:	system-plugin-spreadtrum
+Requires:	system-plugin-config-env-headless
+Requires:	system-plugin-device-spreadtrum
 Requires:	model-config-tm1
 
 %description sub2-Preset_boards-TM1-System
diff --git a/packaging/platform-preset-iot-headless-images.inc b/packaging/platform-preset-iot-headless-images.inc
index c9b4de6..2071e54 100644
--- a/packaging/platform-preset-iot-headless-images.inc
+++ b/packaging/platform-preset-iot-headless-images.inc
@@ -36,7 +36,8 @@ Requires:	%{name}-sub2-domain_API-Network-Bluetooth_Media_Audio
 Requires:	%{name}-sub2-domain_API-Network-Curl
 Requires:	%{name}-sub1-domain_Feature-SoftAP
 Requires:	%{name}-sub1-domain_Feature-Setup
-Requires:	 tar
+Requires:	tar
+Requires:       system-plugin-config-env-headless
 
 Conflicts:	%{name}-sub1-Preset_img_headed-rpi3
 Conflicts:	%{name}-sub1-Preset_img_headed-artik530
@@ -68,6 +69,7 @@ Requires:	%{name}-sub2-domain_API-Network-Curl
 Requires:	%{name}-sub1-domain_Feature-SoftAP
 Requires:	%{name}-sub1-domain_Feature-Setup
 Requires:	tar
+Requires:       system-plugin-config-env-headless
 
 Conflicts:	%{name}-sub1-Preset_img_headed-rpi3
 Conflicts:	%{name}-sub1-Preset_img_headed-artik530
diff --git a/packaging/platform-preset-partitions.inc b/packaging/platform-preset-partitions.inc
index 653d2e5..09d258b 100644
--- a/packaging/platform-preset-partitions.inc
+++ b/packaging/platform-preset-partitions.inc
@@ -23,6 +23,7 @@ The Supported Partions.
 #########################################
 %package sub1-Preset_partition-2parts_ramdisk_recovery
 Summary:    Partition 2 with ramdisk and recovery
+Requires:	system-plugin-config-2parts
 
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk
 Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk
@@ -39,7 +40,7 @@ part '\' , '\opt', '\mnt\initrd', '\mnt\initrd-recovery'
 #########################################
 %package sub1-Preset_partition-3parts_ramdisk_recovery
 Summary:    Partition 3 with ramdisk and recovery
-Requires:	system-plugin-u3
+Requires:	system-plugin-config-3parts
 
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk
@@ -56,6 +57,7 @@ part '\' , '\opt', '\opt\usr', '\mnt\initrd', '\mnt\initrd-recovery'
 ############################
 %package sub1-Preset_partition-2parts_ramdisk
 Summary:    Partition 2 with ramdisk
+Requires:	system-plugin-config-2parts
 
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
 Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
@@ -72,7 +74,7 @@ part "\" , "\opt", "\mnt\initrd"
 ############################
 %package sub1-Preset_partition-3parts_ramdisk
 Summary:    Partition 3 with ramdisk
-Requires:	system-plugin-u3
+Requires:	system-plugin-config-3parts
 
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
 Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
@@ -89,8 +91,8 @@ part "\" , "\opt", "\opt\usr", "\mnt\initrd"
 ###############
 %package sub1-Preset_partition-3parts
 Summary:    Partition 3
-Requires:	system-plugin-u3
-Requires:	system-plugin-init_wrapper
+Requires:	system-plugin-config-3parts
+Requires:	system-plugin-feature-init_wrapper
 
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
 Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
@@ -101,4 +103,3 @@ Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk
 __PARTITION__: common-mbr-3parts
 part "\" , "\opt", "\opt\usr"
 %files sub1-Preset_partition-3parts
-