aboutsummaryrefslogtreecommitdiffstats
path: root/meta-systemd
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 13:18:55 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:22:02 +0200
commit48442f26214e67567321e9091f2c43f745cfe980 (patch)
treed2e0534b16f7f67e08c3e426367965047d36d786 /meta-systemd
parent7baa466291ecdce5d36fb6cfa17689d2419549ba (diff)
downloadmeta-openembedded-48442f26214e67567321e9091f2c43f745cfe980.tar.gz
entrance: move systemd support from meta-systemd back to meta-efl
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-systemd')
-rw-r--r--meta-systemd/conf/layer.conf2
-rw-r--r--meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service8
-rw-r--r--meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend21
3 files changed, 0 insertions, 31 deletions
diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf
index d06cfa138e..c064333bfb 100644
--- a/meta-systemd/conf/layer.conf
+++ b/meta-systemd/conf/layer.conf
@@ -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',\
diff --git a/meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service b/meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service
deleted file mode 100644
index 4828686952..0000000000
--- a/meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Login manager for Enlightenment
-
-[Service]
-ExecStart=/usr/sbin/entrance
-
-[Install]
-Alias=display-manager.service
diff --git a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
deleted file mode 100644
index 63c33fb575..0000000000
--- a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
+++ /dev/null
@@ -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"