From 59bc9aa93a79e8705e66264613a17262ea9ee831 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 30 Dec 2014 14:49:40 +0100 Subject: [PATCH] meta-tizen: fix tlm for Tizen ivi Change-Id: I653b03e2b23253b723972f7028f6ab74203d677f (From meta-tizen rev: 04dcb65126e39be069cf770ae7ed0d7441ce5661) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- .../recipes-core/tlm/tlm-extraconf.inc | 104 ++++++++++++++++++++- .../recipes-core/tlm/tlm_git.bb | 2 +- 2 files changed, 104 insertions(+), 2 deletions(-) diff --git a/meta-tizen/meta-tizen-common-base/recipes-core/tlm/tlm-extraconf.inc b/meta-tizen/meta-tizen-common-base/recipes-core/tlm/tlm-extraconf.inc index 11df296..f50b5c1 100644 --- a/meta-tizen/meta-tizen-common-base/recipes-core/tlm/tlm-extraconf.inc +++ b/meta-tizen/meta-tizen-common-base/recipes-core/tlm/tlm-extraconf.inc @@ -1,3 +1,105 @@ FILES_${PN}-dbg += "${prefix}/lib/tlm/plugins/.debug" inherit systemd -SYSTEMD_SERVICE_${PN} = "tlm.service" \ No newline at end of file +SYSTEMD_SERVICE_${PN} = "tlm.service" + +do_install() { + export RPM_BUILD_ROOT=${D} + cd ${S} + LANG=C + export LANG + unset DISPLAY + rm -rf ${D} + mkdir -p ${D} + + rm -rf ${D} + + oe_runmake \ + DESTDIR=${D} \ + INSTALL_ROOT=${D} \ + BINDIR=${prefix}/bin \ + install + rm -f ${D}${infodir}/dir + find ${D} -regex ".*\.la$" | xargs rm -f -- + find ${D} -regex ".*\.a$" | xargs rm -f -- + rm -f ${D}${sysconfdir}/tlm.conf + install -m 755 -d ${D}${systemd_unitdir}/system + install -m 644 data/tlm.service ${D}${systemd_unitdir}/system + install -m 755 -d ${D}${sysconfdir}/pam.d + install -m 644 data/tlm-login ${D}${sysconfdir}/pam.d/ + install -m 644 data/tlm-default-login ${D}${sysconfdir}/pam.d/ + install -m 644 data/tlm-system-login ${D}${sysconfdir}/pam.d/ + install -m 755 -d ${D}${sysconfdir}/session.d + + + if ${@bb.utils.contains('IMAGECONFIG','config-tizen-ivi','true','false',d)}; then + install -m 755 -d ${D}${sysconfdir}/xdg/weston + install -m 644 data/tizen-ivi/etc/tlm*.conf ${D}${sysconfdir} + install -m 755 data/tizen-ivi/etc/session.d/* ${D}${sysconfdir}/session.d/ + install -m 644 data/tizen-ivi/weston-*.ini ${D}${sysconfdir}/xdg/weston/ + install -m 755 -d ${D}${sysconfdir}/udev/rules.d + install -m 644 data/tizen-ivi/10-multiseat-vtc1010.rules ${D}${sysconfdir}/udev/rules.d/ + fi + if ${@bb.utils.contains('IMAGECONFIG','config-tizen-common','true','false',d)}; then + install -m 644 data/tizen-common/etc/tlm.conf ${D}${sysconfdir} + install -m 755 data/tizen-common/etc/session.d/* ${D}${sysconfdir}/session.d/ + fi + + +} + +PACKAGES += " ${PN}-config" +PACKAGES += " ${PN}-config-ivi" +PACKAGES += " ${PN}-config-ivi-singleseat " +PACKAGES += " ${PN}-config-ivi-multiseat " +PACKAGES += " ${PN}-config-ivi-vtc1010 " + +RDEPENDS_${PN}-config-common += "${PN}-config" +RDEPENDS_${PN}-config-ivi += "${PN}-config" +RDEPENDS_${PN}-config-ivi-singleseat += "${PN}-config-ivi" +RDEPENDS_${PN}-config-ivi-multiseat += "${PN}-config-ivi" +RDEPENDS_${PN}-config-ivi-vtc1010 += "${PN}-config-ivi" + +FILES_${PN}-config += "${sysconfdir}/session.d/user-session" +FILES_${PN}-config-common_remove = "${sysconfdir}/session.d/*" + +FILES_${PN}-config-ivi += "${sysconfdir}/session.d/user-session-ico" +FILES_${PN}-config-ivi += "${sysconfdir}/session.d/user-session-modello" +FILES_${PN}-config-ivi += "${sysconfdir}/xdg/weston/weston-user.ini" +FILES_${PN}-config-ivi += "${sysconfdir}/xdg/weston/weston-genivi.ini" + +FILES_${PN}-config-ivi-singleseat += "${sysconfdir}/tlm-singleseat.conf" +FILES_${PN}-config-ivi-singleseat += "${sysconfdir}/session.d/genivi-session-singleseat" + +FILES_${PN}-config-ivi-multiseat += "${sysconfdir}/tlm-multiseat.conf" +FILES_${PN}-config-ivi-multiseat += "${sysconfdir}/session.d/genivi-session-multiseat" + +FILES_${PN}-config-ivi-vtc1010 += "${sysconfdir}/tlm-vtc1010.conf" +FILES_${PN}-config-ivi-vtc1010 += "${sysconfdir}/session.d/genivi-session-vtc1010" +FILES_${PN}-config-ivi-vtc1010 += "${sysconfdir}/xdg/weston/weston-genivi-vtc1010.ini" +FILES_${PN}-config-ivi-vtc1010 += "${sysconfdir}/udev/rules.d/*" + +PKG_tlm-config-ivi = "tlm-config-ivi" +PKG_tlm-config-ivi-singleseat= "tlm-config-ivi-singleseat" +PKG_tlm-config-ivi-multiseat = "tlm-config-ivi-multiseat" +PKG_tlm-config-ivi-vtc1010 = "tlm-config-ivi-vtc1010" + + +pkg_postinst_${PN}-config-ivi-singleseat() { + ln -s -f /etc/tlm-singleseat.conf $D/etc/tlm.conf + grep -q user-session-modello $D/etc/tlm-singleseat.conf || sed -i s:SESSION_CMD=/etc/session.d/user-session:SESSION_CMD=/etc/session.d/user-session-modello:g $D/etc/tlm-singleseat.conf +} + +pkg_postinst_${PN}-config-ivi-multiseat() { + ln -s -f /etc/tlm-multiseat.conf $D/etc/tlm.conf +} + +pkg_postinst_${PN}-config-ivi-vtc1010() { + ln -s -f /etc/tlm-vtc1010.conf $D/etc/tlm.conf +} + + + + + + + diff --git a/meta-tizen/meta-tizen-common-base/recipes-core/tlm/tlm_git.bb b/meta-tizen/meta-tizen-common-base/recipes-core/tlm/tlm_git.bb index b46003f..8fd4b14 100644 --- a/meta-tizen/meta-tizen-common-base/recipes-core/tlm/tlm_git.bb +++ b/meta-tizen/meta-tizen-common-base/recipes-core/tlm/tlm_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/system/tlm;tag=750c73687bbfa61fc564b7078075407cb9d97b38;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/system/tlm;tag=7619ed83dcbcd4c0f1c454a07c62a3d54e3ff641;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4