Signed-off-by: Martin Jansa <[email protected]>
---
.../recipes-xfce/xfce4-session/xfce4-session_4.10.0.bbappend | 8 --------
...001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch | 0
.../0001-Handle-multiple-interactive-session-save-bug-5379.patch | 0
.../0002-Remove-gnome-keyring-remains.patch | 0
.../0003-configure.in-hard-code-path-to-iceauth.patch | 0
meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb | 4 +++-
6 files changed, 3 insertions(+), 9 deletions(-)
delete mode 100644
meta-systemd/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bbappend
rename {meta-systemd/meta-xfce/recipes-xfce/xfce4-session/files =>
meta-xfce/recipes-xfce/xfce4-session/xfce4-session}/0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch
(100%)
rename meta-xfce/recipes-xfce/xfce4-session/{files =>
xfce4-session}/0001-Handle-multiple-interactive-session-save-bug-5379.patch
(100%)
rename meta-xfce/recipes-xfce/xfce4-session/{files =>
xfce4-session}/0002-Remove-gnome-keyring-remains.patch (100%)
rename meta-xfce/recipes-xfce/xfce4-session/{files =>
xfce4-session}/0003-configure.in-hard-code-path-to-iceauth.patch (100%)
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 59c471e..0000000
---
a/meta-systemd/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-DEPENDS += "systemd"
-
-PRINC := "${@int(PRINC) + 2}"
-
-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
similarity index 100%
rename from
meta-systemd/meta-xfce/recipes-xfce/xfce4-session/files/0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch
rename to
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
similarity index 100%
rename from
meta-xfce/recipes-xfce/xfce4-session/files/0001-Handle-multiple-interactive-session-save-bug-5379.patch
rename to
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
similarity index 100%
rename from
meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch
rename to
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
similarity index 100%
rename from
meta-xfce/recipes-xfce/xfce4-session/files/0003-configure.in-hard-code-path-to-iceauth.patch
rename to
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 6ad834d..2c185a5 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"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus
dbus-glib xfconf"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower"
-PR = "r2"
+PR = "r5"
inherit xfce
@@ -13,6 +14,7 @@ SRC_URI[sha256sum] =
"bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a7
SRC_URI +=
"file://0001-Handle-multiple-interactive-session-save-bug-5379.patch \
file://0002-Remove-gnome-keyring-remains.patch \
file://0003-configure.in-hard-code-path-to-iceauth.patch \
+
file://0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch \
"
# protect from frightening message that xfce might not work correctly
--
1.8.1.5
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
