From f36baff78679a16c1948be4bb49d501e9f4ccc4f Mon Sep 17 00:00:00 2001
From: Joonsub Lee <joon-sub.lee@samsung.com>
Date: Tue, 14 Apr 2015 18:01:19 +0900
Subject: [PATCH] Refactoring wearable.yaml and Adjust package groups for
 TINF-885/886

- Adjust pattern groups and postscripts' order to sync the image structure as Tizen:Common
- Adjust package groups (TINF-885/886)

Change-Id: I9af53e35b65f8ae9cbe3838850d4fc611b015397
---
 patterns/wearable-middleware.yaml |   8 +++
 wearable.yaml                     | 108 +++++++++++++++++++-------------------
 2 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/patterns/wearable-middleware.yaml b/patterns/wearable-middleware.yaml
index da12cdd..d825d94 100644
--- a/patterns/wearable-middleware.yaml
+++ b/patterns/wearable-middleware.yaml
@@ -13,3 +13,11 @@ Packages:
 - key-manager-listener
 - libkey-manager-common
 - libkey-manager-client
+- cynara
+- libcynara-creds-commons
+- libcynara-creds-dbus
+- libcynara-creds-gdbus
+- libcynara-creds-socket
+- contacts-service2
+- calendar-service
+- pims-ipc
diff --git a/wearable.yaml b/wearable.yaml
index 95d7f01..66425d6 100644
--- a/wearable.yaml
+++ b/wearable.yaml
@@ -31,51 +31,51 @@ X11:
     Part: wearable-mbr
     UserGroups: "audio,video"
     Groups:
-        - Generic Adaptation
-        - Generic Applications
         - Generic Base
-        - Generic Bluetooth
+        - Wearable Base
         - Generic Console Tools
-        - Generic Crosswalk
-        - Generic Middleware
-        - Generic Multimedia
         - Generic Packaging
-        - Generic Qt5
-        - Generic X11
+        - Wearable Packaging
+        - Generic Adaptation
         - Wearable Adaptation
-        - Wearable Base
+        - Generic X11
+        - Wearable X11
+        - Generic Middleware
+        - Wearable Middleware
+        - Generic Applications
+        - Generic Bluetooth
+        - Generic Multimedia
+        - Wearable Multimedia
+        - Wearable Desktop Applications
+        - Generic Crosswalk
         - Wearable Crosswalk
+        - Generic Qt5
+        - Wearable Qt5
         - Wearable Dali
-        - Wearable Desktop Applications
+        - Wearable EFL
         - Wearable Enlightenment
         - Wearable Input Framework
-        - Wearable Middleware
-        - Wearable Multimedia
-        - Wearable Packaging
-        - Wearable Qt5
         - Wearable Security
-        - Wearable X11
-        - Wearable EFL
     PostScripts:
-        - generic-adaptation
-        - generic-applications
         - generic-base
-        - generic-bluetooth
+        - wearable-base
         - generic-console-tools
-        - generic-crosswalk
-        - generic-middleware
-        - generic-multimedia
         - generic-packaging
-        - generic-qt5
-        - generic-x11
+        - wearable-packaging
+        - generic-adaptation
         - wearable-adaptation
-        - wearable-base
-        - wearable-crosswalk
-        - wearable-desktop-applications
+        - generic-x11
+        - wearable-x11
+        - generic-middleware
         - wearable-middleware
-        - wearable-packaging
+        - generic-applications
+        - generic-bluetooth
+        - generic-multimedia
+        - wearable-desktop-applications
+        - generic-crosswalk
+        - wearable-crosswalk
+        - generic-qt5
         - wearable-qt5
-        - wearable-x11
     Repos: []
     NoChrootScripts:
         - buildname
@@ -84,47 +84,47 @@ X11-64:
     Part: wearable-mbr
     UserGroups: "audio,video"
     Groups:
-        - Generic Adaptation
-        - Generic Applications
         - Generic Base
-        - Generic Bluetooth
+        - Wearable Base
         - Generic Console Tools
+        - Generic Packaging
+        - Wearable Packaging
+        - Generic Adaptation
+        - Wearable Adaptation
+        - Generic X11
+        - Wearable X11
         - Generic Middleware
+        - Wearable Middleware
+        - Generic Applications
+        - Generic Bluetooth
         - Generic Multimedia
-        - Generic Packaging
+        - Wearable Multimedia
+        - Wearable Desktop Applications
         - Generic Qt5
-        - Generic X11
-        - Wearable Adaptation
-        - Wearable Base
+        - Wearable Qt5
         - Wearable Dali
-        - Wearable Desktop Applications
+        - Wearable EFL
         - Wearable Enlightenment
         - Wearable Input Framework
-        - Wearable Middleware
-        - Wearable Multimedia
-        - Wearable Packaging
-        - Wearable Qt5
         - Wearable Security
-        - Wearable X11
-        - Wearable EFL
     PostScripts:
-        - generic-adaptation
-        - generic-applications
         - generic-base
-        - generic-bluetooth
+        - wearable-base
         - generic-console-tools
-        - generic-middleware
-        - generic-multimedia
         - generic-packaging
-        - generic-qt5
-        - generic-x11
+        - wearable-packaging
+        - generic-adaptation
         - wearable-adaptation
-        - wearable-base
-        - wearable-desktop-applications
+        - generic-x11
+        - wearable-x11
+        - generic-middleware
         - wearable-middleware
-        - wearable-packaging
+        - generic-applications
+        - generic-bluetooth
+        - generic-multimedia
+        - wearable-desktop-applications
+        - generic-qt5
         - wearable-qt5
-        - wearable-x11
     Repos: []
     NoChrootScripts:
         - buildname
-- 
2.7.4