Revert "Revert "[TRE-956] Add e-tizen-data-profile_common""

This reverts commit ca76686a4ef8f2a9a4b8ec44ac75954179d353b6.

The change can finally be applied.

Signed-off-by: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Conflicts:
	patterns/common-adaptation-artik-headless.yaml
	patterns/common-adaptation-artik.yaml

Change-Id: I8b1cb26850ff3339608e789a0ddf6aff2392c777

diff --git a/patterns/common-adaptation-artik-headless.yaml b/patterns/common-adaptation-artik-headless.yaml
index 3832ebe..4202a36 100644 (file)
--- a/patterns/common-adaptation-artik-headless.yaml
+++ b/patterns/common-adaptation-artik-headless.yaml
@@ -494,8 +494,6 @@ Packages:
 #From TRE-275
 - newfs-msdos
 - fsck-msdos
-#From TRE-324
-- e-tizen-data
 #From TRE-334
 - mmfw-sysconf-target-artik10
 #From TRE-345
@@ -609,3 +607,5 @@ Packages:
 - system-servant-profile_common
 #From TRE-1043
 - tizen-release-profile_common
+#From TRE-956
+- e-tizen-data-profile_common

diff --git a/patterns/common-adaptation-artik.yaml b/patterns/common-adaptation-artik.yaml
index b093b57..f3fc8ed 100644 (file)
--- a/patterns/common-adaptation-artik.yaml
+++ b/patterns/common-adaptation-artik.yaml
@@ -143,7 +143,6 @@ Packages:
 - efl-misc
 - efl-modules
 #From Common Enlightenment
-- e-tizen-data
 - e-mod-tizen-wm-policy
 - e-mod-tizen-devicemgr
 - e-mod-tizen-keyrouter
@@ -426,3 +425,5 @@ Packages:
 - system-servant-profile_common
 #From TRE-1043
 - tizen-release-profile_common
+#From TRE-956
+- e-tizen-data-profile_common

diff --git a/patterns/common-enlightenment.yaml b/patterns/common-enlightenment.yaml
index bcdbe52..c4b84bd 100644 (file)
--- a/patterns/common-enlightenment.yaml
+++ b/patterns/common-enlightenment.yaml
@@ -2,10 +2,11 @@ Summary: Common Enlightenment
 Description: Common Enlightenment
 Name: common-enlightenment
 Packages:
-- e-tizen-data
 - e-mod-tizen-wm-policy
 - e-mod-tizen-devicemgr
 - e-mod-tizen-keyrouter
 - e-mod-tizen-eom
 - e-mod-tizen-processmgr
 - e-mod-tizen-wl-textinput
+#From TRE-956
+- e-tizen-data-profile_common