diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 13:53:32 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:03 +0200 |
commit | 17c747d85e155f3eb2fab97c5a1ad66a68d809bc (patch) | |
tree | 4e9eb7d387bfcc614014110e851359bb1b8832cc | |
parent | 5f26b009643d8a1a73aecb3aa0b7c5873943e7a1 (diff) | |
download | meta-openembedded-17c747d85e155f3eb2fab97c5a1ad66a68d809bc.tar.gz |
xfce4-session: move systemd support from meta-systemd back to meta-xfce
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
6 files changed, 3 insertions, 9 deletions
diff --git a/meta-systemd/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bbappend b/meta-systemd/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bbappend deleted file mode 100644 index 59c471e21..000000000 --- a/meta-systemd/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bbappend +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | # look for files in the layer first | ||
2 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
3 | |||
4 | DEPENDS += "systemd" | ||
5 | |||
6 | PRINC := "${@int(PRINC) + 2}" | ||
7 | |||
8 | SRC_URI += "file://0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch" | ||
diff --git a/meta-systemd/meta-xfce/recipes-xfce/xfce4-session/files/0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch index ca5c36222..ca5c36222 100644 --- a/meta-systemd/meta-xfce/recipes-xfce/xfce4-session/files/0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch | |||
diff --git a/meta-xfce/recipes-xfce/xfce4-session/files/0001-Handle-multiple-interactive-session-save-bug-5379.patch b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-Handle-multiple-interactive-session-save-bug-5379.patch index dd9c6d467..dd9c6d467 100644 --- a/meta-xfce/recipes-xfce/xfce4-session/files/0001-Handle-multiple-interactive-session-save-bug-5379.patch +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-Handle-multiple-interactive-session-save-bug-5379.patch | |||
diff --git a/meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0002-Remove-gnome-keyring-remains.patch index b26669f6e..b26669f6e 100644 --- a/meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0002-Remove-gnome-keyring-remains.patch | |||
diff --git a/meta-xfce/recipes-xfce/xfce4-session/files/0003-configure.in-hard-code-path-to-iceauth.patch b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0003-configure.in-hard-code-path-to-iceauth.patch index 41a527c61..41a527c61 100644 --- a/meta-xfce/recipes-xfce/xfce4-session/files/0003-configure.in-hard-code-path-to-iceauth.patch +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0003-configure.in-hard-code-path-to-iceauth.patch | |||
diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb index 6ad834d66..2c185a515 100644 --- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb | |||
@@ -3,8 +3,9 @@ SECTION = "x11" | |||
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" |
5 | DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf" | 5 | DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf" |
6 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | ||
6 | RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower" | 7 | RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower" |
7 | PR = "r2" | 8 | PR = "r5" |
8 | 9 | ||
9 | inherit xfce | 10 | inherit xfce |
10 | 11 | ||
@@ -13,6 +14,7 @@ SRC_URI[sha256sum] = "bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a7 | |||
13 | SRC_URI += "file://0001-Handle-multiple-interactive-session-save-bug-5379.patch \ | 14 | SRC_URI += "file://0001-Handle-multiple-interactive-session-save-bug-5379.patch \ |
14 | file://0002-Remove-gnome-keyring-remains.patch \ | 15 | file://0002-Remove-gnome-keyring-remains.patch \ |
15 | file://0003-configure.in-hard-code-path-to-iceauth.patch \ | 16 | file://0003-configure.in-hard-code-path-to-iceauth.patch \ |
17 | file://0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch \ | ||
16 | " | 18 | " |
17 | 19 | ||
18 | # protect from frightening message that xfce might not work correctly | 20 | # protect from frightening message that xfce might not work correctly |