Change libhomescreen-2017 to libhomescreenflounder_5.99.6flounder/5.99.65.99.6

    Change libhomescreen-2017 to libhomescreen recipes,
    Detele libhomescreen-2017 recipes.

Change-Id: Ib87676fb34a593fedb72ca635a49742578c40efc
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>

4 files changed, 12 insertions, 91 deletions

diff --git a/recipes-demo-hmi/libhomescreen/libhomescreen-2017_git.bb b/recipes-demo-hmi/libhomescreen/libhomescreen-2017_git.bb
deleted file mode 100644
index 5c84ebe50..000000000
--- a/recipes-demo-hmi/libhomescreen/libhomescreen-2017_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY     = "AGL Home Screen Library"
-DESCRIPTION = "libhomescreen"
-HOMEPAGE    = "http://docs.automotivelinux.org"
-LICENSE     = "Apache-2.0"
-SECTION     = "libs"
-
-BBCLASSEXTEND = " nativesdk"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-
-DEPENDS = "af-binder json-c"
-
-inherit cmake
-
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/src/libhomescreen.git;protocol=https;branch=${AGL_BRANCH} \
-	   file://org.agl.statusbar.conf \
-	  "
-SRCREV = "d22ffadbe9fcb13144264e71da300bdf56724906"
-S = "${WORKDIR}/git"
-
-do_install_append() {
-	mkdir -p ${D}${sysconfdir}/dbus-1/session.d
-	install -m 0644 ${WORKDIR}/org.agl.statusbar.conf  ${D}${sysconfdir}/dbus-1/session.d
-}
-
-RDEPENDS_${PN} = "agl-service-homescreen"
-PROVIDES += "virtual/libhomescreen"
diff --git a/recipes-demo-hmi/libhomescreen/libhomescreen/homescreen.pc.in b/recipes-demo-hmi/libhomescreen/libhomescreen/homescreen.pc.in
deleted file mode 100644
index 7d9ee1ecf..000000000
--- a/recipes-demo-hmi/libhomescreen/libhomescreen/homescreen.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=OEPREFIX
-exec_prefix=OEPREFIX
-libdir=OELIBDIR
-includedir=OEINCDIR
-
-Name: libhomescreen
-Description: A generic interface for the HomeScreen app
-Version: 1.0.0
-Libs: -L${libdir} -lhomescreen
-Libs.private: -lgio-2.0 -lgobject-2.0 -lglib-2.0
-Cflags:
-Requires: glib-2.0 gio-unix-2.0
diff --git a/recipes-demo-hmi/libhomescreen/libhomescreen-2017/org.agl.statusbar.conf b/recipes-demo-hmi/libhomescreen/libhomescreen/org.agl.statusbar.conf
index dc3852eee..dc3852eee 100644
--- a/recipes-demo-hmi/libhomescreen/libhomescreen-2017/org.agl.statusbar.conf
+++ b/recipes-demo-hmi/libhomescreen/libhomescreen/org.agl.statusbar.conf
diff --git a/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb b/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb
index b71b5b410..bc9aa6e81 100644
--- a/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb
+++ b/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb
@@ -6,61 +6,21 @@ SECTION     = "libs"
 
 BBCLASSEXTEND = " nativesdk"
 
-LIC_FILES_CHKSUM = "file://libhomescreen/LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
-DEPENDS += " glib-2.0 "
+DEPENDS = "af-binder json-c"
 
-inherit qmake5 pkgconfig
+inherit cmake
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/src/libhomescreen.git;protocol=https;branch=${AGL_BRANCH} \
-           file://homescreen.pc.in"
-SRCREV  = "f5c14333d2170ae9babed53ea530828569a830ff"
-S       = "${WORKDIR}/git/"
-
-# PV needs to be modified with SRCPV to work AUTOREV correctly
-PV = "0.0+git${SRCPV}"
-
-do_install() {
-    install -d ${D}/usr/AGL/${PN}
-    install -m 0755 ${B}/samplehomescreeninterfaceapp/SampleHomeScreenInterfaceApp ${D}/usr/AGL/${PN}/
-
-    install -d ${D}${libdir}
-    install -m 0644 ${B}/libhomescreen/libhomescreen.so.1.0.0 ${D}${libdir}/
-    ln -sf libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so
-    ln -sf libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so.1
-    ln -sf libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so.1.0
-
-# kooltux: still some problem with paths inside .pc file
-# error at build time:
-# ERROR: homescreen-git-r0 do_populate_sysroot: QA Issue: homescreen.pc failed sanity test (tmpdir) in path /xdt/build/tmp/work/cortexa15hf-neon-agl-linux-gnueabi/libhomescreen/git-r0/sysroot-destdir/usr/lib/pkgconfig [pkgconfig]
-#
-    install -d ${D}${libdir}/pkgconfig
-    install -m 0644 ${WORKDIR}/homescreen.pc.in ${D}${libdir}/pkgconfig/homescreen.pc
-    sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/homescreen.pc
-    sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/homescreen.pc
-    sed -i s:OEINCDIR:${includedir}:g ${D}${libdir}/pkgconfig/homescreen.pc
-
-    install -d ${D}${includedir}
-    install -m 0644 ${S}/libhomescreen/include/libhomescreen.hpp ${D}${includedir}/
+	   file://org.agl.statusbar.conf \
+	  "
+SRCREV = "d22ffadbe9fcb13144264e71da300bdf56724906"
+S = "${WORKDIR}/git"
+
+do_install_append() {
+	mkdir -p ${D}${sysconfdir}/dbus-1/session.d
+	install -m 0644 ${WORKDIR}/org.agl.statusbar.conf  ${D}${sysconfdir}/dbus-1/session.d
 }
 
-PACKAGES =+ "libhomescreensampleapp libhomescreensampleapp-dbg"
-
-FILES_${PN} = "\
-	${libdir}/libhomescreen.so.* \
-"
-FILES_${PN}-dev = "\
-	${includedir}/libhomescreen.hpp \
-	${libdir}/libhomescreen.so \
-	${libdir}/pkgconfig/homescreen.pc \
-"
-FILES_${PN}-dbg += "\
-	${libdir}/.debug/libhomescreen.so.* \
-"
-
-FILES_libhomescreensampleapp += "/usr/AGL/${PN}/SampleHomeScreenInterfaceApp"
-FILES_libhomescreensampleapp-dbg += "/usr/AGL/${PN}/.debug"
-
-
-RDEPENDS_libhomescreensampleapp-dbg += "${PN}-dbg ${PN}-dev"
-PROVIDES += "virtual/libhomescreen"
+RDEPENDS_${PN} = "agl-service-homescreen"