From 5e3ef12f244accf6b53dac59414444e6c2f29c02 Mon Sep 17 00:00:00 2001
From: Maciej Wereski <m.wereski@partner.samsung.com>
Date: Mon, 19 Jun 2017 11:39:19 +0200
Subject: [PATCH] [TRE-1344][TRE-1345] Split RPi3 Headless & IoT Core images

As list of packages for Headless and IoT Core diverge split those into
separate ks files. Add location, telephony, bluetooth and sensor fw
packages to Headless image. Remove capi-network-softap and
mobileap-agent* packages from IoT Core image.

Change-Id: I1bc0f4fac39b69c366b06e1193e1dbb017fffc31
Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com>
---
 common.yaml                                   | 29 ++++++++++++
 ks/common-iot_core-2parts-armv7l-rpi3.yaml    |  9 +---
 patterns/common-adaptation-rpi3-headless.yaml | 25 ++++++++++
 patterns/common-adaptation-rpi3-iot_core.yaml | 67 +++++++++++++++++++++++++++
 4 files changed, 123 insertions(+), 7 deletions(-)
 create mode 100644 patterns/common-adaptation-rpi3-iot_core.yaml

diff --git a/common.yaml b/common.yaml
index 5a8800c..04f7333 100644
--- a/common.yaml
+++ b/common.yaml
@@ -290,3 +290,32 @@ RPi3 Headless:
     Repos: []
     NoChrootScripts:
         - buildname
+
+RPi3 IoT Core:
+    Part: common-mbr-2parts-rpi3
+    Groups:
+        - Common Adaptation
+        - Common Adaptation RPi3 IoT Core
+    PostScripts:
+        - common-adaptation-rpi3
+        - generic-base
+        - common-base
+        - generic-console-tools
+        - common-packaging
+        - generic-adaptation
+        - common-adaptation
+        - generic-middleware
+        - common-middleware
+        - generic-applications
+        - generic-bluetooth
+        - generic-multimedia
+        - generic-desktop-applications
+        - common-desktop-applications
+        - generic-crosswalk
+        - common-crosswalk
+        - common-license
+        - generic-security
+        - common-cleanup-rpi3
+    Repos: []
+    NoChrootScripts:
+        - buildname
diff --git a/ks/common-iot_core-2parts-armv7l-rpi3.yaml b/ks/common-iot_core-2parts-armv7l-rpi3.yaml
index a0908ba..3009c2d 100644
--- a/ks/common-iot_core-2parts-armv7l-rpi3.yaml
+++ b/ks/common-iot_core-2parts-armv7l-rpi3.yaml
@@ -2,7 +2,7 @@ Name: common-iot_core-2parts-armv7l-rpi3
 Architecture: armv7l
 Schedule: "*"
 Active: True
-Platform: RPi3 Headless
+Platform: RPi3 IoT Core
 Part: common-mbr-2parts-rpi3
 Mic2Options: -A armv7l -f loop --pack-to=@NAME@.tar.gz
 FileName: common-iot_core-2parts-armv7l-rpi3
@@ -10,9 +10,4 @@ Repos:
     - unified-standard
     - base_arm
 Groups:
-    - Common Adaptation RPi3 Headless
-
-RemovePackages:
-    - model-config-rpi3-profile_common_headless
-ExtraPackages:
-    - model-config-rpi3-profile_common_iot_core
+    - Common Adaptation RPi3 IoT Core
diff --git a/patterns/common-adaptation-rpi3-headless.yaml b/patterns/common-adaptation-rpi3-headless.yaml
index 3ca2206..a4af87b 100644
--- a/patterns/common-adaptation-rpi3-headless.yaml
+++ b/patterns/common-adaptation-rpi3-headless.yaml
@@ -70,3 +70,28 @@ Packages:
 - org.tizen.thing-toggler
 #From TRE-1270
 - model-config-rpi3-profile_common_headless
+#From TRE-1344 (location)
+- capi-location-manager
+- lbs-server
+- liblbs-dbus
+- liblbs-location
+- location-lbs-server
+#From TRE-1344 (telephony)
+- capi-telephony
+- libtapi
+- libtcore
+- tel-plugin-database
+- tel-plugin-dbus_tapi
+- tel-plugin-packetservice
+- tel-plugin-vconf
+- telephony-daemon
+#From TRE-1344 (bluetooth)
+- capi-network-bluetooth
+- bluetooth-frwk
+- bluetooth-frwk-service
+- bluetooth-frwk-core
+- bluez
+- bluetooth-tools
+#From TRE-1344 (sensor fw)
+- sensord
+- capi-system-sensor
diff --git a/patterns/common-adaptation-rpi3-iot_core.yaml b/patterns/common-adaptation-rpi3-iot_core.yaml
new file mode 100644
index 0000000..7e77fa8
--- /dev/null
+++ b/patterns/common-adaptation-rpi3-iot_core.yaml
@@ -0,0 +1,67 @@
+Summary: Common Adaptation RPi3 IoT Core
+Description: Common Adaptation RPi3 IoT Core
+Name: common-adaptation-rpi3-iot_core
+Packages:
+- amd
+- appcore-agent
+- aul
+- bash
+- buxton2
+- capi-network-wifi
+- capi-network-wifi-manager
+- capi-system-peripheral-io
+- connman
+- coreutils
+- cynara
+- dbus
+- dlogutil
+- filesystem
+- gum-utils
+- iotcon
+- iotivity
+- kmod
+- kmod-compat
+- launchpad
+- libdlog
+- net-config
+- net-tools
+- pam
+- pam-modules-extra
+- peripheral-bus
+- pepper
+- pepper-evdev
+- pepper-keyrouter
+- procps
+- rpm
+- rpm-security-plugin
+- sdbd
+- security-manager
+- setup
+- shadow-utils-adm
+- systemd
+- system-plugin-headless
+- system-plugin-init_wrapper
+- system-plugin-iot
+- tizen-release
+- tlm
+- tlm-config-common-singleseat
+- tpk-backend
+#From TRE-1192
+- util-linux
+- vconf-internal-keys
+- vconf-internal-keys-config-profile_common
+- wpa_supplicant
+#From TRE-1193
+- capi-appfw-app-common
+#From TRE-1194
+- capi-appfw-event
+#From TRE-1195
+- capi-appfw-preference
+#From TRE-1196
+- capi-appfw-package-manager
+#From TRE-1197
+- capi-appfw-app-manager
+#From TRE-1245
+- org.tizen.thing-toggler
+#From TRE-1299
+- model-config-rpi3-profile_common_iot_core
-- 
2.7.4