diff options
author | Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-11-25 16:10:57 +0100 |
---|---|---|
committer | Jens Bocklage <jens_bocklage@mentor.com> | 2016-11-28 16:47:37 +0000 |
commit | 0badea4ec8fdea7798f142dd73925323bd99b422 (patch) | |
tree | f4e115118915011244a0cc24cc2fb73901d31c68 /recipes-demo-hmi | |
parent | 0849ee91102f00e69260b6de17945378faf1064b (diff) |
Auto start of HomeScreen
v2: (Tadao Taniakwa)
- Fix extra PATH to use commands provided by qtbase-native.
(qdbusxml2cpp and moc is used when building HomeScreen)
v1: (Bocklage, Jens)
- HomeScreen is started via systemd during system startup
- Fix for SPEC-333: render order of surfaces is now always set
Change-Id: I2c898c783353b7cb177b80553e69ab5fb50a14bd
Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
Diffstat (limited to 'recipes-demo-hmi')
-rw-r--r-- | recipes-demo-hmi/HomeScreen/HomeScreen_0.6.3.bb (renamed from recipes-demo-hmi/HomeScreen/HomeScreen_0.6.2.bb) | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/recipes-demo-hmi/HomeScreen/HomeScreen_0.6.2.bb b/recipes-demo-hmi/HomeScreen/HomeScreen_0.6.3.bb index 957dfdb5d..668ae0b48 100644 --- a/recipes-demo-hmi/HomeScreen/HomeScreen_0.6.2.bb +++ b/recipes-demo-hmi/HomeScreen/HomeScreen_0.6.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "AGL Home Screen Application + SampleAppTimeDate + HomeScreenAppFr HOMEPAGE = "https://wiki.automotivelinux.org/homescreen" LICENSE = "Apache-2.0" SECTION = "apps" -PV = "0.6.2+gitr${SRCPV}" +PV = "0.6.3+gitr${SRCPV}" S = "${WORKDIR}/git/" inherit qmake5 systemd @@ -19,14 +19,10 @@ DEPENDS += " glib-2.0 " DEPENDS += " qtdeclarative " LIC_FILES_CHKSUM = "file://HomeScreen/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" -SRCREV = "7f06418646c8822452f8541386810208c523f990" +SRCREV = "75a4e94d7610db25c98f05cdda9491f4e7c0a4db" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/staging/HomeScreen.git;protocol=http" - -do_compile_prepend(){ - PATH=$PATH:${STAGING_BINDIR_NATIVE}/qt5 - export PATH -} +PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" do_install() { install -d ${D}/usr/AGL/${PN} @@ -47,21 +43,26 @@ do_install() { ln -sf ${libdir}/libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so.1 ln -sf ${libdir}/libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so.1.0 - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/HomeScreen/conf/HomeScreen.service ${D}${systemd_unitdir}/system - install -m 0644 ${S}/HomeScreenAppFrameworkBinderAGL/conf/HomeScreenAppFrameworkBinderAGL.service ${D}${systemd_unitdir}/system - install -m 0644 ${S}/InputEventManager/conf/InputEventManager.service ${D}${systemd_unitdir}/system - install -m 0644 ${S}/WindowManager/conf/WindowManager.service ${D}${systemd_unitdir}/system + + 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 -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}/ /usr/AGL/${PN}/colorschemes ${libdir} ${systemd_unitdir}/system" +FILES_${PN} += "/usr/AGL/${PN}/ /usr/AGL/${PN}/colorschemes ${libdir} ${systemd_user_unitdir}" FILES_${PN}-dbg += "/usr/AGL/${PN}/.debug" #SYSTEMD_PACKAGES - no separate packages -SYSTEMD_SERVICE += "WindowManager.service" -SYSTEMD_SERVICE += "HomeScreen.service" -SYSTEMD_SERVICE += "InputEventManager.service" -SYSTEMD_SERVICE += "HomeScreenAppFrameworkBinderAGL.service" +#SYSTEMD_SERVICE += "WindowManager.service" +#SYSTEMD_SERVICE += "HomeScreen.service" +#SYSTEMD_SERVICE += "InputEventManager.service" +#SYSTEMD_SERVICE += "HomeScreenAppFrameworkBinderAGL.service" ############################################# |