From e9da2ae427ac8631e3f62915850adba4cfcf40ed Mon Sep 17 00:00:00 2001 From: "Bocklage, Jens" Date: Fri, 20 Jan 2017 13:09:57 +0100 Subject: Split homescreen recipe into new recipes The homescreen recipe used to build several components. These have their own recipes now. Signed-off-by: Bocklage, Jens --- .../homescreen/homescreen/homescreen.pc.in | 14 ---- recipes-demo-hmi/homescreen/homescreen_git.bb | 79 ++++------------------ .../homescreenappframeworkbinderagl_git.bb | 30 ++++++++ .../inputeventmanager/inputeventmanager_git.bb | 30 ++++++++ .../libhomescreen/libhomescreen/homescreen.pc.in | 12 ++++ .../libhomescreen/libhomescreen_git.bb | 65 ++++++++++++++++++ .../windowmanager/windowmanager_git.bb | 36 ++++++++++ 7 files changed, 186 insertions(+), 80 deletions(-) delete mode 100644 recipes-demo-hmi/homescreen/homescreen/homescreen.pc.in create mode 100644 recipes-demo-hmi/homescreenappframeworkbinderagl/homescreenappframeworkbinderagl_git.bb create mode 100644 recipes-demo-hmi/inputeventmanager/inputeventmanager_git.bb create mode 100644 recipes-demo-hmi/libhomescreen/libhomescreen/homescreen.pc.in create mode 100644 recipes-demo-hmi/libhomescreen/libhomescreen_git.bb create mode 100644 recipes-demo-hmi/windowmanager/windowmanager_git.bb diff --git a/recipes-demo-hmi/homescreen/homescreen/homescreen.pc.in b/recipes-demo-hmi/homescreen/homescreen/homescreen.pc.in deleted file mode 100644 index 1a70c9ac0..000000000 --- a/recipes-demo-hmi/homescreen/homescreen/homescreen.pc.in +++ /dev/null @@ -1,14 +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/homescreen/homescreen_git.bb b/recipes-demo-hmi/homescreen/homescreen_git.bb index 2115804b1..ee4d03ba7 100644 --- a/recipes-demo-hmi/homescreen/homescreen_git.bb +++ b/recipes-demo-hmi/homescreen/homescreen_git.bb @@ -1,97 +1,44 @@ SUMMARY = "AGL Home Screen Application" -DESCRIPTION = "AGL Home Screen Application + SampleAppTimeDate + HomeScreenAppFrameworkBinderAGL + WindowManager + InputEventManager" -HOMEPAGE = "https://wiki.automotivelinux.org/homescreen" +DESCRIPTION = "AGL Home Screen Application + SampleAppTimeDate" +HOMEPAGE = "http://docs.automotivelinux.org" LICENSE = "Apache-2.0" SECTION = "apps" S = "${WORKDIR}/git/" -BBCLASSEXTEND = " nativesdk" - inherit qmake5 systemd pkgconfig -DEPENDS = " qtbase " - -# for HomeScreenAppFrameworkBinderTizen: -#DEPENDS += " pkgmgr-info aul " -# for WindowManager: -DEPENDS += " wayland-ivi-extension " -# for libhomescreen -DEPENDS += " glib-2.0 " -# for sample apps -DEPENDS += " qtdeclarative qtquickcontrols2 " +DEPENDS = " qtbase qtdeclarative qtquickcontrols2 " +RDEPENDS_${PN} = " \ + homescreenappframeworkbinderagl \ + inputeventmanager \ + windowmanager" -LIC_FILES_CHKSUM = "file://HomeScreen/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" +LIC_FILES_CHKSUM = "file://homescreen/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" SRCREV = "${AUTOREV}" # PV needs to be modified with SRCPV to work AUTOREV correctly PV = "0.0+git${SRCPV}" -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/staging/HomeScreen.git;protocol=http \ - file://homescreen.pc.in \ +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/apps/homescreen.git;protocol=http \ file://dbus-homescreen.conf.in" PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" do_install() { install -d ${D}/usr/AGL/${PN} - install -m 0755 ${B}/HomeScreen/HomeScreen ${D}/usr/AGL/${PN}/ - install -m 0755 ${B}/SampleAppTimeDate/SampleAppTimeDate ${D}/usr/AGL/${PN}/ - install -m 0755 ${B}/SampleHomeScreenInterfaceApp/SampleHomeScreenInterfaceApp ${D}/usr/AGL/${PN}/ - install -m 0755 ${B}/HomeScreenAppFrameworkBinderAGL/HomeScreenAppFrameworkBinderAGL ${D}/usr/AGL/${PN}/ - install -m 0755 ${B}/WindowManager/WindowManager ${D}/usr/AGL/${PN}/ - install -m 0755 ${B}/InputEventManager/InputEventManager ${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 + install -m 0755 ${B}/homescreen/HomeScreen ${D}/usr/AGL/${PN}/ + install -m 0755 ${B}/sampleapptimedate/SampleAppTimeDate ${D}/usr/AGL/${PN}/ # claneys: add dbus policy to make wifi/bluetooth status icon working as quick # workaround. (jira.automotivelinux.org : SPEC-377) install -d ${D}/etc/dbus-1/session.d install -m 0644 ${WORKDIR}/dbus-homescreen.conf.in ${D}/etc/dbus-1/session.d/homescreen.conf -# 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/homescreen/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}/ - install -d ${D}${systemd_user_unitdir} - install -m 0644 ${S}/HomeScreen/conf/HomeScreen.service ${D}${systemd_user_unitdir} - install -m 0644 ${S}/HomeScreenAppFrameworkBinderAGL/conf/HomeScreenAppFrameworkBinderAGL.service ${D}${systemd_user_unitdir} - install -m 0644 ${S}/InputEventManager/conf/InputEventManager.service ${D}${systemd_user_unitdir} - install -m 0644 ${S}/WindowManager/conf/WindowManager.service ${D}${systemd_user_unitdir} + install -m 0644 ${S}/homescreen/conf/HomeScreen.service ${D}${systemd_user_unitdir} install -d ${D}${sysconfdir}/systemd/user/default.target.wants - ln -sf ${systemd_user_unitdir}/WindowManager.service ${D}${sysconfdir}/systemd/user/default.target.wants ln -sf ${systemd_user_unitdir}/HomeScreen.service ${D}${sysconfdir}/systemd/user/default.target.wants } -FILES_${PN} += "/usr/AGL/${PN}/ ${libdir} ${systemd_user_unitdir}" +FILES_${PN} += "/usr/AGL/${PN}/ ${systemd_user_unitdir}" FILES_${PN}-dbg += "/usr/AGL/${PN}/.debug" - -PACKAGES =+ "libhomescreen libhomescreen-dev libhomescreen-dbg" - -FILES_libhomescreen = "\ - ${libdir}/libhomescreen.so.* \ -" -FILES_libhomescreen-dev = "\ - ${includedir}/libhomescreen.hpp \ - ${libdir}/libhomescreen.so \ - ${libdir}/pkgconfig/homescreen.pc \ -" -FILES_libhomescreen-dbg = "\ - ${libdir}/.debug/libhomescreen.so.* \ -" -RDEPENDS_libhomescreen-dbg += "${PN}-dbg libhomescreen-dev" - -RDEPENDS_${PN}-dev += "libhomescreen-dev" - diff --git a/recipes-demo-hmi/homescreenappframeworkbinderagl/homescreenappframeworkbinderagl_git.bb b/recipes-demo-hmi/homescreenappframeworkbinderagl/homescreenappframeworkbinderagl_git.bb new file mode 100644 index 000000000..d1a19046d --- /dev/null +++ b/recipes-demo-hmi/homescreenappframeworkbinderagl/homescreenappframeworkbinderagl_git.bb @@ -0,0 +1,30 @@ +SUMMARY = "AGL HomeScreenAppFrameworkBinderAGL Application" +DESCRIPTION = "HomeScreenAppFrameworkBinderAGL" +HOMEPAGE = "http://docs.automotivelinux.org" +LICENSE = "Apache-2.0" +SECTION = "apps" +S = "${WORKDIR}/git/" + +inherit qmake5 systemd +DEPENDS = " qtbase " + +LIC_FILES_CHKSUM = "file://homescreenappframeworkbinderagl/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" +SRCREV = "${AUTOREV}" +# PV needs to be modified with SRCPV to work AUTOREV correctly +PV = "0.0+git${SRCPV}" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/src/homescreenappframeworkbinderagl.git;protocol=http" + +PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" + +do_install() { + install -d ${D}/usr/AGL/${PN} + install -m 0755 ${B}/homescreenappframeworkbinderagl/HomeScreenAppFrameworkBinderAGL ${D}/usr/AGL/${PN}/ + + install -d ${D}${systemd_user_unitdir} + install -m 0644 ${S}/homescreenappframeworkbinderagl/conf/HomeScreenAppFrameworkBinderAGL.service ${D}${systemd_user_unitdir} +} + +FILES_${PN} += "/usr/AGL/${PN}/ ${systemd_user_unitdir}" +FILES_${PN}-dbg += "/usr/AGL/${PN}/.debug" + diff --git a/recipes-demo-hmi/inputeventmanager/inputeventmanager_git.bb b/recipes-demo-hmi/inputeventmanager/inputeventmanager_git.bb new file mode 100644 index 000000000..fff0a2f48 --- /dev/null +++ b/recipes-demo-hmi/inputeventmanager/inputeventmanager_git.bb @@ -0,0 +1,30 @@ +SUMMARY = "AGL InputEventManager Application" +DESCRIPTION = "InputEventManager" +HOMEPAGE = "http://docs.automotivelinux.org" +LICENSE = "Apache-2.0" +SECTION = "apps" +S = "${WORKDIR}/git/" + +inherit qmake5 systemd +DEPENDS = " qtbase " + +LIC_FILES_CHKSUM = "file://inputeventmanager/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" +SRCREV = "${AUTOREV}" +# PV needs to be modified with SRCPV to work AUTOREV correctly +PV = "0.0+git${SRCPV}" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/src/inputeventmanager.git;protocol=http" + +PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" + +do_install() { + install -d ${D}/usr/AGL/${PN} + install -m 0755 ${B}/inputeventmanager/InputEventManager ${D}/usr/AGL/${PN}/ + + install -d ${D}${systemd_user_unitdir} + install -m 0644 ${S}/inputeventmanager/conf/InputEventManager.service ${D}${systemd_user_unitdir} +} + +FILES_${PN} += "/usr/AGL/${PN}/ ${systemd_user_unitdir}" +FILES_${PN}-dbg += "/usr/AGL/${PN}/.debug" + diff --git a/recipes-demo-hmi/libhomescreen/libhomescreen/homescreen.pc.in b/recipes-demo-hmi/libhomescreen/libhomescreen/homescreen.pc.in new file mode 100644 index 000000000..7d9ee1ecf --- /dev/null +++ b/recipes-demo-hmi/libhomescreen/libhomescreen/homescreen.pc.in @@ -0,0 +1,12 @@ +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_git.bb b/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb new file mode 100644 index 000000000..440ea420e --- /dev/null +++ b/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb @@ -0,0 +1,65 @@ +SUMMARY = "AGL Home Screen Library" +DESCRIPTION = "libhomescreen" +HOMEPAGE = "http://docs.automotivelinux.org" +LICENSE = "Apache-2.0" +SECTION = "libs" +S = "${WORKDIR}/git/" + +BBCLASSEXTEND = " nativesdk" + +inherit qmake5 pkgconfig + +DEPENDS += " glib-2.0 " + +LIC_FILES_CHKSUM = "file://libhomescreen/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" +SRCREV = "${AUTOREV}" +# PV needs to be modified with SRCPV to work AUTOREV correctly +PV = "0.0+git${SRCPV}" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/src/libhomescreen.git;protocol=http \ + file://homescreen.pc.in" + +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}/ +} + +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" + diff --git a/recipes-demo-hmi/windowmanager/windowmanager_git.bb b/recipes-demo-hmi/windowmanager/windowmanager_git.bb new file mode 100644 index 000000000..013f44596 --- /dev/null +++ b/recipes-demo-hmi/windowmanager/windowmanager_git.bb @@ -0,0 +1,36 @@ +SUMMARY = "AGL WindowManager Application" +DESCRIPTION = "WindowManager" +HOMEPAGE = "http://docs.automotivelinux.org" +LICENSE = "Apache-2.0" +SECTION = "apps" +S = "${WORKDIR}/git/" + +inherit qmake5 systemd +DEPENDS = " qtbase " + +# for WindowManager: +DEPENDS += " wayland-ivi-extension " + +LIC_FILES_CHKSUM = "file://windowmanager/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" +SRCREV = "${AUTOREV}" +# PV needs to be modified with SRCPV to work AUTOREV correctly +PV = "0.0+git${SRCPV}" + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/src/windowmanager.git;protocol=http" + +PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" + +do_install() { + install -d ${D}/usr/AGL/${PN} + install -m 0755 ${B}/windowmanager/WindowManager ${D}/usr/AGL/${PN}/ + + install -d ${D}${systemd_user_unitdir} + install -m 0644 ${S}/windowmanager/conf/WindowManager.service ${D}${systemd_user_unitdir} + + install -d ${D}${sysconfdir}/systemd/user/default.target.wants + ln -sf ${systemd_user_unitdir}/WindowManager.service ${D}${sysconfdir}/systemd/user/default.target.wants +} + +FILES_${PN} += "/usr/AGL/${PN}/ ${systemd_user_unitdir}" +FILES_${PN}-dbg += "/usr/AGL/${PN}/.debug" + -- cgit 1.2.3-korg