Move packages from agl-core to agl-ivi

Bug-AGL: SPEC-2500

v2: moved packagegroup-agl-core-navigation as packagegroup-agl-ivi-navigation
    to meta-agl-demo

Change-Id: I9ce852c80cc7c9789c087517aeee6ce38947a270
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

6 files changed, 19 insertions, 52 deletions

diff --git a/meta-agl-profile-core/recipes-platform/images/agl-image-ivi-crosssdk.bb b/meta-agl-profile-core/recipes-platform/images/agl-image-ivi-crosssdk.bb
deleted file mode 100644
index 655298772..000000000
--- a/meta-agl-profile-core/recipes-platform/images/agl-image-ivi-crosssdk.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-# just for backward compatibility
-require agl-image-minimal-crosssdk.bb
diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb
index 1663d7b13..e209c59ca 100644
--- a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb
+++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb
@@ -12,13 +12,8 @@ ALLOW_EMPTY_${PN} = "1"
 PKGGROUP_ZEROCONF = "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '', d)}"
 
 RDEPENDS_${PN} += "\
-    bluez5-obex \
     dhcp-server \
     ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client connman-tests \
         connman-tools connman-ncurses connman-plugin-session-policy-local','',d)} \
-    ${@bb.utils.contains("DISTRO_FEATURES", "3g", "libqmi", "", d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '${PKGGROUP_ZEROCONF}', '', d)} \
-    neard \
-    neardal-tools \
-    rtl-sdr \
     "
diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb
deleted file mode 100644
index 473bac751..000000000
--- a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-navigation.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "The software for application framework of AGL IVI profile"
-DESCRIPTION = "A set of packages belong to AGL application framework which required by \
-Navigation and Location-Based Services Subsystem"
-
-LICENSE = "MIT"
-
-inherit packagegroup
-
-PACKAGES = "\
-    packagegroup-agl-core-navigation \
-    "
-
-RDEPENDS_${PN} += "\
-    gpsd \
-    virtual/gpsd-conf \
-    geoclue \
-    "
diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb
index 82cfb3a19..b6f8f07c8 100644
--- a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb
+++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The minimal set of packages for Connectivity Subsystem"
+DESCRIPTION = "The minimal set of packages for AGL core Connectivity Subsystem"
 LICENSE = "MIT"
 
 inherit packagegroup
@@ -10,24 +10,7 @@ PACKAGES = "\
 ALLOW_EMPTY_${PN} = "1"
 
 RDEPENDS_${PN} += "\
-agl-service-bluetooth \
-agl-service-bluetooth-map \
-agl-service-bluetooth-pbap \
-agl-service-can-low-level \
 agl-service-data-persistence \
-agl-service-geoclue \
-agl-service-geofence \
-agl-service-gps \
-agl-service-identity-agent \
-agl-service-iiodevices \
-agl-service-mediascanner \
-agl-service-navigation \
 agl-service-network \
-agl-service-nfc \
-agl-service-signal-composer \
-agl-service-steering-wheel \
-agl-service-unicens \
-agl-service-weather \
 agl-service-platform-info \
-high-level-viwi-service \
     "
diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb
index 383b14417..284c961b1 100644
--- a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb
+++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb
@@ -18,7 +18,6 @@ RDEPENDS_${PN} += "\
 
 RDEPENDS_${PN} += "\
     packagegroup-agl-core-connectivity \
-    packagegroup-agl-core-navigation \
     packagegroup-agl-core-os-commonlibs \
     packagegroup-agl-core-services \
     packagegroup-agl-core-security \
diff --git a/templates/base/conf-notes.txt b/templates/base/conf-notes.txt
index 1279e2979..02e046787 100644
--- a/templates/base/conf-notes.txt
+++ b/templates/base/conf-notes.txt
@@ -1,17 +1,26 @@
 Common targets are:
   - meta-agl:          (core system)
-    agl-image-minimal
-    agl-image-minimal-qa
-    
-    agl-image-ivi
+    - agl-profile-core:
+        agl-image-boot
+        agl-image-minimal
+        agl-image-minimal-qa
+
+    - agl-profile-graphical:
+        agl-image-weston
+
+    - agl-profile-graphical-qt5:
+        agl-image-graphical-qt5
+        agl-image-graphical-qt5-crosssdk
+
+    - agl-profile-graphical-html5
+        agl-demo-platform-html5
+
+  - meta-agl-demo:     (demo with UI)
+    agl-image-ivi      (base for ivi targets)
     agl-image-ivi-qa
     agl-image-ivi-crosssdk
-    
-    agl-image-weston
 
-  - meta-agl-demo:     (demo with UI)
     agl-demo-platform  (* default demo target)
     agl-demo-platform-qa
     agl-demo-platform-crosssdk
-    
-    agl-demo-platform-html5
+