CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

entrance: move systemd support from meta-systemd back to meta-efl

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2013-04-13 13:18:55 +02:00
parent 7baa466291
commit 48442f2621
4 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service → meta-efl/recipes-efl/efl/entrance/entrance.service
View File

19
meta-efl/recipes-efl/efl/entrance_svn.bb
View File

@ -4,18 +4,35 @@ LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SECTION = "e/apps"
inherit e gettext
inherit e gettext systemd
SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \
file://0001-pam-use-common-auth-instead-of-system-auth.patch \
file://entrance.service \
"
S = "${WORKDIR}/${SRCNAME}"
EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}"
PR = "r4"
PV = "0.0.4+svnr${SRCPV}"
SRCREV = "${EFL_SRCREV}"
RDEPENDS_${PN} += "${PN}-themes sessreg xauth"
CONFFILES_${PN} += "${sysconfdir}/entrance.conf"
RCONFLICTS_${PN} += "xserver-nodm-init"
RREPLACES_${PN} += "xserver-nodm-init"
RCONFLICTS_${PN} += "xserver-nodm-init-systemd"
RREPLACES_${PN} += "xserver-nodm-init-systemd"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "entrance.service"
do_install_append() {
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/entrance.service ${D}${systemd_unitdir}/system
}

2
meta-systemd/conf/layer.conf
View File

@ -20,8 +20,6 @@ BBFILES += "\
'', '${LAYERDIR}/invalid.bb', d)} \
${@base_contains('BBFILE_COLLECTIONS', 'gnome-layer',\
'${LAYERDIR}/meta-gnome/recipes-*/*/*.bbappend', '', d)} \
${@base_contains('BBFILE_COLLECTIONS', 'efl-layer',\
'${LAYERDIR}/meta-efl/recipes-*/*/*.bbappend', '', d)} \
${@base_contains('BBFILE_COLLECTIONS', 'multimedia-layer',\
'${LAYERDIR}/meta-multimedia/recipes-*/*/*.bbappend', '', d)} \
${@base_contains('BBFILE_COLLECTIONS', 'networking',\

21
meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
View File

@ -1,21 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 3}"
inherit systemd
SRC_URI += "file://entrance.service"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "entrance.service"
do_install_append() {
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/entrance.service ${D}${systemd_unitdir}/system
}
RCONFLICTS_${PN} += "xserver-nodm-init-systemd"
RREPLACES_${PN} += "xserver-nodm-init-systemd"