From f1c11ef63b12bfc79d3774008caffd1ff535680e Mon Sep 17 00:00:00 2001
From: Maciej Wereski <m.wereski@partner.samsung.com>
Date: Wed, 13 Sep 2017 14:50:11 +0200
Subject: [PATCH] [TRE-1581] Remove packages from Artik530 Headed

Change-Id: I9699b498159c52d038bc0f5737e430966c8f7ba4
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
---
 ks/common-wayland-3parts-armv7l-artik.yaml                |  4 ++--
 ks/iot-headed-3parts-armv7l-artik530_710.yaml             |  2 +-
 ...ion-artik.yaml => common-adaptation-artik-headed.yaml} | 15 +++------------
 patterns/common-adaptation-artik10.yaml                   | 13 +++++++++++++
 patterns/common-adaptation-artik510.yaml                  |  7 -------
 5 files changed, 19 insertions(+), 22 deletions(-)
 rename patterns/{common-adaptation-artik.yaml => common-adaptation-artik-headed.yaml} (96%)
 create mode 100644 patterns/common-adaptation-artik10.yaml
 delete mode 100644 patterns/common-adaptation-artik510.yaml

diff --git a/ks/common-wayland-3parts-armv7l-artik.yaml b/ks/common-wayland-3parts-armv7l-artik.yaml
index fc9634c..cb60e4a 100644
--- a/ks/common-wayland-3parts-armv7l-artik.yaml
+++ b/ks/common-wayland-3parts-armv7l-artik.yaml
@@ -10,7 +10,7 @@ Repos:
     - unified-standard
     - base-standard
 Groups:
-    - Common Adaptation Artik
-    - Common Adaptation Artik 510
+    - Common Adaptation Artik Headed
+    - Common Adaptation Artik 10
 RemovePackages:
     - bluetooth-tools-no-firmware
diff --git a/ks/iot-headed-3parts-armv7l-artik530_710.yaml b/ks/iot-headed-3parts-armv7l-artik530_710.yaml
index 7b21cbb..13b887b 100644
--- a/ks/iot-headed-3parts-armv7l-artik530_710.yaml
+++ b/ks/iot-headed-3parts-armv7l-artik530_710.yaml
@@ -10,7 +10,7 @@ Repos:
     - unified-standard
     - base-standard
 Groups:
-    - Common Adaptation Artik
+    - Common Adaptation Artik Headed
     - IoT Adaptation Artik530_710
 RemovePackages:
     - bluetooth-tools-no-firmware
diff --git a/patterns/common-adaptation-artik.yaml b/patterns/common-adaptation-artik-headed.yaml
similarity index 96%
rename from patterns/common-adaptation-artik.yaml
rename to patterns/common-adaptation-artik-headed.yaml
index 187e38e..b3b6e2d 100644
--- a/patterns/common-adaptation-artik.yaml
+++ b/patterns/common-adaptation-artik-headed.yaml
@@ -1,6 +1,6 @@
-Summary: Common Adaptation Artik
-Description: Common Adaptation Artik
-Name: common-adaptation-artik
+Summary: Common Adaptation Artik Headed
+Description: Common Adaptation Artik Headed
+Name: common-adaptation-artik-headed
 Packages:
 #From Generic Base
 - e2fsprogs
@@ -72,8 +72,6 @@ Packages:
 - security-privilege-manager
 - privilege-checker
 - privilege-info
-- contacts-service
-- calendar-service
 - cairo
 - csr-framework
 - pkgmgr-server
@@ -84,7 +82,6 @@ Packages:
 - voice-control
 - voice-control-elm
 - vc-engine-default
-- capi-maps-service
 - appcore-agent
 - data-control
 - ttrace
@@ -331,8 +328,6 @@ Packages:
 #From TRE-681
 - d2d-conv-manager
 - d2d-conv-manager-lib
-#From TRE-700
-- maps-plugin-mapzen
 #From TRE-702
 - org.tizen.inputmethod-setting-profile_common
 #From TRE-717
@@ -416,8 +411,6 @@ Packages:
 - pass
 #From TRE-957
 - webapi-plugins-profile_common
-#From TRE-1243
-- libcontacts-service
 #From TRE-1116
 - capi-network-stc
 - stc-manager
@@ -441,8 +434,6 @@ Packages:
 #From TRE-1347
 - fido_bt_roaming_agent
 - fido_silent
-#From TRE-1367
-- libcalendar-service
 #From TRE-1415
 - coregl
 #From TRE-1340
diff --git a/patterns/common-adaptation-artik10.yaml b/patterns/common-adaptation-artik10.yaml
new file mode 100644
index 0000000..b52fa52
--- /dev/null
+++ b/patterns/common-adaptation-artik10.yaml
@@ -0,0 +1,13 @@
+Summary: Common Adaptation Artik 10
+Description: Common Adaptation Artik 10
+Name: common-adaptation-artik10
+Packages:
+- alsa-ucm-data-ak4953
+- audio-hal-ak4953
+- libtbm-exynos
+- libcontacts-service
+- contacts-service
+- libcalendar-service
+- calendar-service
+- capi-maps-service
+- maps-plugin-mapzen
diff --git a/patterns/common-adaptation-artik510.yaml b/patterns/common-adaptation-artik510.yaml
deleted file mode 100644
index 9a9627d..0000000
--- a/patterns/common-adaptation-artik510.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-Summary: Common Adaptation Artik 510
-Description: Common Adaptation Artik 510
-Name: common-adaptation-artik510
-Packages:
-- alsa-ucm-data-ak4953
-- audio-hal-ak4953
-- libtbm-exynos
-- 
2.7.4