[meta-systemd][PATCH 01/33] keymaps: move bbappend to oe-core subdirectory

[meta-systemd][PATCH 01/33] keymaps: move bbappend to oe-core subdirectory

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../{meta-oe => oe-core}/recipes-bsp/keymaps/keymaps/keymaps.service      | 0
 .../{meta-oe => oe-core}/recipes-bsp/keymaps/keymaps_1.0.bbappend         | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-systemd/{meta-oe => oe-core}/recipes-bsp/keymaps/keymaps/keymaps.service (100%)
 rename meta-systemd/{meta-oe => oe-core}/recipes-bsp/keymaps/keymaps_1.0.bbappend (100%)

diff --git a/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service b/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service
rename to meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service
diff --git a/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend b/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend
similarity index 100%
rename from meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
rename to meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend
-- 
1.8.1.5

[meta-systemd][PATCH 02/33] dropbear: move bbappend to oe-core subdirectory

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../{meta-oe => oe-core}/recipes-core/dropbear/dropbear/dropbear.socket   | 0
 .../{meta-oe => oe-core}/recipes-core/dropbear/dropbear/dropbear@.service | 0
 .../recipes-core/dropbear/dropbear/dropbearkey.service                    | 0
 .../{meta-oe => oe-core}/recipes-core/dropbear/dropbear_2012.55.bbappend  | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-systemd/{meta-oe => oe-core}/recipes-core/dropbear/dropbear/dropbear.socket (100%)
 rename meta-systemd/{meta-oe => oe-core}/recipes-core/dropbear/dropbear/dropbear@.service (100%)
 rename meta-systemd/{meta-oe => oe-core}/recipes-core/dropbear/dropbear/dropbearkey.service (100%)
 rename meta-systemd/{meta-oe => oe-core}/recipes-core/dropbear/dropbear_2012.55.bbappend (100%)

diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket b/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket
similarity index 100%
rename from meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket
rename to meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear.socket
diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service b/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear@.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service
rename to meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbear@.service
diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service
rename to meta-systemd/oe-core/recipes-core/dropbear/dropbear/dropbearkey.service
diff --git a/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend b/meta-systemd/oe-core/recipes-core/dropbear/dropbear_2012.55.bbappend
similarity index 100%
rename from meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend
rename to meta-systemd/oe-core/recipes-core/dropbear/dropbear_2012.55.bbappend
-- 
1.8.1.5

[meta-systemd][PATCH 03/33] busybox: move bbappend to oe-core subdirectory

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-core/busybox/busybox/busybox-klogd.service.in                 | 0
 .../recipes-core/busybox/busybox/busybox-syslog.service.in                | 0
 .../{meta-oe => oe-core}/recipes-core/busybox/busybox_1.20.2.bbappend     | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-systemd/{meta-oe => oe-core}/recipes-core/busybox/busybox/busybox-klogd.service.in (100%)
 rename meta-systemd/{meta-oe => oe-core}/recipes-core/busybox/busybox/busybox-syslog.service.in (100%)
 rename meta-systemd/{meta-oe => oe-core}/recipes-core/busybox/busybox_1.20.2.bbappend (100%)

diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in b/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-klogd.service.in
similarity index 100%
rename from meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
rename to meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-klogd.service.in
diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in b/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in
similarity index 100%
rename from meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
rename to meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in
diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend b/meta-systemd/oe-core/recipes-core/busybox/busybox_1.20.2.bbappend
similarity index 100%
rename from meta-systemd/meta-oe/recipes-core/busybox/busybox_1.20.2.bbappend
rename to meta-systemd/oe-core/recipes-core/busybox/busybox_1.20.2.bbappend
-- 
1.8.1.5

[meta-systemd][PATCH 04/33] rpcbind: move bbappend to oe-core subdirectory

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../{meta-oe => oe-core}/recipes-extended/rpcbind/rpcbind/rpcbind.service | 0
 .../{meta-oe => oe-core}/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-systemd/{meta-oe => oe-core}/recipes-extended/rpcbind/rpcbind/rpcbind.service (100%)
 rename meta-systemd/{meta-oe => oe-core}/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend (100%)

diff --git a/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind/rpcbind.service b/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind/rpcbind.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind/rpcbind.service
rename to meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind/rpcbind.service
diff --git a/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend b/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend
similarity index 100%
rename from meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend
rename to meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend
-- 
1.8.1.5

[meta-systemd][PATCH 05/33] at: move bbappend to oe-core subdirectory

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-systemd/{meta-oe => oe-core}/recipes-extended/at/at/atd.service     | 0
 meta-systemd/{meta-oe => oe-core}/recipes-extended/at/at_3.1.13.bbappend | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-systemd/{meta-oe => oe-core}/recipes-extended/at/at/atd.service (100%)
 rename meta-systemd/{meta-oe => oe-core}/recipes-extended/at/at_3.1.13.bbappend (100%)

diff --git a/meta-systemd/meta-oe/recipes-extended/at/at/atd.service b/meta-systemd/oe-core/recipes-extended/at/at/atd.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-extended/at/at/atd.service
rename to meta-systemd/oe-core/recipes-extended/at/at/atd.service
diff --git a/meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend b/meta-systemd/oe-core/recipes-extended/at/at_3.1.13.bbappend
similarity index 100%
rename from meta-systemd/meta-oe/recipes-extended/at/at_3.1.13.bbappend
rename to meta-systemd/oe-core/recipes-extended/at/at_3.1.13.bbappend
-- 
1.8.1.5

[meta-systemd][PATCH 06/33] entrance: move systemd support from meta-systemd back to meta-efl

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-efl/efl/entrance/entrance.service       |  0
 meta-efl/recipes-efl/efl/entrance_svn.bb            | 19 ++++++++++++++++++-
 meta-systemd/conf/layer.conf                        |  2 --
 .../meta-efl/recipes-efl/efl/entrance_svn.bbappend  | 21 ---------------------
 4 files changed, 18 insertions(+), 24 deletions(-)
 rename {meta-systemd/meta-efl => meta-efl}/recipes-efl/efl/entrance/entrance.service (100%)
 delete mode 100644 meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend

diff --git a/meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service b/meta-efl/recipes-efl/efl/entrance/entrance.service
similarity index 100%
rename from meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service
rename to meta-efl/recipes-efl/efl/entrance/entrance.service
diff --git a/meta-efl/recipes-efl/efl/entrance_svn.bb b/meta-efl/recipes-efl/efl/entrance_svn.bb
index 585d552..02eb64b 100644
--- a/meta-efl/recipes-efl/efl/entrance_svn.bb
+++ b/meta-efl/recipes-efl/efl/entrance_svn.bb
@@ -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
+}
diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf
index d06cfa1..c064333 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_svn.bbappend b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
deleted file mode 100644
index 63c33fb..0000000
--- 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"
-- 
1.8.1.5

[meta-systemd][PATCH 07/33] gdm: move systemd support from meta-systemd back to meta-gnome

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-gnome/gdm/gdm                            |  0
 meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb           | 17 +++++++++++------
 .../meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend | 20 --------------------
 3 files changed, 11 insertions(+), 26 deletions(-)
 rename meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in => meta-gnome/recipes-gnome/gdm/gdm (100%)
 delete mode 100644 meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend

diff --git a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in b/meta-gnome/recipes-gnome/gdm/gdm
similarity index 100%
rename from meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
rename to meta-gnome/recipes-gnome/gdm/gdm
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index 863db2e..45bddc8 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb"
 
-PR = "r10"
+PR = "r15"
 
-inherit gnome update-rc.d
+inherit gnome update-rc.d systemd
 
 SRC_URI += " \
             file://cross-xdetection.diff \
@@ -17,6 +17,7 @@ SRC_URI += " \
             file://gdm.conf \
             file://gdm-pam \
             file://Default \
+            file://gdm.service.in \
            "
 
 SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e"
@@ -49,6 +50,10 @@ do_install_append() {
 	install -d ${D}/${sysconfdir}/gdm/Init
 	install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init
 
+	install -d ${D}${systemd_unitdir}/system
+	sed -e 's,%sbindir%,${sbindir},g' \
+		< ${WORKDIR}/gdm.service.in \
+		> ${D}${systemd_unitdir}/system/gdm.service
 }
 
 FILES_${PN} += "${datadir}/icon* \
@@ -60,6 +65,10 @@ RDEPENDS_${PN} += "grep dbus-x11 shadow"
 CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm"
 RRECOMMENDS_${PN} += "openssh-misc desktop-file-utils glib-2.0-utils metacity gnome-session polkit-gnome consolekit"
 
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "gdm.service"
+
 INITSCRIPT_NAME = "gdm"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
 
@@ -87,7 +96,3 @@ pkg_postrm_${PN} () {
     delgroup gdm || true
 	sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true
 }
-
-
-
-
diff --git a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
deleted file mode 100644
index 6201352..0000000
--- a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
+++ /dev/null
@@ -1,20 +0,0 @@
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 4}"
-
-inherit systemd
-
-SRC_URI += "file://gdm.service.in"
-
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	sed -e 's,%sbindir%,${sbindir},g' \
-		< ${WORKDIR}/gdm.service.in \
-		> ${D}${systemd_unitdir}/system/gdm.service
-}
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "gdm.service"
-- 
1.8.1.5

[meta-systemd][PATCH 08/33] mpd: move systemd support from meta-systemd back to meta-multimedia

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb | 16 ++++++++++++++--
 .../recipes-multimedia/musicpd/mpd_0.17.1.bbappend       | 16 ----------------
 2 files changed, 14 insertions(+), 18 deletions(-)
 delete mode 100644 meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend

diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
index 2b7e555..a6b8898 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
@@ -6,7 +6,7 @@ HOMEPAGE ="http://sourceforge.net/projects/musicpd"
 DEPENDS = "alsa-lib libsamplerate0 libsndfile1 libvorbis libogg faad2 ffmpeg curl sqlite bzip2 pulseaudio \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad lame libid3tag', d)}"
 
-PR = "r1"
+PR = "r4"
 
 SRC_URI = " \
     ${SOURCEFORGE_MIRROR}/musicpd/${PN}/${PV}/${PN}-${PV}.tar.bz2 \
@@ -16,9 +16,10 @@ SRC_URI = " \
 SRC_URI[md5sum] = "da3f3d6617a877192db4c6f53504cd38"
 SRC_URI[sha256sum] = "b18cdb1b779ca2ab323e212a0af4a567b7da4881a4e96868a8979bdfdbe7c2e8"
 
-inherit autotools useradd
+inherit autotools useradd systemd
 
 EXTRA_OECONF = "enable_bzip2=yes"
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
 
 do_install_append() {
     install -d ${D}/${localstatedir}/lib/mpd/music
@@ -36,8 +37,19 @@ do_install_append() {
         -e 's|%log_file%|${localstatedir}/log/mpd.log|' \
         -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \
         ${D}/${sysconfdir}/mpd.conf
+
+    if [ -e ${D}/${systemd_unitdir}/system/mpd.service ] ; then
+        sed -i \
+            's|^ExecStart=.*|ExecStart=${bindir}/mpd --no-daemon|' \
+            ${D}/${systemd_unitdir}/system/mpd.service
+    fi
 }
 
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "mpd.service"
+
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = " \
     --system --no-create-home \
diff --git a/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend b/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend
deleted file mode 100644
index a3f5f3b..0000000
--- a/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-PRINC := "${@int(PRINC) + 2}"
-
-inherit systemd
-
-EXTRA_OECONF += "--with-systemdsystemunitdir=${systemd_unitdir}/system"
-
-do_install_append() {
-    sed -i \
-        's|^ExecStart=.*|ExecStart=${bindir}/mpd --no-daemon|' \
-        ${D}/${systemd_unitdir}/system/mpd.service
-}
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "mpd.service"
-- 
1.8.1.5

[meta-systemd][PATCH 09/33] autofs: move systemd support from meta-systemd back to meta-networking

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb           | 9 +++++++--
 .../meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend | 8 --------
 2 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend

diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
index 6751402..8db4378 100644
--- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
+++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
@@ -3,11 +3,11 @@ SECTION = "base"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
-PR = "r3"
+PR = "r6"
 
 DEPENDS += "libtirpc flex-native bison-native"
 
-inherit autotools
+inherit autotools systemd
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.bz2 \
            file://autofs-5.0.7-fix-nobind-sun-escaped-map-entries.patch \
@@ -97,3 +97,8 @@ do_install_append () {
 }
 
 INSANE_SKIP_${PN} = "dev-so"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "autofs.service"
diff --git a/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend b/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend
deleted file mode 100644
index 69ea5d3..0000000
--- a/meta-systemd/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 2}"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "autofs.service"
-- 
1.8.1.5

[meta-systemd][PATCH 10/33] ntp: move systemd support from meta-systemd back to meta-networking

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-networking/recipes-support/ntp/ntp.inc        | 29 +++++++++++++++++++---
 .../recipes-support/ntp/ntp/ntpd.service           |  0
 .../recipes-support/ntp/ntp/ntpdate.service        |  0
 meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb |  1 -
 .../recipes-support/ntp/ntp_4.2.6p5.bbappend       | 28 ---------------------
 5 files changed, 26 insertions(+), 32 deletions(-)
 rename {meta-systemd/meta-networking => meta-networking}/recipes-support/ntp/ntp/ntpd.service (100%)
 rename {meta-systemd/meta-networking => meta-networking}/recipes-support/ntp/ntp/ntpdate.service (100%)
 delete mode 100644 meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend

diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
index d93f22d..3f53fff 100644
--- a/meta-networking/recipes-support/ntp/ntp.inc
+++ b/meta-networking/recipes-support/ntp/ntp.inc
@@ -8,7 +8,7 @@ SECTION = "console/network"
 LICENSE = "NTP"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fea4b50c33b18c2194b4b1c9ca512670"
 
-INC_PR = "r3"
+INC_PR = "r6"
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \
            file://tickadj.c.patch \
@@ -18,9 +18,11 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
            file://ntp.conf \
            file://ntpdate \
            file://ntpdate.default \
+           file://ntpdate.service \
+           file://ntpd.service \
            "
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
 
 # The ac_cv_header_readline_history is to stop ntpdc depending on either
 # readline or curses
@@ -52,6 +54,10 @@ do_install_append() {
 	install -m 644 ${WORKDIR}/ntpdate.default ${D}${sysconfdir}/default/ntpdate
 	install -d ${D}/${sysconfdir}/network/if-up.d
 	ln -s ${bindir}/ntpdate-sync ${D}/${sysconfdir}/network/if-up.d
+
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/
+	install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/
 }
 
 PACKAGES += "ntpdate ${PN}-tickadj ${PN}-utils"
@@ -65,12 +71,29 @@ RPROVIDES_${PN}-utils = "${PN}-bin"
 RREPLACES_${PN}-utils = "${PN}-bin"
 RCONFLICTS_${PN}-utils = "${PN}-bin"
 
+SYSTEMD_PACKAGES = "${PN} ntpdate"
+SYSTEMD_SERVICE_${PN} = "ntpd.service"
+SYSTEMD_SERVICE_ntpdate = "ntpdate.service"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+
+RPROVIDES_ntpdate += "ntpdate-systemd"
+RREPLACES_ntpdate += "ntpdate-systemd"
+RCONFLICTS_ntpdate += "ntpdate-systemd"
+
 RSUGGESTS_${PN} = "iana-etc"
 
 FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${sbindir} ${libdir}"
 FILES_${PN}-tickadj = "${bindir}/tickadj"
 FILES_${PN}-utils = "${bindir}"
-FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate-sync ${bindir}/ntpdate-sync ${sysconfdir}/default/ntpdate"
+FILES_ntpdate = "${bindir}/ntpdate \
+  ${sysconfdir}/network/if-up.d/ntpdate-sync \
+  ${bindir}/ntpdate-sync \
+  ${sysconfdir}/default/ntpdate \
+  ${systemd_unitdir}/system/ntpdate.service \
+"
 
 CONFFILES_${PN} = "${sysconfdir}/ntp.conf"
 CONFFILES_ntpdate = "${sysconfdir}/default/ntpdate"
diff --git a/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpd.service b/meta-networking/recipes-support/ntp/ntp/ntpd.service
similarity index 100%
rename from meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpd.service
rename to meta-networking/recipes-support/ntp/ntp/ntpd.service
diff --git a/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service b/meta-networking/recipes-support/ntp/ntp/ntpdate.service
similarity index 100%
rename from meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service
rename to meta-networking/recipes-support/ntp/ntp/ntpdate.service
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
index f1e9ecd..588a1b0 100644
--- a/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
+++ b/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bb
@@ -4,4 +4,3 @@ PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "00df80a84ec9528fcfb09498075525bc"
 SRC_URI[sha256sum] = "d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c"
-
diff --git a/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend b/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend
deleted file mode 100644
index 7f2a796..0000000
--- a/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend
+++ /dev/null
@@ -1,28 +0,0 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 2}"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SYSTEMD_PACKAGES = "${PN} ntpdate"
-SYSTEMD_SERVICE_${PN} = "ntpd.service"
-SYSTEMD_SERVICE_ntpdate = "ntpdate.service"
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-RPROVIDES_ntpdate += "ntpdate-systemd"
-RREPLACES_ntpdate += "ntpdate-systemd"
-RCONFLICTS_ntpdate += "ntpdate-systemd"
-
-FILES_ntpdate += "${systemd_unitdir}/system/ntpdate.service"
-
-SRC_URI += " \
-	file://ntpdate.service \
-        file://ntpd.service \
-"
-
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/ntpdate.service ${D}${systemd_unitdir}/system/
-	install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/
-}
-- 
1.8.1.5

[meta-systemd][PATCH 11/33] yp-tools, ypbind-mt: move systemd support from meta-systemd back to meta-networking

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../nis/yp-tools}/domainname.service               |  0
 .../recipes-support/nis/yp-tools_2.12.bb           | 18 +++++++++++++++--
 .../recipes-support/nis/ypbind-mt}/ypbind.service  |  0
 .../recipes-support/nis/ypbind-mt_1.36.bb          | 23 +++++++++++++++++-----
 .../recipes-support/nis/yp-tools_2.12.bbappend     | 19 ------------------
 .../recipes-support/nis/ypbind-mt_1.36.bbappend    | 17 ----------------
 6 files changed, 34 insertions(+), 43 deletions(-)
 rename {meta-systemd/meta-networking/recipes-support/nis/files => meta-networking/recipes-support/nis/yp-tools}/domainname.service (100%)
 rename {meta-systemd/meta-networking/recipes-support/nis/files => meta-networking/recipes-support/nis/ypbind-mt}/ypbind.service (100%)
 delete mode 100644 meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend
 delete mode 100644 meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend

diff --git a/meta-systemd/meta-networking/recipes-support/nis/files/domainname.service b/meta-networking/recipes-support/nis/yp-tools/domainname.service
similarity index 100%
rename from meta-systemd/meta-networking/recipes-support/nis/files/domainname.service
rename to meta-networking/recipes-support/nis/yp-tools/domainname.service
diff --git a/meta-networking/recipes-support/nis/yp-tools_2.12.bb b/meta-networking/recipes-support/nis/yp-tools_2.12.bb
index fb7ebc2..8593c6b 100644
--- a/meta-networking/recipes-support/nis/yp-tools_2.12.bb
+++ b/meta-networking/recipes-support/nis/yp-tools_2.12.bb
@@ -1,7 +1,7 @@
 # This package builds tools to manage NIS
 # The source package is utils/net/NIS/yp-tools
 #
-PR = "r0"
+PR = "r3"
 DESCRIPTION="\
 Network Information Service tools.  \
 This package contains ypcat, ypmatch, ypset, \
@@ -9,9 +9,23 @@ ypwhich, yppasswd, domainname, nisdomainname \
 and ypdomainname."
 
 require nis.inc
-SRC_URI = "http://www.linux-nis.org/download/yp-tools/${BP}.tar.bz2"
+SRC_URI = "http://www.linux-nis.org/download/yp-tools/${BP}.tar.bz2 \
+           file://domainname.service \
+"
 
 SRC_URI[md5sum] = "ce1e06d86caa285fa8cd76fdf103f51e"
 SRC_URI[sha256sum] = "6ae8321666eea7837da343eea90ea30273fb74943ad111d5a4befd2afb252063"
 
 CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true"
+
+inherit systemd
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "domainname.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system
+}
diff --git a/meta-systemd/meta-networking/recipes-support/nis/files/ypbind.service b/meta-networking/recipes-support/nis/ypbind-mt/ypbind.service
similarity index 100%
rename from meta-systemd/meta-networking/recipes-support/nis/files/ypbind.service
rename to meta-networking/recipes-support/nis/ypbind-mt/ypbind.service
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_1.36.bb b/meta-networking/recipes-support/nis/ypbind-mt_1.36.bb
index e2f654c..fee934d 100644
--- a/meta-networking/recipes-support/nis/ypbind-mt_1.36.bb
+++ b/meta-networking/recipes-support/nis/ypbind-mt_1.36.bb
@@ -1,7 +1,7 @@
 # This package builds the NIS ypbind daemon
 # The source package is utils/net/NIS/ypbind-mt
 #
-PR = "r0"
+PR = "r3"
 DESCRIPTION="\
 Multithreaded NIS bind service (ypbind-mt).  \
 ypbind-mt is a complete new implementation of a NIS \
@@ -14,12 +14,15 @@ of known secure NIS server (/etc/yp.conf) Binds to \
 the server which answered as first."
 HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html"
 
+LIC_FILES_CHKSUM = "file://COPYING;md5=082c9a0886c7c3db1bc862b5b62ffe08"
+
 require nis.inc
 
-SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2"
+SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \
+           file://ypbind-yocto.init \
+           file://ypbind.service \
+"
 SRC_URI[md5sum] = "135834db97d78ff6d79fdee2810b4056"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=082c9a0886c7c3db1bc862b5b62ffe08"
 SRC_URI[sha256sum] = "0eff76c1849f4b38ea1a60280d8397c4240369c641fe5402ce57edf1a90958c7"
 
 # ypbind-mt now provides all the functionality of ypbind
@@ -27,7 +30,6 @@ SRC_URI[sha256sum] = "0eff76c1849f4b38ea1a60280d8397c4240369c641fe5402ce57edf1a9
 PROVIDES += "ypbind"
 
 CACHED_CONFIGUREVARS = "ac_cv_prog_STRIP=/bin/true"
-SRC_URI += "file://ypbind-yocto.init"
 
 do_install_append () {
     install -d ${D}${sysconfdir}/init.d
@@ -35,5 +37,16 @@ do_install_append () {
 
     install -m 0755 ${WORKDIR}/ypbind-yocto.init ${D}${sysconfdir}/init.d/ypbind
 
+    # TODO, use update-rc.d
     ln -s ../init.d/ypbind ${D}${sysconfdir}/rcS.d/S44ypbind
+
+    install -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
 }
+
+inherit systemd
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "ypbind.service"
diff --git a/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend b/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend
deleted file mode 100644
index d5ea1ca..0000000
--- a/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend
+++ /dev/null
@@ -1,19 +0,0 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 2}"
-
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://domainname.service"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "domainname.service"
-
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system
-}
-
diff --git a/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend b/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend
deleted file mode 100644
index 8f11247..0000000
--- a/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend
+++ /dev/null
@@ -1,17 +0,0 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 2}"
-
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://ypbind.service"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "ypbind.service"
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
-}
-- 
1.8.1.5

[meta-systemd][PATCH 12/33] xfce4-session: move systemd support from meta-systemd back to meta-xfce

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../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

[meta-systemd][PATCH 13/33] cloud9: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-devtools/cloud9/cloud9/cloud9.service    |  0
 meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb        | 13 ++++++++++++-
 .../recipes-devtools/cloud9/cloud9_0.6.bbappend      | 20 --------------------
 3 files changed, 12 insertions(+), 21 deletions(-)
 rename {meta-systemd/meta-oe => meta-oe}/recipes-devtools/cloud9/cloud9/cloud9.service (100%)
 delete mode 100644 meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend

diff --git a/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service b/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
rename to meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
index 0c07b12..9ae25bb 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
+++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
@@ -3,11 +3,13 @@ HOMEPAGE = "http://c9.io"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
 
-PR = "r2"
+PR = "r4"
 
 # Nodejs-native for node-waf, nodejs4-native for the headers
 DEPENDS = "libxml2 nodejs-native nodejs4-native"
 
+inherit systemd
+
 SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
            git://github.com/ajaxorg/o3;destsuffix=o3;name=o3 \
            git://github.com/ajaxorg/ace.git;destsuffix=git/support/ace;name=ace \
@@ -33,6 +35,7 @@ SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
            git://github.com/ajaxorg/UglifyJS.git;destsuffix=git/support/uglify-js;name=uglify-js \
            file://index.js \
            file://cloud9-avahi.service \
+           file://cloud9.service \
            file://0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch \
           "
 
@@ -97,6 +100,9 @@ do_install () {
 
   install -m 0755 -d ${D}${sysconfdir}/avahi/services/
   install -m 0644 ${WORKDIR}/cloud9-avahi.service ${D}${sysconfdir}/avahi/services/
+  
+  install -d ${D}${systemd_unitdir}/system
+  install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system
 }
 
 FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o3-xml/.debug \
@@ -104,3 +110,8 @@ FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o
                    "
 
 RDEPENDS_${PN} = "nodejs4 nodejs gzip"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "cloud9.service"
diff --git a/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend b/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
deleted file mode 100644
index 50c6886..0000000
--- a/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
+++ /dev/null
@@ -1,20 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 3}"
-
-inherit systemd
-
-SRC_URI += "file://cloud9.service"
-
-inherit systemd
-
-NATIVE_SYSTEMD_SUPPORT = "1"
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "cloud9.service"
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/cloud9.service ${D}${systemd_unitdir}/system
-}
-
-- 
1.8.1.5

[meta-systemd][PATCH 14/33] dnsmasq: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc       | 14 ++++++++++++--
 .../dnsmasq/dnsmasq/dnsmasq.service                    |  0
 meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb   |  2 ++
 .../recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend | 18 ------------------
 4 files changed, 14 insertions(+), 20 deletions(-)
 rename {meta-systemd/meta-oe => meta-oe}/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service (100%)
 delete mode 100644 meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend

diff --git a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc
index d6f3a54..ef99f48 100644
--- a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc
+++ b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc
@@ -9,9 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 #at least versions 2.15 and prior are moved to the archive folder on the server
 SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV',1).split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \
            file://init \
-           file://dnsmasq.conf"
+           file://dnsmasq.conf \
+           file://dnsmasq.service \
+"
 
-inherit update-rc.d
+inherit update-rc.d systemd
 
 INITSCRIPT_NAME = "dnsmasq"
 INITSCRIPT_PARAMS = "defaults"
@@ -24,6 +26,14 @@ do_install () {
         install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d
         install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/
         install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
+
+        install -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
 }
 
 CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "dnsmasq.service"
diff --git a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service
rename to meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service
diff --git a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb
index 5f87704..ae37db7 100644
--- a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb
+++ b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb
@@ -1,4 +1,6 @@
 require dnsmasq.inc
 
+PR = "r3"
+
 SRC_URI[dnsmasq-2.55.md5sum] = "b093d7c6bc7f97ae6fd35d048529232a"
 SRC_URI[dnsmasq-2.55.sha256sum] = "cf63ecf5977f00474cbda98376a9d8743500a82fd98e13f43d7037bce9f9f929"
diff --git a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend b/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend
deleted file mode 100644
index 148586e..0000000
--- a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 2}"
-
-inherit systemd
-
-SRC_URI += "file://dnsmasq.service"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "dnsmasq.service"
-
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
-}
-
-- 
1.8.1.5

[meta-systemd][PATCH 15/33] udisks: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../udisks/udisks/add-systemd-support.patch              |  0
 meta-oe/recipes-support/udisks/udisks_1.0.4.bb           | 14 ++++++++++++--
 .../meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend | 16 ----------------
 3 files changed, 12 insertions(+), 18 deletions(-)
 rename {meta-systemd/meta-oe => meta-oe}/recipes-support/udisks/udisks/add-systemd-support.patch (100%)
 delete mode 100644 meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend

diff --git a/meta-systemd/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch b/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch
similarity index 100%
rename from meta-systemd/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch
rename to meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch
diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
index b6448ef..fc5d95b 100644
--- a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
+++ b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
@@ -5,15 +5,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273"
 DEPENDS = "libatasmart sg3-utils polkit udev dbus-glib glib-2.0"
 # optional dependencies: device-mapper parted
 
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+
 SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \
            file://optional-depends.patch"
 
+SRC_URI += "${@base_contains('DISTRO_FEATURES', 'systemd', 'file://add-systemd-support.patch', '', d)}"
+
 SRC_URI[udisks.md5sum] = "86c63b2b5484f2060499a052b5b6256b"
 SRC_URI[udisks.sha256sum] = "854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5"
 
-PR = "r5"
+PR = "r9"
 
-inherit autotools
+inherit autotools systemd
 
 EXTRA_OECONF = "--disable-man-pages"
 
@@ -24,3 +28,9 @@ FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \
 "
 
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "udisks-daemon.service"
+SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend b/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
deleted file mode 100644
index 5f30216..0000000
--- a/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 3}"
-
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-DEPENDS += "systemd"
-
-SRC_URI += "file://add-systemd-support.patch"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "udisks-daemon.service"
-SYSTEMD_AUTO_ENABLE = "disable"
-- 
1.8.1.5

[meta-systemd][PATCH 16/33] strongswan: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb      | 13 ++++++++-----
 .../recipes-support/strongswan/strongswan_5.0.0.bbappend    | 10 ----------
 2 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend

diff --git a/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb b/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb
index efacc8e..2713f5b 100644
--- a/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb
+++ b/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "gmp openssl flex-native flex bison-native"
-PR = "r2"
+PR = "r5"
 
 SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2"
 SRC_URI[md5sum] = "c8b861305def7c0abae04f7bbefec212"
@@ -15,11 +15,9 @@ EXTRA_OECONF = "--disable-curl --disable-soup --disable-ldap \
 		--enable-gmp --disable-mysql --disable-sqlite \
 		--enable-openssl"
 
-SYSTEMD_UNITDIR ??= "no"
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
 
-EXTRA_OECONF += "--with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
-
-inherit autotools
+inherit autotools systemd
 
 RRECOMMENDS_${PN} = "kernel-module-ipsec"
 
@@ -31,3 +29,8 @@ FILES_${PN}-dbg += "${libdir}/ipsec/.debug ${libdir}/ipsec/plugins/.debug ${libe
 FILES_${PN}-plugins += "${libdir}/ipsec/plugins/*"
 
 INSANE_SKIP_${PN}-plugins = "staticdev"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
diff --git a/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend b/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend
deleted file mode 100644
index 0a474fe..0000000
--- a/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 2}"
-
-SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "${PN}.service"
-- 
1.8.1.5

[meta-systemd][PATCH 17/33] gpsd: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-navigation/gpsd/gpsd/gpsd.service        |  0
 meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb          | 17 ++++++++++++++---
 .../recipes-navigation/gpsd/gpsd_3.7.bbappend        | 20 --------------------
 3 files changed, 14 insertions(+), 23 deletions(-)
 rename {meta-systemd/meta-oe => meta-oe}/recipes-navigation/gpsd/gpsd/gpsd.service (100%)
 delete mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend

diff --git a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service
rename to meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb
index ceb700a..1228614 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb
@@ -7,7 +7,7 @@ PROVIDES = "virtual/gpsd"
 
 EXTRANATIVEPATH += "chrpath-native"
 
-PR = "r3"
+PR = "r6"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \
@@ -17,16 +17,17 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://gpsd-default \
   file://gpsd \
   file://60-gpsd.rules \
+  file://gpsd.service \
 "
 SRC_URI[md5sum] = "52d9785eaf1a51298bb8900dbde88f98"
 SRC_URI[sha256sum] = "7800c478ee9d7ca7a502b0f892828561b1fbf7bc69d9d38c447c82c3628302ac"
 
-inherit scons update-rc.d python-dir pythonnative
+inherit scons update-rc.d python-dir pythonnative systemd
 
 INITSCRIPT_NAME = "gpsd"
 INITSCRIPT_PARAMS = "defaults 35"
 
-SYSTEMD_OESCONS ??= "false"
+SYSTEMD_OESCONS = "${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}"
 
 export STAGING_INCDIR
 export STAGING_LIBDIR
@@ -79,6 +80,11 @@ do_install_append() {
     #support for python
     install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
     install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
+
+    #support for systemd
+    install -d ${D}${systemd_unitdir}/system/
+    install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
+    install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
 }
 
 pkg_postinst_${PN}-conf() {
@@ -121,3 +127,8 @@ RDEPENDS_gps-utils = "python-pygps"
 DESCRIPTION_python-pygps = "Python bindings to gpsd"
 FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*"
 RDEPENDS_python-pygps = "python-core python-curses gpsd python-json"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.socket"
diff --git a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend
deleted file mode 100644
index 375e855..0000000
--- a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bbappend
+++ /dev/null
@@ -1,20 +0,0 @@
-PRINC := "${@int(PRINC) + 2}"
-
-inherit systemd
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://gpsd.service"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "${PN}.socket"
-SYSTEMD_OESCONS = "true"
-
-do_install_append() {
-    #support for systemd
-    install -d ${D}${systemd_unitdir}/system/
-    install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
-    install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
-}
-- 
1.8.1.5

[meta-systemd][PATCH 18/33] xserver-nodm-init: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../xserver-nodm-init-2.0}/xserver-nodm.conf       |  0
 .../xserver-nodm-init-2.0}/xserver-nodm.service    |  0
 .../xserver-nodm-init/xserver-nodm-init_2.0.bb     | 18 ++++++++++++++--
 .../xserver-nodm-init_2.0.bbappend                 | 25 ----------------------
 4 files changed, 16 insertions(+), 27 deletions(-)
 rename {meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init => meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0}/xserver-nodm.conf (100%)
 rename {meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init => meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0}/xserver-nodm.service (100%)
 delete mode 100644 meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend

diff --git a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.conf b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf
similarity index 100%
rename from meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.conf
rename to meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf
diff --git a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.service b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.service
rename to meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
index 544ae7f..bbed445 100644
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -3,14 +3,16 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
 
-PR = "r17"
+PR = "r21"
 
 SRC_URI = "file://xserver-nodm \
            file://gplv2-license.patch \
+           file://xserver-nodm.service \
+           file://xserver-nodm.conf \
 "
 S = "${WORKDIR}"
 
-inherit allarch update-rc.d
+inherit allarch update-rc.d systemd
 
 INITSCRIPT_NAME = "xserver-nodm"
 INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ."
@@ -19,6 +21,18 @@ INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ."
 do_install() {
 	install -d ${D}${sysconfdir}/init.d
 	install xserver-nodm ${D}${sysconfdir}/init.d
+
+	install -d ${D}${sysconfdir}/default
+	install -d ${D}${systemd_unitdir}/system
+	install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm
+	install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system
 }
 
 RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "xserver-nodm.service"
+
+FILES_${PN} += "${sysconfdir}/default/xserver-nodm"
diff --git a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend
deleted file mode 100644
index cae5a3c..0000000
--- a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend
+++ /dev/null
@@ -1,25 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 3}"
-
-inherit systemd
-
-SRC_URI += "file://xserver-nodm.service \
-            file://xserver-nodm.conf \
-"
-
-do_install_append() {
-        install -d ${D}${sysconfdir}/default
-	install -d ${D}${systemd_unitdir}/system
-        install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm
-	install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system
-}
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "xserver-nodm.service"
-
-FILES_${PN} += "${sysconfdir}/default/xserver-nodm"
-
-RDEPENDS_${PN} += "xserver-common (>= 1.30) xinit"
-- 
1.8.1.5

[meta-systemd][PATCH 19/33] net-snmp: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/net-snmp/net-snmp.inc     | 34 +++++++++++++++++++---
 .../net-snmp/net-snmp/snmpd.service                |  0
 .../net-snmp/net-snmp/snmptrapd.service            |  0
 .../net-snmp/net-snmp/systemd-support.patch        |  0
 .../recipes-extended/net-snmp/net-snmp_5.7.1.bb    |  6 +++-
 .../net-snmp/net-snmp_5.7.1.bbappend               | 32 --------------------
 6 files changed, 35 insertions(+), 37 deletions(-)
 rename {meta-systemd/meta-oe => meta-oe}/recipes-extended/net-snmp/net-snmp/snmpd.service (100%)
 rename {meta-systemd/meta-oe => meta-oe}/recipes-extended/net-snmp/net-snmp/snmptrapd.service (100%)
 rename {meta-systemd/meta-oe => meta-oe}/recipes-extended/net-snmp/net-snmp/systemd-support.patch (100%)
 delete mode 100644 meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend

diff --git a/meta-oe/recipes-extended/net-snmp/net-snmp.inc b/meta-oe/recipes-extended/net-snmp/net-snmp.inc
index 11b81ad..e369ccf 100644
--- a/meta-oe/recipes-extended/net-snmp/net-snmp.inc
+++ b/meta-oe/recipes-extended/net-snmp/net-snmp.inc
@@ -9,9 +9,9 @@ RDEPENDS_${PN}-server += "net-snmp-server-snmpd net-snmp-server-snmptrapd"
 RDEPENDS_${PN}-client += "net-snmp-mibs"
 RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})"
 RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})"
-INC_PR = "r3"
+INC_PR = "r6"
 
-inherit autotools update-rc.d siteinfo
+inherit autotools update-rc.d siteinfo systemd
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
@@ -36,6 +36,9 @@ do_install_append() {
 		-e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
 		-e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \
 		-i ${STAGING_BINDIR}/net-snmp-config
+        install -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system
+        install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system
 }
 
 PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-static ${PN}-libs \
@@ -44,8 +47,15 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-static ${PN}-lib
 ALLOW_EMPTY_${PN}-server = "1"
 FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}"
 FILES_${PN}-mibs = "${datadir}/snmp/mibs"
-FILES_${PN}-server-snmpd = "${sbindir}/snmpd ${sysconfdir}/snmp/snmpd.conf ${sysconfdir}/init.d"
-FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd ${sysconfdir}/snmp/snmptrapd.conf"
+FILES_${PN}-server-snmpd = "${sbindir}/snmpd \
+  ${sysconfdir}/snmp/snmpd.conf \
+  ${sysconfdir}/init.d \
+  ${systemd_unitdir}/system/snmpd.service \
+"
+FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd \
+  ${sysconfdir}/snmp/snmptrapd.conf \
+  ${systemd_unitdir}/system/snmptrapd.service \
+"
 FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/"
 FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/"
 FILES_${PN}-dev += "${bindir}/net-snmp-config ${bindir}/mib2c ${bindir}/mib2c-update"
@@ -57,6 +67,22 @@ INITSCRIPT_PACKAGES = "${PN}-server"
 INITSCRIPT_NAME_${PN}-server = "snmpd"
 INITSCRIPT_PARAMS_${PN}-server = "defaults"
 
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}"
+
+SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \
+                    ${PN}-server-snmptrapd-systemd"
+
+SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service"
+SYSTEMD_SERVICE_${PN}-server-snmptrapd =  "snmptrapd.service"
+
+RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
+RREPLACES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
+RCONFLICTS_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
+
+RPROVIDES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
+RREPLACES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
+RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
+
 LEAD_SONAME = "libnetsnmp.so"
 
 pkg_postrm_${PN}-server() {
diff --git a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service b/meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service
rename to meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service
diff --git a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service b/meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service
rename to meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service
diff --git a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch b/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch
similarity index 100%
rename from meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch
rename to meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch
diff --git a/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb b/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb
index f1e42b5..74d006c 100644
--- a/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb
+++ b/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb
@@ -8,7 +8,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
         file://libnl-3-support.patch \
         file://init \
         file://snmpd.conf \
-        file://snmptrapd.conf"
+        file://snmptrapd.conf \
+        file://systemd-support.patch \
+        file://snmpd.service \
+        file://snmptrapd.service \
+"
 
 EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no"
 EXTRA_OEMAKE = "INSTALL_PREFIX=${D}"
diff --git a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend
deleted file mode 100644
index c3538b3..0000000
--- a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend
+++ /dev/null
@@ -1,32 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 2}"
-
-inherit systemd
-
-SRC_URI += " \
-        file://systemd-support.patch \
-        file://snmpd.service \
-        file://snmptrapd.service \
-"
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system
-}
-
-EXTRA_OECONF += "--with-systemd"
-
-SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \
-                    ${PN}-server-snmptrapd-systemd"
-
-SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service"
-SYSTEMD_SERVICE_${PN}-server-snmptrapd =  "snmptrapd.service"
-RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
-RREPLACES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
-RCONFLICTS_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
-RPROVIDES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
-RREPLACES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
-RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
-FILES_${PN}-server-snmpd += "${systemd_unitdir}/system/snmpd.service"
-FILES_${PN}-server-snmptrapd += "${systemd_unitdir}/system/snmptrapd.service"
-- 
1.8.1.5

[meta-systemd][PATCH 20/33] xinput-calibrator: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../xinput-calibrator/xinput-calibrator.service        |  0
 .../xinput-calibrator/xinput-calibrator_git.bb         | 15 ++++++++++++---
 .../xinput-calibrator/xinput-calibrator_git.bbappend   | 18 ------------------
 3 files changed, 12 insertions(+), 21 deletions(-)
 rename {meta-systemd/meta-oe => meta-oe}/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service (100%)
 delete mode 100644 meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend

diff --git a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
rename to meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index 97f9343..b01f62d 100644
--- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -5,12 +5,13 @@ LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f340
 DEPENDS = "virtual/libx11 libxi"
 
 PV = "0.7.5+git${SRCPV}"
-PR = "r1"
+PR = "r5"
 
-inherit autotools
+inherit autotools systemd
 
 SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111"
-SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git"
+SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
+           file://xinput-calibrator.service"
 
 S = "${WORKDIR}/git"
 
@@ -24,8 +25,16 @@ do_install_append() {
         install -d ${D}${sysconfdir}/xdg/autostart
         sed -i -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop
         install -m 0644 scripts/xinput_calibrator.desktop ${D}${sysconfdir}/xdg/autostart
+
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system
 }
 
 FILES_${PN} += "${sysconfdir}/xdg/autostart"
 RDEPENDS_${PN} = "xinput xterm"
 RRECOMMENDS_${PN} = "pointercal-xinput"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
diff --git a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
deleted file mode 100644
index 5c14346..0000000
--- a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 3}"
-
-inherit systemd
-
-SRC_URI += "file://xinput-calibrator.service"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "${PN}.service"
-
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system
-}
-
-- 
1.8.1.5

[meta-systemd][PATCH 21/33] cherokee: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../cherokee/cherokee/cherokee.service                 |  0
 .../recipes-connectivity/cherokee/cherokee_1.2.98.bb   | 16 +++++++++++++---
 .../cherokee/cherokee_1.2.98.bbappend                  | 18 ------------------
 3 files changed, 13 insertions(+), 21 deletions(-)
 rename {meta-systemd/meta-oe => meta-oe}/recipes-connectivity/cherokee/cherokee/cherokee.service (100%)
 delete mode 100644 meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend

diff --git a/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service b/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service
rename to meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service
diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
index 84d6dce..422ebda 100644
--- a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
+++ b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
@@ -5,16 +5,18 @@ SECTION = "network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-PR = "r6"
+PR = "r9"
 
 DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SRC_URI = "http://www.cherokee-project.com/download/1.2/${PV}/cherokee-${PV}.tar.gz \
-           file://cherokee.init"
+           file://cherokee.init \
+           file://cherokee.service \
+"
 SRC_URI[md5sum] = "21b01e7d45c0e82ecc0c4257a9c27feb"
 SRC_URI[sha256sum] = "042b5687b1a3db3ca818167548ce5d32c35e227c6640732dcb622a6f4a078b7d"
 
-inherit autotools pkgconfig binconfig update-rc.d
+inherit autotools pkgconfig binconfig update-rc.d systemd
 
 EXTRA_OECONF = "--disable-static \
                 --disable-nls \
@@ -27,6 +29,9 @@ do_install_append () {
 
 	# clean up .la files for plugins
 	rm -f ${D}${libdir}/cherokee/*.la
+
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/cherokee.service ${D}${systemd_unitdir}/system
 }
 
 # Put -dev near the front so we can move the .la files into it with a wildcard
@@ -44,3 +49,8 @@ CONFFILES_${PN} = " \
 
 INITSCRIPT_NAME = "cherokee"
 INITSCRIPT_PARAMS = "defaults 91 91"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "cherokee.service"
diff --git a/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend b/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
deleted file mode 100644
index b792c62..0000000
--- a/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 2}"
-
-inherit systemd
-
-SRC_URI += "file://cherokee.service"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "cherokee.service"
-
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/cherokee.service ${D}${systemd_unitdir}/system
-}
-
-- 
1.8.1.5

[meta-systemd][PATCH 22/33] gateone: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-connectivity/gateone/gateone/gateone.service |  0
 meta-oe/recipes-connectivity/gateone/gateone_git.bb      | 10 ++++++++--
 .../recipes-connectivity/gateone/gateone_git.bbappend    | 16 ----------------
 3 files changed, 8 insertions(+), 18 deletions(-)
 rename {meta-systemd/meta-oe => meta-oe}/recipes-connectivity/gateone/gateone/gateone.service (100%)
 delete mode 100644 meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend

diff --git a/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone/gateone.service b/meta-oe/recipes-connectivity/gateone/gateone/gateone.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-connectivity/gateone/gateone/gateone.service
rename to meta-oe/recipes-connectivity/gateone/gateone/gateone.service
diff --git a/meta-oe/recipes-connectivity/gateone/gateone_git.bb b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
index e9c182d..3552009 100644
--- a/meta-oe/recipes-connectivity/gateone/gateone_git.bb
+++ b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
@@ -2,18 +2,19 @@ DESCRIPTION = "HTML5 (plugin-free) web-based terminal emulator and SSH client"
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ee5b168fc7de89a0cadc49e27830aa2c"
 
-PR = "r10"
+PR = "r13"
 
 PV = "1.1"
 SRCREV = "ea5db3dcb3bbbe445ae6d1a5611c1f8d547c57b9"
 SRC_URI = "git://github.com/liftoff/GateOne.git \
            file://gateone-avahi.service \
            file://server.conf \
+           file://gateone.service \
           "
 
 S = "${WORKDIR}/git"
 
-inherit distutils allarch python-dir
+inherit distutils allarch python-dir systemd
 
 export prefix = "${localstatedir}/lib"
 
@@ -24,6 +25,9 @@ do_install_append() {
 	install -m 0644 ${WORKDIR}/gateone-avahi.service ${D}${sysconfdir}/avahi/services/
 
 	install -m 0644 ${WORKDIR}/server.conf ${D}/var/lib/gateone/server.conf
+	
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/gateone.service ${D}${systemd_unitdir}/system
 }
 
 FILES_${PN} = "${localstatedir}/lib ${localstatedir}/log ${localstatedir}/volatile/log ${base_libdir} ${sysconfdir} ${PYTHON_SITEPACKAGES_DIR}"
@@ -57,3 +61,5 @@ RDEPENDS_${PN} = "file \
                   python-unixadmin \
                   python-xml \
                  "
+
+SYSTEMD_SERVICE_${PN} = "gateone.service"
diff --git a/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend b/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend
deleted file mode 100644
index 8ec9dfa..0000000
--- a/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 2}"
-
-inherit systemd
-
-SRC_URI += "file://gateone.service"
-
-NATIVE_SYSTEMD_SUPPORT = "1"
-SYSTEMD_SERVICE_${PN} = "gateone.service"
-
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/gateone.service ${D}${systemd_unitdir}/system
-}
-
-- 
1.8.1.5

[meta-systemd][PATCH 23/33] atftp: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-extended/atftp/atftp/atftpd.service       |  0
 meta-oe/recipes-extended/atftp/atftp_git.bb           | 19 +++++++++++++++++--
 .../meta-oe/recipes-extended/atftp/atftp_git.bbappend | 19 -------------------
 3 files changed, 17 insertions(+), 21 deletions(-)
 rename {meta-systemd/meta-oe => meta-oe}/recipes-extended/atftp/atftp/atftpd.service (100%)
 delete mode 100644 meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend

diff --git a/meta-systemd/meta-oe/recipes-extended/atftp/atftp/atftpd.service b/meta-oe/recipes-extended/atftp/atftp/atftpd.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-extended/atftp/atftp/atftpd.service
rename to meta-oe/recipes-extended/atftp/atftp/atftpd.service
diff --git a/meta-oe/recipes-extended/atftp/atftp_git.bb b/meta-oe/recipes-extended/atftp/atftp_git.bb
index 774dd68..67a2c1b 100644
--- a/meta-oe/recipes-extended/atftp/atftp_git.bb
+++ b/meta-oe/recipes-extended/atftp/atftp_git.bb
@@ -4,6 +4,7 @@ HOMEPAGE = "http://packages.debian.org/atftp"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
 PV = "0.7.1+git${SRCPV}"
+PR = "r3"
 
 SRCREV = "be3291a18c069ae23a124ffdc56d64a5ff0bbec7"
 
@@ -11,10 +12,11 @@ SRC_URI = "git://atftp.git.sourceforge.net/gitroot/atftp/atftp;protocol=git \
            file://atftpd-0.7_circumvent_tftp_size_restrictions.patch \
            file://atftpd-0.7_unprotected_assignments_crash.patch \
            file://atftpd.init \
+           file://atftpd.service \   
           "
 S = "${WORKDIR}/git"
 
-inherit autotools update-rc.d useradd
+inherit autotools update-rc.d useradd systemd
 
 INITSCRIPT_PACKAGES = "${PN}d"
 INITSCRIPT_NAME_${PN}d = "atftpd"
@@ -31,10 +33,23 @@ do_install_append() {
     install -d ${D}/srv/tftp
 
     rm ${D}${sbindir}/in.tftpd
+    
+    install -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system
 }
 
 PACKAGES =+ "atftpd"
 
 FILES_${PN} = "${bindir}/*"
 
-FILES_${PN}d = "${sbindir}/* ${sysconfdir}/init.d/* /srv/tftp"
+FILES_${PN}d = "${sbindir}/* \
+  ${sysconfdir}/init.d/* \
+  /srv/tftp \
+  ${systemd_unitdir}/system/atftpd.service \
+"
+
+SYSTEMD_PACKAGES = "${PN}d"
+SYSTEMD_SERVICE_${PN}d = "atftpd.service"
+RPROVIDES_${PN}d += "${PN}d-systemd"
+RREPLACES_${PN}d += "${PN}d-systemd"
+RCONFLICTS_${PN}d += "${PN}d-systemd"
diff --git a/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend b/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend
deleted file mode 100644
index ed9cf9d..0000000
--- a/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend
+++ /dev/null
@@ -1,19 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 2}"
-
-inherit systemd
-
-SRC_URI += "file://atftpd.service"
-
-SYSTEMD_PACKAGES = "${PN}d"
-SYSTEMD_SERVICE_${PN}d = "atftpd.service"
-FILES_${PN}d += "${systemd_unitdir}/system/atftpd.service"
-RPROVIDES_${PN}d += "${PN}d-systemd"
-RREPLACES_${PN}d += "${PN}d-systemd"
-RCONFLICTS_${PN}d += "${PN}d-systemd"
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system
-}
-
-- 
1.8.1.5

[meta-systemd][PATCH 24/33] zram: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-extended/zram/zram/zram.service          |  0
 meta-oe/recipes-extended/zram/zram_0.1.bb            | 13 +++++++++++--
 .../meta-oe/recipes-extended/zram/zram_0.1.bbappend  | 20 --------------------
 3 files changed, 11 insertions(+), 22 deletions(-)
 rename {meta-systemd/meta-oe => meta-oe}/recipes-extended/zram/zram/zram.service (100%)
 delete mode 100644 meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend

diff --git a/meta-systemd/meta-oe/recipes-extended/zram/zram/zram.service b/meta-oe/recipes-extended/zram/zram/zram.service
similarity index 100%
rename from meta-systemd/meta-oe/recipes-extended/zram/zram/zram.service
rename to meta-oe/recipes-extended/zram/zram/zram.service
diff --git a/meta-oe/recipes-extended/zram/zram_0.1.bb b/meta-oe/recipes-extended/zram/zram_0.1.bb
index 8526264..115e643 100644
--- a/meta-oe/recipes-extended/zram/zram_0.1.bb
+++ b/meta-oe/recipes-extended/zram/zram_0.1.bb
@@ -2,22 +2,31 @@ DESCRIPTION = "Linux zram compressed in-memory swap"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-inherit allarch update-rc.d
+inherit allarch update-rc.d systemd
 
 RDEPENDS_${PN} = "util-linux-swaponoff kmod kernel-module-zram"
 
-PR = "r0"
+PR = "r3"
 
 SRC_URI = " \
            file://init \
+           file://zram.service \
           "
 
 do_install () {
 	# Sysvinit
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/zram
+
+	install -d ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/zram.service ${D}${systemd_unitdir}/system
 }
 
 FILES_${PN} = "${sysconfdir}/init.d"
 INITSCRIPT_NAME = "zram"
 INITSCRIPT_PARAMS = "start 05 2 3 4 5 . stop 22 0 1 6 ."
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "zram.service"
diff --git a/meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend b/meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend
deleted file mode 100644
index 227c1c7..0000000
--- a/meta-systemd/meta-oe/recipes-extended/zram/zram_0.1.bbappend
+++ /dev/null
@@ -1,20 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 2}"
-
-inherit systemd
-
-SRC_URI += " \
-        file://zram.service \
-"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "zram.service"
-
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/zram.service ${D}${systemd_unitdir}/system
-}
-
-- 
1.8.1.5

[meta-systemd][PATCH 25/33] syslog-ng: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc  | 12 ++++++++++--
 .../nonworking/syslog-ng/syslog-ng_3.2.5.bbappend           | 13 -------------
 2 files changed, 10 insertions(+), 15 deletions(-)
 delete mode 100644 meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend

diff --git a/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc
index 584e4a4..bac1be1 100644
--- a/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng.inc
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7ec1bcc46f28b11f4722e20d9b7dd4d5"
 # update-rc.d and update-alternatives is important
 RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
 
-INC_PR = "r9"
+INC_PR = "r12"
 
-inherit autotools
+inherit autotools systemd
 
 SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/${PN}_${PV}.tar.gz"
 
@@ -27,6 +27,9 @@ EXTRA_OECONF = " \
   --disable-sql \
 "
 
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)}"
+
 do_configure_prepend() {
         eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}"
 }
@@ -51,6 +54,11 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS}
 FILES_${PN}-dev += "${libdir}/${BPN}/lib*.la ${libdir}/${BPN}/*${SOLIBSDEV}"
 CONFFILES_${PN} = "${sysconfdir}/${PN}.conf ${sysconfdir}/scl.conf ${sysconfdir}/scl-modules.conf"
 
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
+
 pkg_postinst_${PN} () {
         /etc/init.d/syslog stop
         update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 200
diff --git a/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend b/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend
deleted file mode 100644
index 0ed05df..0000000
--- a/meta-systemd/meta-oe/recipes-support/nonworking/syslog-ng/syslog-ng_3.2.5.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 2}"
-
-EXTRA_OECONF += " \
-  --enable-systemd \
-  --with-systemdsystemunitdir=${systemd_unitdir}/system \
-"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "${PN}.service"
-- 
1.8.1.5

[meta-systemd][PATCH 26/33] rsyslog: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/rsyslog/rsyslog.inc               | 14 +++++++++-----
 .../recipes-extended/rsyslog/rsyslog_5.8.0.bbappend        | 12 ------------
 2 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend

diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
index a4bd180..dc6e511 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
@@ -1,19 +1,18 @@
 DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd"
 DEPENDS = "zlib"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
 HOMEPAGE = "http://www.rsyslog.com/"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973"
 
-INC_PR = "r5"
+INC_PR = "r8"
 
 SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \
            file://rsyslog.conf"
            
-inherit autotools
+inherit autotools systemd
 
-SYSTEMD_UNITDIR ??= "no"
-
-EXTRA_OECONF = "--with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
 
 do_install_append() {
         install -d ${D}/${sysconfdir}/${PN}
@@ -21,3 +20,8 @@ do_install_append() {
 }
 
 CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
diff --git a/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend b/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend
deleted file mode 100644
index 64ef39d..0000000
--- a/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 2}"
-
-DEPENDS += "systemd"
-
-SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "${PN}.service"
-- 
1.8.1.5

[meta-systemd][PATCH 27/33] lxdm: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-graphics/lxdm/lxdm_git.bb                    | 12 ++++++++----
 meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend | 10 ----------
 2 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend

diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
index be83146..a6f266c 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_git.bb
@@ -15,19 +15,18 @@ LXDM_PAM = "${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam
 SRCREV = "65e7cc8fdc150c2b925eb348ce82de17dee5eb0b"
 PV = "0.4.2+git${SRCPV}"
 PE = "1"
-PR = "r3"
+PR = "r6"
 
 DEPENDS = "cairo consolekit dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango"
 
 # combine oe-core way with angstrom DISTRO_TYPE
 DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
 
-inherit autotools gettext
+inherit autotools gettext systemd
 
 S = "${WORKDIR}/git"
 
-SYSTEMD_UNITDIR ??= "no"
-EXTRA_OECONF = "--with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
 
 do_compile_append() {
 	# default background configured not available / no password field available / no default screensaver
@@ -66,3 +65,8 @@ sed -i "s:last_langs=.*$:last_langs=$langs:g" ${localstatedir}/lib/lxdm/lxdm.con
 }
 
 RDEPENDS_${PN} = "pam-plugin-loginuid setxkbmap"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "lxdm.service"
diff --git a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend b/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
deleted file mode 100644
index a3e97bb..0000000
--- a/meta-systemd/meta-oe/recipes-graphics/lxdm/lxdm_git.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PRINC := "${@int(PRINC) + 2}"
-
-inherit systemd
-
-SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "lxdm.service"
-- 
1.8.1.5

[meta-systemd][PATCH 28/33] pcsc-lite: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb             | 9 ++++++++-
 .../meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend   | 8 --------
 2 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend

diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb
index bc51f72..04ec03c 100644
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb
+++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bb
@@ -8,7 +8,9 @@ SRC_URI = "https://alioth.debian.org/frs/download.php/3757/pcsc-lite-${PV}.tar.b
 SRC_URI[md5sum] = "3e4b777231d35ce35c15c0704f936eaa"
 SRC_URI[sha256sum] = "1e44049168d1ce55fd56c175f61206955254df0f385455f2a20ec7e8a0e6a77a"
 
-inherit autotools
+PR = "r3"
+
+inherit autotools systemd
 
 EXTRA_OECONF = " \
 	--disable-libusb \
@@ -23,3 +25,8 @@ PACKAGES =+ "${PN}-lib"
 RRECOMMENDS_${PN} = "ccid"
 
 FILES_${PN}-lib = "${libdir}/lib*${SOLIBS}"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "pcscd.socket"
diff --git a/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend b/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend
deleted file mode 100644
index f877801..0000000
--- a/meta-systemd/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.6.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 2}"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "pcscd.socket"
-- 
1.8.1.5

[meta-systemd][PATCH 29/33] networkmanager: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../networkmanager/networkmanager_0.9.2.0.bb               | 14 +++++++++-----
 .../networkmanager/networkmanager_0.9.2.0.bbappend         | 13 -------------
 2 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend

diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
index 074e665..cc6abd7 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
@@ -4,10 +4,12 @@ SECTION = "net/misc"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b"
 
-PR = "r8"
+PR = "r11"
 
 DEPENDS = "libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp"
-inherit gnome gettext
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+
+inherit gnome gettext systemd
 
 SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.bz2 \
     file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
@@ -20,8 +22,6 @@ SRC_URI[sha256sum] = "a178ed2f0b5a1045ec47b217ea531d0feba9208f6bcfe64b701174a5c1
 
 S = "${WORKDIR}/NetworkManager-${PV}"
 
-SYSTEMD_UNITDIR ??= "no"
-
 EXTRA_OECONF = " \
 		--with-distro=debian \
 		--with-crypto=gnutls \
@@ -29,9 +29,10 @@ EXTRA_OECONF = " \
                 --with-dhclient=${base_sbindir}/dhclient \
                 --with-iptables=${sbindir}/iptables \
                 --with-tests \
-                --with-systemdsystemunitdir=${SYSTEMD_UNITDIR} \
 "
 
+EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
+
 do_configure_prepend() {
     cp ${WORKDIR}/gtk-doc.make ${S}/
     echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make
@@ -71,6 +72,7 @@ FILES_${PN} += " \
 		${datadir}/polkit-1 \
 		${datadir}/dbus-1 \
 		${base_libdir}/udev/* \
+		${systemd_unitdir}/system/NetworkManager-wait-online.service \
 "
 
 RRECOMMENDS_${PN} += "iptables"
@@ -89,3 +91,5 @@ FILES_${PN}-dev += "${datadir}/NetworkManager/gdb-cmd \
 FILES_${PN}-tests = "${bindir}/nm-tool \
                      ${bindir}/libnm_glib_test \
                      ${bindir}/nm-online"
+
+SYSTEMD_SERVICE_${PN} = "NetworkManager.service"
diff --git a/meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend b/meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend
deleted file mode 100644
index 5508fb2..0000000
--- a/meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-PRINC := "${@int(PRINC) + 2}"
-
-inherit systemd
-
-DEPENDS += "systemd"
-
-SYSTEMD_SERVICE_${PN} = "NetworkManager.service"
-SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
-
-# NetworkManager-wait-online is not catched by systemd.bbclass
-FILES_${PN} += " \
-                ${systemd_unitdir}/system/NetworkManager-wait-online.service \
-"
-- 
1.8.1.5

[meta-systemd][PATCH 30/33] packagegroup-basic: Drop bbappend from meta-systemd

[Martin Jansa]

* avahi-systemd is now indluded in deamon
* systemd-compat-units are RRECOMMENDED from systemd itself

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-core/packagegroups/packagegroup-basic.bb            | 2 +-
 .../meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend  | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
index 493ef5e..402579c 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Basic task to get a device online"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-PR = "r10"
+PR = "r13"
 
 inherit packagegroup
 
diff --git a/meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend b/meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend
deleted file mode 100644
index c1b5851..0000000
--- a/meta-systemd/meta-oe/recipes-core/packagegroups/packagegroup-basic.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-PRINC := "${@int(PRINC) + 2}"
-
-RDEPENDS_${PN} += "\
-	systemd-compat-units \
-	avahi-systemd \
-"
-- 
1.8.1.5

[meta-systemd][PATCH 31/33] polkit: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

* POLKITAUTH isn't used anymore PACKAGECONFIG should select right version for systemd now

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/polkit/polkit_0.104.bb                    | 3 +--
 meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend

diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bb b/meta-oe/recipes-extended/polkit/polkit_0.104.bb
index ab2547b..cc39654 100644
--- a/meta-oe/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta-oe/recipes-extended/polkit/polkit_0.104.bb
@@ -15,7 +15,7 @@ PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
 # there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to RDEPENDS
 PACKAGECONFIG[consolekit] = ",,,consolekit"
 
-PR = "r9"
+PR = "r12"
 
 PAM_SRC_URI = "file://polkit-1_pam.patch"
 SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \
@@ -41,4 +41,3 @@ FILES_${PN} += "${libdir}/${BPN}-1/extensions/*.so \
                 ${datadir}/dbus-1/system-services/*"
 FILES_${PN}-dbg += "${libdir}/${BPN}-1/extensions/.debug/*.so"
 FILES_${PN}-dev += "${libdir}/${BPN}-1/extensions/*.la "
-
diff --git a/meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend b/meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
deleted file mode 100644
index 7e1954f..0000000
--- a/meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-PRINC := "${@int(PRINC) + 2}"
-
-POLKITAUTH = "systemd"
-- 
1.8.1.5

[meta-systemd][PATCH 32/33] meta-systemd: drop now unused gitpkgv.bbclass

[Martin Jansa]

---
 meta-systemd/classes/gitpkgv.bbclass | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 meta-systemd/classes/gitpkgv.bbclass

diff --git a/meta-systemd/classes/gitpkgv.bbclass b/meta-systemd/classes/gitpkgv.bbclass
deleted file mode 120000
index 8205151..0000000
--- a/meta-systemd/classes/gitpkgv.bbclass
+++ /dev/null
@@ -1 +0,0 @@
-../../meta-oe/classes/gitpkgv.bbclass
-- 
1.8.1.5

[meta-systemd][PATCH 33/33] layer.conf: remove detection of other layers, now there are only oe-core bbappends

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-systemd/conf/layer.conf | 11 -----------
 meta-systemd/invalid.bb      |  2 --
 2 files changed, 13 deletions(-)
 delete mode 100644 meta-systemd/invalid.bb

diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf
index c064333..f3fc45d 100644
--- a/meta-systemd/conf/layer.conf
+++ b/meta-systemd/conf/layer.conf
@@ -15,17 +15,6 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "\
   ${LAYERDIR}/recipes-*/*/*.bb \
   ${LAYERDIR}/oe-core/recipes-*/*/*.bbappend \
-  ${LAYERDIR}/meta-oe/recipes-*/*/*.bbappend \
-  ${@base_contains('BBFILE_COLLECTIONS', 'systemd-layer',\
-                   '', '${LAYERDIR}/invalid.bb', d)} \
-  ${@base_contains('BBFILE_COLLECTIONS', 'gnome-layer',\
-                   '${LAYERDIR}/meta-gnome/recipes-*/*/*.bbappend', '', d)} \
-  ${@base_contains('BBFILE_COLLECTIONS', 'multimedia-layer',\
-                   '${LAYERDIR}/meta-multimedia/recipes-*/*/*.bbappend', '', d)} \
-  ${@base_contains('BBFILE_COLLECTIONS', 'networking',\
-                   '${LAYERDIR}/meta-networking/recipes-*/*/*.bbappend', '', d)} \
-  ${@base_contains('BBFILE_COLLECTIONS', 'xfce-layer',\
-                   '${LAYERDIR}/meta-xfce/recipes-*/*/*.bbappend', '', d)} \
 "
 
 BBFILE_COLLECTIONS += "systemd-layer"
diff --git a/meta-systemd/invalid.bb b/meta-systemd/invalid.bb
deleted file mode 100644
index b16787b..0000000
--- a/meta-systemd/invalid.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-Content of this file is invalid and is used by conf/layer.conf to
-ensure that BBFILES is expanded after BBFILE_COLLECTIONS.
-- 
1.8.1.5

Re: [meta-systemd][PATCH 07/33] gdm: move systemd support from meta-systemd back to meta-gnome

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3839 bytes --]

On Sat, Apr 13, 2013 at 03:29:24PM +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  .../recipes-gnome/gdm/gdm                            |  0
>  meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb           | 17 +++++++++++------
>  .../meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend | 20 --------------------
>  3 files changed, 11 insertions(+), 26 deletions(-)
>  rename meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in => meta-gnome/recipes-gnome/gdm/gdm (100%)
>  delete mode 100644 meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
> 
> diff --git a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in b/meta-gnome/recipes-gnome/gdm/gdm
> similarity index 100%
> rename from meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service.in
> rename to meta-gnome/recipes-gnome/gdm/gdm

#       renamed:    gdm -> gdm/gdm.service.in

In my local branch

> diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
> index 863db2e..45bddc8 100644
> --- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
> +++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
> @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>  
>  DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb"
>  
> -PR = "r10"
> +PR = "r15"
>  
> -inherit gnome update-rc.d
> +inherit gnome update-rc.d systemd
>  
>  SRC_URI += " \
>              file://cross-xdetection.diff \
> @@ -17,6 +17,7 @@ SRC_URI += " \
>              file://gdm.conf \
>              file://gdm-pam \
>              file://Default \
> +            file://gdm.service.in \
>             "
>  
>  SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e"
> @@ -49,6 +50,10 @@ do_install_append() {
>  	install -d ${D}/${sysconfdir}/gdm/Init
>  	install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init
>  
> +	install -d ${D}${systemd_unitdir}/system
> +	sed -e 's,%sbindir%,${sbindir},g' \
> +		< ${WORKDIR}/gdm.service.in \
> +		> ${D}${systemd_unitdir}/system/gdm.service
>  }
>  
>  FILES_${PN} += "${datadir}/icon* \
> @@ -60,6 +65,10 @@ RDEPENDS_${PN} += "grep dbus-x11 shadow"
>  CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm"
>  RRECOMMENDS_${PN} += "openssh-misc desktop-file-utils glib-2.0-utils metacity gnome-session polkit-gnome consolekit"
>  
> +RREPLACES_${PN} += "${PN}-systemd"
> +RCONFLICTS_${PN} += "${PN}-systemd"
> +SYSTEMD_SERVICE_${PN} = "gdm.service"
> +
>  INITSCRIPT_NAME = "gdm"
>  INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
>  
> @@ -87,7 +96,3 @@ pkg_postrm_${PN} () {
>      delgroup gdm || true
>  	sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true
>  }
> -
> -
> -
> -
> diff --git a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
> deleted file mode 100644
> index 6201352..0000000
> --- a/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -# look for files in the layer first
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> -
> -PRINC := "${@int(PRINC) + 4}"
> -
> -inherit systemd
> -
> -SRC_URI += "file://gdm.service.in"
> -
> -do_install_append() {
> -	install -d ${D}${systemd_unitdir}/system
> -	sed -e 's,%sbindir%,${sbindir},g' \
> -		< ${WORKDIR}/gdm.service.in \
> -		> ${D}${systemd_unitdir}/system/gdm.service
> -}
> -
> -RPROVIDES_${PN} += "${PN}-systemd"
> -RREPLACES_${PN} += "${PN}-systemd"
> -RCONFLICTS_${PN} += "${PN}-systemd"
> -SYSTEMD_SERVICE_${PN} = "gdm.service"
> -- 
> 1.8.1.5
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-systemd][PATCH 14/33] dnsmasq: move systemd support from meta-systemd back to meta-oe

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 4095 bytes --]

On Sat, Apr 13, 2013 at 03:29:31PM +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc       | 14 ++++++++++++--
>  .../dnsmasq/dnsmasq/dnsmasq.service                    |  0
>  meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb   |  2 ++
>  .../recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend | 18 ------------------
>  4 files changed, 14 insertions(+), 20 deletions(-)
>  rename {meta-systemd/meta-oe => meta-oe}/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service (100%)
>  delete mode 100644 meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend

this breaks dnsmasq-dbus which is using the same .inc. dnsmasq-dbus
removal is in separate patch.

> 
> diff --git a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc
> index d6f3a54..ef99f48 100644
> --- a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc
> +++ b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc
> @@ -9,9 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
>  #at least versions 2.15 and prior are moved to the archive folder on the server
>  SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV',1).split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \
>             file://init \
> -           file://dnsmasq.conf"
> +           file://dnsmasq.conf \
> +           file://dnsmasq.service \
> +"
>  
> -inherit update-rc.d
> +inherit update-rc.d systemd
>  
>  INITSCRIPT_NAME = "dnsmasq"
>  INITSCRIPT_PARAMS = "defaults"
> @@ -24,6 +26,14 @@ do_install () {
>          install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d
>          install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/
>          install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
> +
> +        install -d ${D}${systemd_unitdir}/system
> +        install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
>  }
>  
>  CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf"
> +
> +RPROVIDES_${PN} += "${PN}-systemd"
> +RREPLACES_${PN} += "${PN}-systemd"
> +RCONFLICTS_${PN} += "${PN}-systemd"
> +SYSTEMD_SERVICE_${PN} = "dnsmasq.service"
> diff --git a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service
> similarity index 100%
> rename from meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service
> rename to meta-oe/recipes-connectivity/dnsmasq/dnsmasq/dnsmasq.service
> diff --git a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb
> index 5f87704..ae37db7 100644
> --- a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb
> +++ b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb
> @@ -1,4 +1,6 @@
>  require dnsmasq.inc
>  
> +PR = "r3"
> +
>  SRC_URI[dnsmasq-2.55.md5sum] = "b093d7c6bc7f97ae6fd35d048529232a"
>  SRC_URI[dnsmasq-2.55.sha256sum] = "cf63ecf5977f00474cbda98376a9d8743500a82fd98e13f43d7037bce9f9f929"
> diff --git a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend b/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend
> deleted file mode 100644
> index 148586e..0000000
> --- a/meta-systemd/meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bbappend
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> -
> -PRINC := "${@int(PRINC) + 2}"
> -
> -inherit systemd
> -
> -SRC_URI += "file://dnsmasq.service"
> -
> -RPROVIDES_${PN} += "${PN}-systemd"
> -RREPLACES_${PN} += "${PN}-systemd"
> -RCONFLICTS_${PN} += "${PN}-systemd"
> -SYSTEMD_SERVICE_${PN} = "dnsmasq.service"
> -
> -do_install_append() {
> -	install -d ${D}${systemd_unitdir}/system
> -	install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
> -}
> -
> -- 
> 1.8.1.5
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]