From 7e2f28f3bea5d283a1e26877044422f3a9d3294d Mon Sep 17 00:00:00 2001
From: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Date: Mon, 3 Sep 2018 11:33:42 +0900
Subject: [PATCH] Use agl-service-homescreen without -2017
Change hmi-framwork packagegroup using agl-service-homescreen without -2017.
[Patch Set 2]
Delete agl-service-homescreen-2017 recipe.
[Patch Set 3]
Delete homescreen-2017 recipe.
Change-Id: I67306083af86c471db45d406824478cdc61f1b10
BUG-AGL: SPEC-1550
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>
---
.../agl-service-homescreen-2017_git.bb | 14 -----------
.../homescreen-2017/homescreen-2017_git.bb | 28 ----------------------
.../packagegroups/packagegroup-hmi-framework.bb | 2 +-
3 files changed, 1 insertion(+), 43 deletions(-)
delete mode 100644 meta-hmi-framework/recipes-demo-hmi/agl-service-homescreen-2017/agl-service-homescreen-2017_git.bb
delete mode 100644 meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb
diff --git a/meta-hmi-framework/recipes-demo-hmi/agl-service-homescreen-2017/agl-service-homescreen-2017_git.bb b/meta-hmi-framework/recipes-demo-hmi/agl-service-homescreen-2017/agl-service-homescreen-2017_git.bb
deleted file mode 100644
index c5f17e09..00000000
--- a/meta-hmi-framework/recipes-demo-hmi/agl-service-homescreen-2017/agl-service-homescreen-2017_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "Homescreen binding and client library for application"
-DESCRIPTION = "Homescreen 2017 is the binding library"
-HOMEPAGE = "https://git.automotivelinux.org/apps/agl-service-homescreen-2017"
-SECTION = "HMI"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = "dbus glib-2.0 af-binder json-c"
-
-inherit cmake aglwgt
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-homescreen-2017;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "32985a3558c4143900e7edd03e3d7dc9d39ce4c5"
-S = "${WORKDIR}/git"
diff --git a/meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb b/meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb
deleted file mode 100644
index eabc5d09..00000000
--- a/meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "AGL Home Screen 2017 Application"
-DESCRIPTION = "AGL Home Screen 2017 Application build with recipe method"
-HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging/homescreen-2017.git"
-SECTION = "apps"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://homescreen/LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = "\
- qtbase \
- qtdeclarative \
- qtquickcontrols2 \
- agl-service-homescreen-2017 \
- agl-service-windowmanager-2017 \
- agl-service-weather \
- libqtappfw \
- qlibwindowmanager \
- virtual/libhomescreen \
-"
-
-inherit qmake5 systemd pkgconfig aglwgt
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/homescreen-2017;protocol=https;branch=${AGL_BRANCH}"
-SRCREV = "${AGL_APP_REVISION}"
-
-PV = "1.0+git${SRCPV}"
-S = "${WORKDIR}/git/"
-
-PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
diff --git a/meta-hmi-framework/recipes-platform/packagegroups/packagegroup-hmi-framework.bb b/meta-hmi-framework/recipes-platform/packagegroups/packagegroup-hmi-framework.bb
index 2612d82f..e80b3608 100644
--- a/meta-hmi-framework/recipes-platform/packagegroups/packagegroup-hmi-framework.bb
+++ b/meta-hmi-framework/recipes-platform/packagegroups/packagegroup-hmi-framework.bb
@@ -11,7 +11,7 @@ inherit packagegroup
RDEPENDS_${PN} += " \
agl-service-windowmanager-2017 \
- agl-service-homescreen-2017 \
+ agl-service-homescreen \
homescreen \
libwindowmanager \
qlibwindowmanager \
--
2.16.6