summaryrefslogtreecommitdiffstats
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 d06cfa138..c064333bf 100644
--- a/meta-systemd/conf/layer.conf
+++ b/meta-systemd/conf/layer.conf
@@ -20,8 +20,6 @@ BBFILES += "\
20 '', '${LAYERDIR}/invalid.bb', d)} \ 20 '', '${LAYERDIR}/invalid.bb', d)} \
21 ${@base_contains('BBFILE_COLLECTIONS', 'gnome-layer',\ 21 ${@base_contains('BBFILE_COLLECTIONS', 'gnome-layer',\
22 '${LAYERDIR}/meta-gnome/recipes-*/*/*.bbappend', '', d)} \ 22 '${LAYERDIR}/meta-gnome/recipes-*/*/*.bbappend', '', d)} \
23 ${@base_contains('BBFILE_COLLECTIONS', 'efl-layer',\
24 '${LAYERDIR}/meta-efl/recipes-*/*/*.bbappend', '', d)} \
25 ${@base_contains('BBFILE_COLLECTIONS', 'multimedia-layer',\ 23 ${@base_contains('BBFILE_COLLECTIONS', 'multimedia-layer',\
26 '${LAYERDIR}/meta-multimedia/recipes-*/*/*.bbappend', '', d)} \ 24 '${LAYERDIR}/meta-multimedia/recipes-*/*/*.bbappend', '', d)} \
27 ${@base_contains('BBFILE_COLLECTIONS', 'networking',\ 25 ${@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 482868695..000000000
--- a/meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service
+++ /dev/null
@@ -1,8 +0,0 @@
1[Unit]
2Description=Login manager for Enlightenment
3
4[Service]
5ExecStart=/usr/sbin/entrance
6
7[Install]
8Alias=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 63c33fb57..000000000
--- a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3PRINC := "${@int(PRINC) + 3}"
4
5inherit systemd
6
7SRC_URI += "file://entrance.service"
8
9RPROVIDES_${PN} += "${PN}-systemd"
10RREPLACES_${PN} += "${PN}-systemd"
11RCONFLICTS_${PN} += "${PN}-systemd"
12
13SYSTEMD_SERVICE_${PN} = "entrance.service"
14
15do_install_append() {
16 install -d ${D}${systemd_unitdir}/system
17 install -m 0644 ${WORKDIR}/entrance.service ${D}${systemd_unitdir}/system
18}
19
20RCONFLICTS_${PN} += "xserver-nodm-init-systemd"
21RREPLACES_${PN} += "xserver-nodm-init-systemd"