[meta-oe,V2 00/32] transit to meta-systemd

[meta-oe,V2 00/32] transit to meta-systemd

[Andreas Müller]

v1->v2:
* rebase to latest head
* 4 meta-oe/layer.conf: systemd-serialgetty moved to meta-systemd
* 5 append systemd package to RRECOMMENDS
* remove warning in case systemd-stuff is packed in ${PN}
* 7+8 make tasks usable without meta-systemd
* xserver-nodm-init: include Martin's patch [1]
* use FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" for multiple bbappends

The series can be pulled from [2] branch systemd

[1] http://patches.openembedded.org/patch/30383/
[2] git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded-systemd.git

Andreas Müller (32):
  systemd.bbclass: move to meta-systemd
  move systemd recipes to meta-systemd
  layer.conf/README: search directory structure for bbappends changed
  meta-oe/layer.conf: systemd-serialgetty moved to meta-systemd
  systemd.bbclass: add *-systemd packages to RRECOMMENDS
  systemd.bbclass: do not warn for systemd files are in ${PN}
  task-basic: move systemd support to meta systemd
  task-x11: in case meta-systemd is part of BBLAYERS,
    xserver-nodm-init-systemd is recommended automatically
  polkit: meta-systemd rework
  gdm: move systemd support to meta-systemd
  busybox: move systemd support to meta-systemd
  ntp: move systemd support to meta-systemd
  syslog-ng: move systemd support to meta-systemd
  udisks: move systemd support to meta-systemd
  lighttpd: move systemd support to meta-systemd
  cronie: move systemd support to meta-systemd
  elsa: move systemd support to meta-systemd
  net-snmp: move systemd support to meta-systemd
  atftp: move systemd support to meta-systemd
  dhcp: move systemd support to meta-systemd
  connman: move systemd support to meta-systemd
  gateone: move systemd support to meta-systemd
  cherokee: move systemd support to meta-systemd
  openssh: move systemd support to meta-systemd
  cloud9: move systemd support to meta-systemd
  xinput-calibrator: : move systemd support to meta-systemd
  xserver-nodm-init: move systemd support to meta-systemd
  dropbear: move systemd support to meta-systemd
  keymaps: move systemd support to meta-systemd
  rsyslog: move systemd support to meta-systemd
  gpsd: move systemd support to meta-systemd
  networkmanager: move systemd support to meta-systemd

 meta-efl/recipes-efl/efl/elsa_svn.bb               |    9 +----
 meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb         |    8 +---
 meta-oe/conf/layer.conf                            |    1 -
 .../cherokee/cherokee_1.2.98.bb                    |   10 ++----
 .../recipes-connectivity/gateone/gateone_git.bb    |    9 +----
 .../networkmanager/networkmanager_0.9.2.0.bb       |   13 +++----
 .../recipes-core/busybox/busybox_1.19.4.bbappend   |   20 +----------
 meta-oe/recipes-core/tasks/task-basic.bb           |    7 ++--
 meta-oe/recipes-core/tasks/task-x11_1.0.bb         |    6 ++--
 meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb      |    9 +----
 meta-oe/recipes-extended/atftp/atftp_0.7.bb        |   10 ++----
 .../recipes-extended/net-snmp/net-snmp_5.7.1.bb    |   17 +--------
 .../recipes-extended/polkit/polkit_0.104.bbappend  |    4 +-
 meta-oe/recipes-extended/rsyslog/rsyslog.inc       |   10 +++---
 .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |    8 +---
 .../xserver-nodm-init/xserver-nodm-init_2.0.bb     |   16 +--------
 meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb        |   15 ++------
 meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb        |   15 ++------
 meta-oe/recipes-navigation/gpsd/gpsd_git.bb        |   14 ++------
 meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb         |   18 +---------
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc    |    9 +----
 meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |   10 ++----
 meta-systemd/README                                |    5 +++
 {meta-oe => meta-systemd}/classes/systemd.bbclass  |   35 +++++++++++++------
 meta-systemd/conf/layer.conf                       |    2 +-
 .../recipes-efl/efl/elsa/xserver-nodm.service      |    0
 .../meta-efl/recipes-efl/efl/elsa_svn.bbappend     |   13 +++++++
 .../meta-gnome}/recipes-gnome/gdm/gdm/gdm.service  |    0
 .../recipes-gnome/gdm/gdm_2.32.2.bbappend          |   13 +++++++
 .../recipes-bsp/keymaps/keymaps/keymaps.service    |    0
 .../recipes-bsp/keymaps/keymaps_1.0.bbappend       |    2 +-
 .../cherokee/cherokee/cherokee.service             |    0
 .../cherokee/cherokee_1.2.98.bbappend              |   10 ++++++
 .../connman/connman_1.0.bbappend                   |    2 +
 .../recipes-connectivity/dhcp/dhcp}/dhcpd.service  |    0
 .../dhcp/dhcp}/dhcrelay.service                    |    0
 .../dhcp/dhcp_4.2.3-P2.bbappend                    |    4 +-
 .../gateone/gateone/gateone.service                |    0
 .../gateone/gateone_git.bbappend                   |   11 ++++++
 .../networkmanager/networkmanager_0.9.2.0.bbappend |   14 ++++++++
 .../openssh/openssh/sshd.socket                    |    0
 .../openssh/openssh/sshd@.service                  |    0
 .../openssh/openssh/sshdgenkeys.service            |    0
 .../openssh/openssh_6.0p1.bbappend                 |    2 +-
 .../busybox/busybox/busybox-klogd.service.in       |    0
 .../busybox/busybox/busybox-syslog.service.in      |    0
 .../recipes-core/busybox/busybox_1.19.4.bbappend   |   23 +++++++++++++
 .../recipes-core/dropbear/dropbear/dropbear.socket |    0
 .../dropbear/dropbear/dropbear@.service            |    0
 .../dropbear/dropbear/dropbearkey.service          |    0
 .../dropbear/dropbear_2012.55.bbappend             |    4 +-
 .../meta-oe/recipes-core/tasks/task-basic.bbappend |    6 +++
 .../recipes-devtools/cloud9/cloud9/cloud9.service  |    0
 .../recipes-devtools/cloud9/cloud9_0.6.bbappend    |   13 +++++++
 .../recipes-extended/atftp/atftp}/atftpd.service   |    0
 .../recipes-extended/atftp/atftp_0.7.bbappend      |   10 ++++++
 .../recipes-extended/cronie/cronie/crond.service   |    0
 .../recipes-extended/cronie/cronie_1.4.8.bbappend  |    4 +-
 .../lighttpd/lighttpd/lighttpd.service             |    0
 .../lighttpd/lighttpd_1.4.31.bbappend              |    4 +-
 .../net-snmp/net-snmp}/snmpd.service               |    0
 .../net-snmp/net-snmp}/snmptrapd.service           |    0
 .../net-snmp/net-snmp}/systemd-support.patch       |    0
 .../net-snmp/net-snmp_5.7.1.bbappend               |   19 +++++++++++
 .../recipes-extended/polkit/polkit_0.104.bbappend  |    3 ++
 .../rsyslog/rsyslog_5.8.0.bbappend                 |   10 ++++++
 .../xinput-calibrator/xinput-calibrator.service    |    0
 .../xinput-calibrator_0.7.5.bbappend               |   10 ++++++
 .../xserver-nodm-init}/xserver-nodm.conf           |    0
 .../xserver-nodm-init}/xserver-nodm.service        |    0
 .../xserver-nodm-init_2.0.bbappend                 |   21 ++++++++++++
 .../recipes-navigation/gpsd/gpsd/gpsd.service      |    0
 .../recipes-navigation/gpsd/gpsd_3.4.bbappend      |   18 ++++++++++
 .../recipes-navigation/gpsd/gpsd_3.5.bbappend      |   18 ++++++++++
 .../recipes-navigation/gpsd/gpsd_git.bbappend      |   14 ++++++++
 .../meta-oe/recipes-support/ntp/ntp}/ntpd.service  |    0
 .../recipes-support/ntp/ntp}/ntpdate.service       |    0
 .../recipes-support/ntp/ntp_4.2.6p3.bbappend       |   20 +++++++++++
 .../syslog-ng/syslog-ng_3.2.5.bbappend             |   11 ++++++
 .../udisks/udisks/add-systemd-support.patch        |    0
 .../recipes-support/udisks/udisks_1.0.4.bbappend   |   13 +++++++
 .../recipes-core/systemd/systemd-compat-units.bb   |    0
 .../systemd/systemd-compat-units/machineid.service |    0
 .../systemd-compat-units/run-postinsts.service     |    0
 .../systemd/systemd-machine-units_1.0.bb           |    0
 .../recipes-core/systemd/systemd-serialgetty.bb    |    0
 .../systemd/systemd-serialgetty/LICENSE            |    0
 .../systemd-serialgetty/serial-getty@.service      |    0
 .../recipes-core/systemd/systemd-speed-hacks.bb    |    0
 .../systemd/systemd-systemctl-native.bb            |    0
 .../systemd/systemd-systemctl-native/systemctl     |    0
 .../systemd/systemd/format-replace-m-uclibc.patch  |    0
 .../systemd/systemd/paper-over-mkostemp.patch      |    0
 .../recipes-core/systemd/systemd_git.bb            |    0
 94 files changed, 369 insertions(+), 203 deletions(-)
 rename {meta-oe => meta-systemd}/classes/systemd.bbclass (85%)
 rename {meta-efl => meta-systemd/meta-efl}/recipes-efl/efl/elsa/xserver-nodm.service (100%)
 create mode 100644 meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend
 rename {meta-gnome => meta-systemd/meta-gnome}/recipes-gnome/gdm/gdm/gdm.service (100%)
 create mode 100644 meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
 rename {meta-oe => meta-systemd/meta-oe}/recipes-bsp/keymaps/keymaps/keymaps.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-bsp/keymaps/keymaps_1.0.bbappend (85%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/cherokee/cherokee/cherokee.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/connman/connman_1.0.bbappend (84%)
 rename {meta-oe/recipes-connectivity/dhcp/files => meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp}/dhcpd.service (100%)
 rename {meta-oe/recipes-connectivity/dhcp/files => meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp}/dhcrelay.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend (79%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/gateone/gateone/gateone.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend
 create mode 100644 meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/openssh/openssh/sshd.socket (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/openssh/openssh/sshd@.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/openssh/openssh/sshdgenkeys.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/openssh/openssh_6.0p1.bbappend (88%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-core/busybox/busybox/busybox-klogd.service.in (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-core/busybox/busybox/busybox-syslog.service.in (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
 rename {meta-oe => meta-systemd/meta-oe}/recipes-core/dropbear/dropbear/dropbear.socket (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-core/dropbear/dropbear/dropbear@.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-core/dropbear/dropbear/dropbearkey.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-core/dropbear/dropbear_2012.55.bbappend (81%)
 create mode 100644 meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend
 rename {meta-oe => meta-systemd/meta-oe}/recipes-devtools/cloud9/cloud9/cloud9.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
 rename {meta-oe/recipes-extended/atftp/files => meta-systemd/meta-oe/recipes-extended/atftp/atftp}/atftpd.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-extended/atftp/atftp_0.7.bbappend
 rename {meta-oe => meta-systemd/meta-oe}/recipes-extended/cronie/cronie/crond.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-extended/cronie/cronie_1.4.8.bbappend (69%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-extended/lighttpd/lighttpd/lighttpd.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend (62%)
 rename {meta-oe/recipes-extended/net-snmp/files => meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp}/snmpd.service (100%)
 rename {meta-oe/recipes-extended/net-snmp/files => meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp}/snmptrapd.service (100%)
 rename {meta-oe/recipes-extended/net-snmp/files => meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp}/systemd-support.patch (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend
 create mode 100644 meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
 create mode 100644 meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend
 rename {meta-oe => meta-systemd/meta-oe}/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bbappend
 rename {meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0 => meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init}/xserver-nodm.conf (100%)
 rename {meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0 => meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init}/xserver-nodm.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend
 rename {meta-oe => meta-systemd/meta-oe}/recipes-navigation/gpsd/gpsd/gpsd.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend
 create mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bbappend
 create mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_git.bbappend
 rename {meta-oe/recipes-support/ntp/files => meta-systemd/meta-oe/recipes-support/ntp/ntp}/ntpd.service (100%)
 rename {meta-oe/recipes-support/ntp/files => meta-systemd/meta-oe/recipes-support/ntp/ntp}/ntpdate.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bbappend
 create mode 100644 meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend
 rename {meta-oe => meta-systemd/meta-oe}/recipes-support/udisks/udisks/add-systemd-support.patch (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-compat-units.bb (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-compat-units/machineid.service (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-compat-units/run-postinsts.service (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-machine-units_1.0.bb (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-serialgetty.bb (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-serialgetty/LICENSE (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-serialgetty/serial-getty@.service (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-speed-hacks.bb (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-systemctl-native.bb (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-systemctl-native/systemctl (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd/format-replace-m-uclibc.patch (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd/paper-over-mkostemp.patch (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd_git.bb (100%)

-- 
1.7.6.5

[meta-oe,V2 01/32] systemd.bbclass: move to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 {meta-oe => meta-systemd}/classes/systemd.bbclass |    0
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename {meta-oe => meta-systemd}/classes/systemd.bbclass (100%)

diff --git a/meta-oe/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass
similarity index 100%
rename from meta-oe/classes/systemd.bbclass
rename to meta-systemd/classes/systemd.bbclass
-- 
1.7.6.5

[meta-oe,V2 02/32] move systemd recipes to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-core/systemd/systemd-compat-units.bb   |    0
 .../systemd/systemd-compat-units/machineid.service |    0
 .../systemd-compat-units/run-postinsts.service     |    0
 .../systemd/systemd-machine-units_1.0.bb           |    0
 .../recipes-core/systemd/systemd-serialgetty.bb    |    0
 .../systemd/systemd-serialgetty/LICENSE            |    0
 .../systemd-serialgetty/serial-getty@.service      |    0
 .../recipes-core/systemd/systemd-speed-hacks.bb    |    0
 .../systemd/systemd-systemctl-native.bb            |    0
 .../systemd/systemd-systemctl-native/systemctl     |    0
 .../systemd/systemd/format-replace-m-uclibc.patch  |    0
 .../systemd/systemd/paper-over-mkostemp.patch      |    0
 .../recipes-core/systemd/systemd_git.bb            |    0
 13 files changed, 0 insertions(+), 0 deletions(-)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-compat-units.bb (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-compat-units/machineid.service (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-compat-units/run-postinsts.service (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-machine-units_1.0.bb (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-serialgetty.bb (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-serialgetty/LICENSE (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-serialgetty/serial-getty@.service (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-speed-hacks.bb (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-systemctl-native.bb (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-systemctl-native/systemctl (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd/format-replace-m-uclibc.patch (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd/paper-over-mkostemp.patch (100%)
 rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd_git.bb (100%)

diff --git a/meta-oe/recipes-core/systemd/systemd-compat-units.bb b/meta-systemd/recipes-core/systemd/systemd-compat-units.bb
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd-compat-units.bb
rename to meta-systemd/recipes-core/systemd/systemd-compat-units.bb
diff --git a/meta-oe/recipes-core/systemd/systemd-compat-units/machineid.service b/meta-systemd/recipes-core/systemd/systemd-compat-units/machineid.service
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd-compat-units/machineid.service
rename to meta-systemd/recipes-core/systemd/systemd-compat-units/machineid.service
diff --git a/meta-oe/recipes-core/systemd/systemd-compat-units/run-postinsts.service b/meta-systemd/recipes-core/systemd/systemd-compat-units/run-postinsts.service
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd-compat-units/run-postinsts.service
rename to meta-systemd/recipes-core/systemd/systemd-compat-units/run-postinsts.service
diff --git a/meta-oe/recipes-core/systemd/systemd-machine-units_1.0.bb b/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd-machine-units_1.0.bb
rename to meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb
diff --git a/meta-oe/recipes-core/systemd/systemd-serialgetty.bb b/meta-systemd/recipes-core/systemd/systemd-serialgetty.bb
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd-serialgetty.bb
rename to meta-systemd/recipes-core/systemd/systemd-serialgetty.bb
diff --git a/meta-oe/recipes-core/systemd/systemd-serialgetty/LICENSE b/meta-systemd/recipes-core/systemd/systemd-serialgetty/LICENSE
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd-serialgetty/LICENSE
rename to meta-systemd/recipes-core/systemd/systemd-serialgetty/LICENSE
diff --git a/meta-oe/recipes-core/systemd/systemd-serialgetty/serial-getty@.service b/meta-systemd/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
rename to meta-systemd/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
diff --git a/meta-oe/recipes-core/systemd/systemd-speed-hacks.bb b/meta-systemd/recipes-core/systemd/systemd-speed-hacks.bb
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd-speed-hacks.bb
rename to meta-systemd/recipes-core/systemd/systemd-speed-hacks.bb
diff --git a/meta-oe/recipes-core/systemd/systemd-systemctl-native.bb b/meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd-systemctl-native.bb
rename to meta-systemd/recipes-core/systemd/systemd-systemctl-native.bb
diff --git a/meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl b/meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl
rename to meta-systemd/recipes-core/systemd/systemd-systemctl-native/systemctl
diff --git a/meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch b/meta-systemd/recipes-core/systemd/systemd/format-replace-m-uclibc.patch
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch
rename to meta-systemd/recipes-core/systemd/systemd/format-replace-m-uclibc.patch
diff --git a/meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch b/meta-systemd/recipes-core/systemd/systemd/paper-over-mkostemp.patch
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch
rename to meta-systemd/recipes-core/systemd/systemd/paper-over-mkostemp.patch
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-systemd/recipes-core/systemd/systemd_git.bb
similarity index 100%
rename from meta-oe/recipes-core/systemd/systemd_git.bb
rename to meta-systemd/recipes-core/systemd/systemd_git.bb
-- 
1.7.6.5

[meta-oe, V2 03/32] layer.conf/README: search directory structure for bbappends changed

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-systemd/README          |    5 +++++
 meta-systemd/conf/layer.conf |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/meta-systemd/README b/meta-systemd/README
index efed2ee..84578b5 100644
--- a/meta-systemd/README
+++ b/meta-systemd/README
@@ -10,6 +10,11 @@ URI: git://git.openembedded.org/meta-openembedded
 branch: master
 revision: HEAD
 
+To make BBMASK'ing per layer possible the following directory structure is
+used:
+
+$[LAYERDIR}/<layer name>/recipes-<group-name>/<recipe-name>/<recipe-name>.bbappend
+
 Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe][meta-systemd]' in the subject'
 
 When sending single patches, please use something like 'git send-email -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-oe][meta-systemd][PATCH'
diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf
index 9caec69..3310abc 100644
--- a/meta-systemd/conf/layer.conf
+++ b/meta-systemd/conf/layer.conf
@@ -12,7 +12,7 @@
 BBPATH .= ":${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/*/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "systemd-layer"
 BBFILE_PATTERN_systemd-layer := "^${LAYERDIR}/"
-- 
1.7.6.5

[meta-oe, V2 04/32] meta-oe/layer.conf: systemd-serialgetty moved to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/conf/layer.conf |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index 6f05871..550f8cf 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -25,7 +25,6 @@ BBFILE_PRIORITY_openembedded-layer = "6"
 
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
   pointercal-xinput \
-  systemd-serialgetty \
   mplayer-common \
   task-x11-server \
   fbset-modes \
-- 
1.7.6.5

[meta-oe, V2 05/32] systemd.bbclass: add *-systemd packages to RRECOMMENDS

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-systemd/classes/systemd.bbclass |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass
index 2e585c3..fce314d 100644
--- a/meta-systemd/classes/systemd.bbclass
+++ b/meta-systemd/classes/systemd.bbclass
@@ -180,8 +180,21 @@ python populate_packages_prepend () {
 					raise bb.build.FuncFailed, "\n\nFor package %s SYSTEMD_SERVICE-entry %s does not exist" % \
 						(pkg_systemd, service)
 
-	# *-systemd packages get RDEPENDS to systemd and their base package
-	def systemd_add_rdepends(pkg_systemd):
+	"""     Setup rdepends / rrecommmends as:
+
+                -----------------------------
+                |  pkg_systemd_base: 'foo'  |
+                -----------------------------
+                           |    ^
+                           |    |                 --------------
+               rrecommends |    | rdepends        | 'systemd'  |
+                           |    |               ->--------------
+                           V    |              / rdepends
+                ------------------------------/
+                | pkg_systemd: 'foo-systemd' |
+                ------------------------------
+	"""
+	def systemd_add_rdepends_rrecommends(pkg_systemd):
 		# RDEPENDS_${pkg_systemd} += pkg_systemd_base systemd
 		rdepends = d.getVar('RDEPENDS_' + pkg_systemd, 1) or ""
 		rdepends_arr = rdepends.split()
@@ -195,13 +208,18 @@ python populate_packages_prepend () {
 		if len(rdepends_arr) == 0 and pkg_systemd != '${PN}' and not pkg_systemd_base in rdepends:
 			rdepends = '%s %s' % (rdepends, pkg_systemd_base)
 		d.setVar('RDEPENDS_' + pkg_systemd, rdepends)
-
+		# RRECOMMENDS_${pkg_systemd_base} += pkg_systemd systemd
+		rrecommends = d.getVar('RRECOMMENDS_' + pkg_systemd_base, 1) or ""
+		# not rrecommending myself AND avoid double entries
+		if pkg_systemd != pkg_systemd_base and not pkg_systemd in rrecommends.split():
+			rrecommends = '%s %s' % (rrecommends, pkg_systemd)
+		d.setVar('RRECOMMENDS_' + pkg_systemd_base, rrecommends)
 
 	# run all modifications once when creating package
 	if os.path.exists('${D}'):
 		for pkg_systemd in d.getVar('SYSTEMD_PACKAGES', 1).split():
 			if get_package_var(d, 'SYSTEMD_SERVICE', pkg_systemd) != "":
 				systemd_generate_package_scripts(pkg_systemd)
-				systemd_add_rdepends(pkg_systemd)
+				systemd_add_rdepends_rrecommends(pkg_systemd)
 		systemd_check_services()
 }
-- 
1.7.6.5

[meta-oe, V2 06/32] systemd.bbclass: do not warn for systemd files are in ${PN}

[Andreas Müller]

Since we have our own layer there is no need to separate out systemd packages

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-systemd/classes/systemd.bbclass |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/meta-systemd/classes/systemd.bbclass b/meta-systemd/classes/systemd.bbclass
index fce314d..8af0d58 100644
--- a/meta-systemd/classes/systemd.bbclass
+++ b/meta-systemd/classes/systemd.bbclass
@@ -46,18 +46,13 @@ def systemd_after_parse(d):
 			if pkg_systemd.find("-systemd") == -1:
 				if pkg_systemd != d.getVar('PN', 1):
 					raise bb.build.FuncFailed, \
-						"\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \
+						"\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \
 						(bb_filename, pkg_systemd)
-				else:
-					# Only complain if recipe lacks native systemd support
-					native_systemd_support = d.getVar('NATIVE_SYSTEMD_SUPPORT', 1) or ""
-					if native_systemd_support == "":
-						bb.warn("%s: it is recommended to set SYSTEMD_PACKAGES as <existing-package>-systemd" % bb_filename)
 			else:
 				pkg_systemd_base = pkg_systemd.replace('-systemd', '')
 				if pkg_systemd_base not in packages:
 					raise bb.build.FuncFailed, \
-						"\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN} (deprecated)" % \
+						"\n\n%s: %s in SYSTEMD_PACKAGES does not match <existing-package>-systemd or ${PN}" % \
 						( bb_filename, pkg_systemd)
 
 	# prepend systemd-packages not already included
-- 
1.7.6.5

[meta-oe, V2 07/32] task-basic: move systemd support to meta systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-core/tasks/task-basic.bb           |    7 +++----
 .../meta-oe/recipes-core/tasks/task-basic.bbappend |    6 ++++++
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend

diff --git a/meta-oe/recipes-core/tasks/task-basic.bb b/meta-oe/recipes-core/tasks/task-basic.bb
index d4a0bd9..47b09de 100644
--- a/meta-oe/recipes-core/tasks/task-basic.bb
+++ b/meta-oe/recipes-core/tasks/task-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 = "r8"
+PR = "r9"
 
 inherit task
 
@@ -21,7 +21,7 @@ MACHINE_EXTRA_RRECOMMENDS ?= ""
 # Select between dropbear and openssh
 # Set TASK_BASIC_SSHDAEMON = "openssh-sshd openssh-sftp openssh-sftp-server" in your DISTRO config to get openssh(d)
 #
-TASK_BASIC_SSHDAEMON ?= "dropbear-systemd openssh-sftp openssh-sftp-server"
+TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server"
 
 #
 # The section below is designed to match with task-boot, but doesn't depend on it to allow for more freedom 
@@ -33,8 +33,7 @@ TASK_BASIC_SSHDAEMON ?= "dropbear-systemd openssh-sftp openssh-sftp-server"
 #
 RDEPENDS_${PN} = "\
 	${TASK_BASIC_SSHDAEMON} \
-	avahi-daemon avahi-utils avahi-systemd \
-	systemd-compat-units \
+	avahi-daemon avahi-utils \
 	"
 
 #
diff --git a/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend b/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend
new file mode 100644
index 0000000..358c9cb
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend
@@ -0,0 +1,6 @@
+PRINC := "${@int(PRINC) + 1}"
+
+RDEPENDS_${PN} += "\
+	systemd-compat-units \
+	avahi-systemd \
+"
-- 
1.7.6.5

[meta-oe, V2 08/32] task-x11: in case meta-systemd is part of BBLAYERS, xserver-nodm-init-systemd is recommended automatically

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-core/tasks/task-x11_1.0.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-core/tasks/task-x11_1.0.bb b/meta-oe/recipes-core/tasks/task-x11_1.0.bb
index 628789a..326e09f 100644
--- a/meta-oe/recipes-core/tasks/task-x11_1.0.bb
+++ b/meta-oe/recipes-core/tasks/task-x11_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b
 SECTION = "x11/server"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r10"
+PR = "r11"
 
 inherit task allarch
 
@@ -16,8 +16,8 @@ RRECOMMENDS_${PN} = "\
 # xserver-common, x11-common
 VIRTUAL-RUNTIME_xserver_common ?= "xserver-common"
 
-# elsa, xserver-nodm-init or xserver-nodm-init-systemd
-VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init-systemd"
+# elsa or xserver-nodm-init(-systemd)
+VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
 
 RDEPENDS_${PN}-utils = "\
   ${VIRTUAL-RUNTIME_xserver_common} \
-- 
1.7.6.5

[meta-oe,V2 09/32] polkit: meta-systemd rework

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-extended/polkit/polkit_0.104.bbappend  |    4 ++--
 .../recipes-extended/polkit/polkit_0.104.bbappend  |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend

diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
index 2383c5b..ea82e37 100644
--- a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
+++ b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
@@ -1,6 +1,6 @@
-PRINC := "${@int(PRINC) + 3}"
+PRINC := "${@int(PRINC) + 4}"
 
-POLKITAUTH ??= "systemd"
+POLKITAUTH ??= "consolekit"
 
 PACKAGECONFIG += "${POLKITAUTH}"
 PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
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
new file mode 100644
index 0000000..9528b9b
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
@@ -0,0 +1,3 @@
+PRINC := "${@int(PRINC) + 1}"
+
+POLKITAUTH = "systemd"
-- 
1.7.6.5

[meta-oe,V2 10/32] gdm: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb         |    8 ++------
 .../meta-gnome}/recipes-gnome/gdm/gdm/gdm.service  |    0
 .../recipes-gnome/gdm/gdm_2.32.2.bbappend          |   13 +++++++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)
 rename {meta-gnome => meta-systemd/meta-gnome}/recipes-gnome/gdm/gdm/gdm.service (100%)
 create mode 100644 meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend

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 6ebd587..bdf249e 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 = "r8"
+PR = "r9"
 
-inherit gnome update-rc.d systemd
+inherit gnome update-rc.d
 
 SRC_URI += " \
             file://cross-xdetection.diff \
@@ -17,7 +17,6 @@ SRC_URI += " \
             file://gdm.conf \
             file://gdm-pam \
             file://Default \
-            file://gdm.service \
            "
 
 SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e"
@@ -48,9 +47,6 @@ do_install_append() {
 
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "gdm.service"
-
 FILES_${PN} += "${datadir}/icon* \
 		${datadir}/xsession* \
                "
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm.service b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm/gdm.service
rename to meta-systemd/meta-gnome/recipes-gnome/gdm/gdm/gdm.service
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
new file mode 100644
index 0000000..7308346
--- /dev/null
+++ b/meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
@@ -0,0 +1,13 @@
+# look for files in the layer first
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SRC_URI += " \
+            file://gdm.service \
+           "
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "gdm.service"
-- 
1.7.6.5

[meta-oe, V2 11/32] busybox: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-core/busybox/busybox_1.19.4.bbappend   |   20 +---------------
 .../busybox/busybox/busybox-klogd.service.in       |    0
 .../busybox/busybox/busybox-syslog.service.in      |    0
 .../recipes-core/busybox/busybox_1.19.4.bbappend   |   23 ++++++++++++++++++++
 4 files changed, 25 insertions(+), 18 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-core/busybox/busybox/busybox-klogd.service.in (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-core/busybox/busybox/busybox-syslog.service.in (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend

diff --git a/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend b/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
index 786e1d5..e9dd4ac 100644
--- a/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
+++ b/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
@@ -1,27 +1,11 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 4}"
+PRINC := "${@int(PRINC) + 5}"
 
 # look for files in the layer first
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SRC_URI += "file://busybox-syslog.service.in \
-            file://busybox-klogd.service.in \
-            file://busybox-syslog.default"
-
-SYSTEMD_PACKAGES = "${PN}-syslog-systemd"
-SYSTEMD_SERVICE_${PN}-syslog-systemd = "busybox-syslog.service"
+SRC_URI += "file://busybox-syslog.default"
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/default
 	install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
-
-	install -d ${D}${systemd_unitdir}/system
-	sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \
-	     > ${D}${systemd_unitdir}/system/busybox-syslog.service
-	sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
-	     > ${D}${systemd_unitdir}/system/busybox-klogd.service
-
-	ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
 }
-FILES_${PN}-syslog-systemd = "${systemd_unitdir}/system/syslog.service"
diff --git a/meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in b/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
similarity index 100%
rename from meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
rename to meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
diff --git a/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in b/meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
similarity index 100%
rename from meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
rename to meta-systemd/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
diff --git a/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
new file mode 100644
index 0000000..a0ae2ce
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
@@ -0,0 +1,23 @@
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+# look for files in the layer first
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://busybox-syslog.service.in \
+            file://busybox-klogd.service.in"
+
+SYSTEMD_PACKAGES = "${PN}-syslog-systemd"
+SYSTEMD_SERVICE_${PN}-syslog-systemd = "busybox-syslog.service"
+
+do_install_append() {
+	install -d ${D}${systemd_unitdir}/system
+	sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \
+	     > ${D}${systemd_unitdir}/system/busybox-syslog.service
+	sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
+	     > ${D}${systemd_unitdir}/system/busybox-klogd.service
+
+	ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
+}
+FILES_${PN}-syslog-systemd = "${systemd_unitdir}/system/syslog.service"
-- 
1.7.6.5

[meta-oe,V2 12/32] ntp: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb         |   18 +-----------------
 .../meta-oe/recipes-support/ntp/ntp}/ntpd.service  |    0
 .../recipes-support/ntp/ntp}/ntpdate.service       |    0
 .../recipes-support/ntp/ntp_4.2.6p3.bbappend       |   20 ++++++++++++++++++++
 4 files changed, 21 insertions(+), 17 deletions(-)
 rename {meta-oe/recipes-support/ntp/files => meta-systemd/meta-oe/recipes-support/ntp/ntp}/ntpd.service (100%)
 rename {meta-oe/recipes-support/ntp/files => meta-systemd/meta-oe/recipes-support/ntp/ntp}/ntpdate.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bbappend

diff --git a/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb b/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
index a3d719e..89a272a 100644
--- a/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
+++ b/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb
@@ -1,11 +1,6 @@
 require ntp.inc
 
-PR = "r5"
-
-inherit systemd
-
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "ntpd.service"
+PR = "r6"
 
 SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \
         file://tickadj.c.patch \
@@ -13,8 +8,6 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
         file://ntpd \
         file://ntp.conf \
         file://ntpdate \
-        file://ntpdate.service \
-        file://ntpd.service \
 "
 
 SRC_URI[md5sum] = "59876a9009b098ff59767ee45a88ebd2"
@@ -28,17 +21,8 @@ do_install_append() {
 	install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d
 	install -d ${D}/${sysconfdir}/network/if-up.d
 	install -m 755 ${WORKDIR}/ntpdate ${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 =+ "${PN}-systemd"
-
-FILES_${PN}-systemd = "${systemd_unitdir}/system/"
-RDEPENDS_${PN}-systemd = "${PN}"
-
 FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/ntptime ${bindir}/ntptrace"
 FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd"
 FILES_${PN}-tickadj = "${bindir}/tickadj"
diff --git a/meta-oe/recipes-support/ntp/files/ntpd.service b/meta-systemd/meta-oe/recipes-support/ntp/ntp/ntpd.service
similarity index 100%
rename from meta-oe/recipes-support/ntp/files/ntpd.service
rename to meta-systemd/meta-oe/recipes-support/ntp/ntp/ntpd.service
diff --git a/meta-oe/recipes-support/ntp/files/ntpdate.service b/meta-systemd/meta-oe/recipes-support/ntp/ntp/ntpdate.service
similarity index 100%
rename from meta-oe/recipes-support/ntp/files/ntpdate.service
rename to meta-systemd/meta-oe/recipes-support/ntp/ntp/ntpdate.service
diff --git a/meta-systemd/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bbappend b/meta-systemd/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bbappend
new file mode 100644
index 0000000..c6cd031
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bbappend
@@ -0,0 +1,20 @@
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SYSTEMD_PACKAGES = "${PN}-systemd ntpdate-systemd"
+SYSTEMD_SERVICE_${PN}-systemd = "ntpd.service"
+SYSTEMD_SERVICE_ntpdate-systemd = "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.7.6.5

[meta-oe, V2 13/32] syslog-ng: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc    |    9 ++-------
 .../syslog-ng/syslog-ng_3.2.5.bbappend             |   11 +++++++++++
 2 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend

diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 50ce4a4..584e4a4 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/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 = "r8"
+INC_PR = "r9"
 
-inherit autotools systemd
+inherit autotools
 
 SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/${PN}_${PV}.tar.gz"
 
@@ -25,8 +25,6 @@ EXTRA_OECONF = " \
   --disable-linux-caps \
   --disable-pcre \
   --disable-sql \
-  --enable-systemd \
-  --with-systemdsystemunitdir=${systemd_unitdir}/system \
 "
 
 do_configure_prepend() {
@@ -44,9 +42,6 @@ do_install_append() {
         install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN}
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
-
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
             ${base_bindir}/* ${base_sbindir}/* \
diff --git a/meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend b/meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend
new file mode 100644
index 0000000..92c2e77
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend
@@ -0,0 +1,11 @@
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+EXTRA_OECONF += " \
+  --enable-systemd \
+  --with-systemdsystemunitdir=${systemd_unitdir}/system \
+"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.service"
-- 
1.7.6.5

[meta-oe, V2 14/32] udisks: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |   10 +++-------
 .../udisks/udisks/add-systemd-support.patch        |    0
 .../recipes-support/udisks/udisks_1.0.4.bbappend   |   13 +++++++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-support/udisks/udisks/add-systemd-support.patch (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend

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 0018a5f..b6448ef 100644
--- a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
+++ b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
@@ -2,22 +2,18 @@ DESCRIPTION = "A storage daemon that implements well-defined D-Bus interfaces th
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273"
 
-DEPENDS = "libatasmart sg3-utils polkit udev dbus-glib glib-2.0 systemd"
+DEPENDS = "libatasmart sg3-utils polkit udev dbus-glib glib-2.0"
 # optional dependencies: device-mapper parted
 
 SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \
-           file://add-systemd-support.patch \
            file://optional-depends.patch"
 
 SRC_URI[udisks.md5sum] = "86c63b2b5484f2060499a052b5b6256b"
 SRC_URI[udisks.sha256sum] = "854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5"
 
-PR = "r4"
+PR = "r5"
 
-inherit autotools systemd
-
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "udisks-daemon.service"
+inherit autotools
 
 EXTRA_OECONF = "--disable-man-pages"
 
diff --git a/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch b/meta-systemd/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch
similarity index 100%
rename from meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch
rename to meta-systemd/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch
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
new file mode 100644
index 0000000..f6470c9
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
@@ -0,0 +1,13 @@
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+# look for files in the layer first
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+DEPENDS += "systemd"
+
+SRC_URI += "file://add-systemd-support.patch"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE_${PN}-systemd = "udisks-daemon.service"
-- 
1.7.6.5

[meta-oe, V2 15/32] lighttpd: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../lighttpd/lighttpd/lighttpd.service             |    0
 .../lighttpd/lighttpd_1.4.31.bbappend              |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-extended/lighttpd/lighttpd/lighttpd.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend (62%)

diff --git a/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service b/meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service
similarity index 100%
rename from meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service
rename to meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service
diff --git a/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend b/meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend
similarity index 62%
rename from meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend
rename to meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend
index df6dac7..b016bdc 100644
--- a/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend
+++ b/meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS := "${THISDIR}/${PN}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 inherit systemd
 
-- 
1.7.6.5

[meta-oe, V2 16/32] cronie: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-extended/cronie/cronie/crond.service   |    0
 .../recipes-extended/cronie/cronie_1.4.8.bbappend  |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-extended/cronie/cronie/crond.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-extended/cronie/cronie_1.4.8.bbappend (69%)

diff --git a/meta-oe/recipes-extended/cronie/cronie/crond.service b/meta-systemd/meta-oe/recipes-extended/cronie/cronie/crond.service
similarity index 100%
rename from meta-oe/recipes-extended/cronie/cronie/crond.service
rename to meta-systemd/meta-oe/recipes-extended/cronie/cronie/crond.service
diff --git a/meta-oe/recipes-extended/cronie/cronie_1.4.8.bbappend b/meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.8.bbappend
similarity index 69%
rename from meta-oe/recipes-extended/cronie/cronie_1.4.8.bbappend
rename to meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.8.bbappend
index 5aedb21..66db466 100644
--- a/meta-oe/recipes-extended/cronie/cronie_1.4.8.bbappend
+++ b/meta-systemd/meta-oe/recipes-extended/cronie/cronie_1.4.8.bbappend
@@ -1,7 +1,7 @@
 # look for files in the layer first
-FILESEXTRAPATHS := "${THISDIR}/${PN}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC = "2"
+PRINC := "${@int(PRINC) + 3}"
 
 inherit systemd
 
-- 
1.7.6.5

[meta-oe, V2 17/32] elsa: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-efl/recipes-efl/efl/elsa_svn.bb               |    9 +--------
 .../recipes-efl/efl/elsa/xserver-nodm.service      |    0
 .../meta-efl/recipes-efl/efl/elsa_svn.bbappend     |   13 +++++++++++++
 3 files changed, 14 insertions(+), 8 deletions(-)
 rename {meta-efl => meta-systemd/meta-efl}/recipes-efl/efl/elsa/xserver-nodm.service (100%)
 create mode 100644 meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend

diff --git a/meta-efl/recipes-efl/efl/elsa_svn.bb b/meta-efl/recipes-efl/efl/elsa_svn.bb
index b8a4f63..e781ce2 100644
--- a/meta-efl/recipes-efl/efl/elsa_svn.bb
+++ b/meta-efl/recipes-efl/efl/elsa_svn.bb
@@ -4,12 +4,11 @@ LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "e/apps"
 
-PR = "r1"
+PR = "r2"
 
 inherit e gettext
 SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \
   file://0001-pam-use-common-auth-instead-of-system-auth.patch \
-  file://xserver-nodm.service \
 "
 S = "${WORKDIR}/${SRCNAME}"
 
@@ -18,13 +17,7 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains
 PV = "0.0.4+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
-inherit systemd
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "xserver-nodm.service"
-
 RDEPENDS_${PN} += "${PN}-themes sessreg xauth"
 CONFFILES_${PN} += "${sysconfdir}/elsa.conf"
 RCONFLICTS_${PN} += "xserver-nodm-init"
 RREPLACES_${PN} += "xserver-nodm-init"
-RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd"
-RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd"
diff --git a/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service b/meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service
similarity index 100%
rename from meta-efl/recipes-efl/efl/elsa/xserver-nodm.service
rename to meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service
diff --git a/meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend b/meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend
new file mode 100644
index 0000000..ac0d2bc
--- /dev/null
+++ b/meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend
@@ -0,0 +1,13 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SRC_URI += "file://xserver-nodm.service"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "xserver-nodm.service"
+
+RCONFLICTS_${PN}-systemd += "xserver-nodm-init-systemd"
+RREPLACES_${PN}-systemd += "xserver-nodm-init-systemd"
-- 
1.7.6.5

[meta-oe, V2 18/32] net-snmp: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-extended/net-snmp/net-snmp_5.7.1.bb    |   17 ++---------------
 .../net-snmp/net-snmp}/snmpd.service               |    0
 .../net-snmp/net-snmp}/snmptrapd.service           |    0
 .../net-snmp/net-snmp}/systemd-support.patch       |    0
 .../net-snmp/net-snmp_5.7.1.bbappend               |   19 +++++++++++++++++++
 5 files changed, 21 insertions(+), 15 deletions(-)
 rename {meta-oe/recipes-extended/net-snmp/files => meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp}/snmpd.service (100%)
 rename {meta-oe/recipes-extended/net-snmp/files => meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp}/snmptrapd.service (100%)
 rename {meta-oe/recipes-extended/net-snmp/files => meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp}/systemd-support.patch (100%)
 create 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_5.7.1.bb b/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bb
index 83df80a..f1e42b5 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
@@ -1,28 +1,18 @@
 require net-snmp.inc
-inherit systemd
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 LIC_FILES_CHKSUM = "file://README;beginline=3;endline=8;md5=7f7f00ba639ac8e8deb5a622ea24634e"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
         file://sync-with-5.7-branch.patch \
         file://libnl-3-support.patch \
-        file://systemd-support.patch \
-        file://snmpd.service \
-        file://snmptrapd.service \
         file://init \
         file://snmpd.conf \
         file://snmptrapd.conf"
 
-EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no --with-systemd "
+EXTRA_OECONF += "--disable-embedded-perl --with-perl-modules=no"
 EXTRA_OEMAKE = "INSTALL_PREFIX=${D}"
 
-SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \
-                    ${PN}-server-snmptrapd-systemd"
-
-SYSTEMD_SERVICE_${PN}-server-snmpd-systemd = "snmpd.service"
-SYSTEMD_SERVICE_${PN}-server-snmptrapd-systemd =  "snmptrapd.service"
-
 do_configure_prepend() {
         gnu-configize -f
         # We better change sources and re-autoconf here, but
@@ -37,6 +27,3 @@ CCACHE = ""
 
 SRC_URI[md5sum] = "c95d08fd5d93df0c11a2e1bdf0e01e0b"
 SRC_URI[sha256sum] = "7c71c9650c65b715356547e20ca2dbe6313944278af8cc19c32a5337f46b181f"
-
-RDEPENDS_${PN}-server-snmpd-systemd = "${PN}-server-snmpd"
-RDEPENDS_${PN}-server-snmptrapd-systemd = "${PN}-server-snmptrapd"
diff --git a/meta-oe/recipes-extended/net-snmp/files/snmpd.service b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service
similarity index 100%
rename from meta-oe/recipes-extended/net-snmp/files/snmpd.service
rename to meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmpd.service
diff --git a/meta-oe/recipes-extended/net-snmp/files/snmptrapd.service b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service
similarity index 100%
rename from meta-oe/recipes-extended/net-snmp/files/snmptrapd.service
rename to meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/snmptrapd.service
diff --git a/meta-oe/recipes-extended/net-snmp/files/systemd-support.patch b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch
similarity index 100%
rename from meta-oe/recipes-extended/net-snmp/files/systemd-support.patch
rename to meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp/systemd-support.patch
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
new file mode 100644
index 0000000..f221c1d
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend
@@ -0,0 +1,19 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SRC_URI += " \
+        file://systemd-support.patch \
+        file://snmpd.service \
+        file://snmptrapd.service \
+"
+
+EXTRA_OECONF += "--with-systemd"
+
+SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \
+                    ${PN}-server-snmptrapd-systemd"
+
+SYSTEMD_SERVICE_${PN}-server-snmpd-systemd = "snmpd.service"
+SYSTEMD_SERVICE_${PN}-server-snmptrapd-systemd =  "snmptrapd.service"
-- 
1.7.6.5

[meta-oe, V2 19/32] atftp: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-extended/atftp/atftp_0.7.bb        |   10 +++-------
 .../recipes-extended/atftp/atftp}/atftpd.service   |    0
 .../recipes-extended/atftp/atftp_0.7.bbappend      |   10 ++++++++++
 3 files changed, 13 insertions(+), 7 deletions(-)
 rename {meta-oe/recipes-extended/atftp/files => meta-systemd/meta-oe/recipes-extended/atftp/atftp}/atftpd.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-extended/atftp/atftp_0.7.bbappend

diff --git a/meta-oe/recipes-extended/atftp/atftp_0.7.bb b/meta-oe/recipes-extended/atftp/atftp_0.7.bb
index 1af4b63..ff1e11d 100644
--- a/meta-oe/recipes-extended/atftp/atftp_0.7.bb
+++ b/meta-oe/recipes-extended/atftp/atftp_0.7.bb
@@ -3,19 +3,15 @@ SECTION = "network"
 HOMEPAGE = "http://packages.debian.org/atftp"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg.orig.tar.gz;name=archive \
            ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg-11.diff.gz;name=patch \
-           file://atftpd.init \
-           file://atftpd.service"
+           file://atftpd.init"
 
 S = "${WORKDIR}/atftp-${PV}.dfsg"
 
-inherit autotools update-rc.d systemd useradd
-
-SYSTEMD_PACKAGES = "atftpd-systemd"
-SYSTEMD_SERVICE_atftpd-systemd = "atftpd.service"
+inherit autotools update-rc.d useradd
 
 INITSCRIPT_PACKAGES = "${PN}d"
 INITSCRIPT_NAME_${PN}d = "atftpd"
diff --git a/meta-oe/recipes-extended/atftp/files/atftpd.service b/meta-systemd/meta-oe/recipes-extended/atftp/atftp/atftpd.service
similarity index 100%
rename from meta-oe/recipes-extended/atftp/files/atftpd.service
rename to meta-systemd/meta-oe/recipes-extended/atftp/atftp/atftpd.service
diff --git a/meta-systemd/meta-oe/recipes-extended/atftp/atftp_0.7.bbappend b/meta-systemd/meta-oe/recipes-extended/atftp/atftp_0.7.bbappend
new file mode 100644
index 0000000..3706d9f
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-extended/atftp/atftp_0.7.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SRC_URI += "file://atftpd.service"
+
+SYSTEMD_PACKAGES = "atftpd-systemd"
+SYSTEMD_SERVICE_atftpd-systemd = "atftpd.service"
-- 
1.7.6.5

[meta-oe, V2 20/32] dhcp: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-connectivity/dhcp/dhcp}/dhcpd.service  |    0
 .../dhcp/dhcp}/dhcrelay.service                    |    0
 .../dhcp/dhcp_4.2.3-P2.bbappend                    |    4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {meta-oe/recipes-connectivity/dhcp/files => meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp}/dhcpd.service (100%)
 rename {meta-oe/recipes-connectivity/dhcp/files => meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp}/dhcrelay.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend (79%)

diff --git a/meta-oe/recipes-connectivity/dhcp/files/dhcpd.service b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcpd.service
similarity index 100%
rename from meta-oe/recipes-connectivity/dhcp/files/dhcpd.service
rename to meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcpd.service
diff --git a/meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcrelay.service
similarity index 100%
rename from meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service
rename to meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcrelay.service
diff --git a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
similarity index 79%
rename from meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
rename to meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
index edd44c1..5fd7ccb 100644
--- a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
+++ b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
@@ -1,9 +1,9 @@
 # look for files in the layer first
-FILESEXTRAPATHS := "${THISDIR}/files"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 inherit systemd
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 SYSTEMD_PACKAGES = "dhcp-server-systemd dhcp-relay-systemd"
 SYSTEMD_SERVICE_dhcp-server-systemd = "dhcpd.service"
-- 
1.7.6.5

[meta-oe, V2 21/32] connman: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../connman/connman_1.0.bbappend                   |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/connman/connman_1.0.bbappend (84%)

diff --git a/meta-oe/recipes-connectivity/connman/connman_1.0.bbappend b/meta-systemd/meta-oe/recipes-connectivity/connman/connman_1.0.bbappend
similarity index 84%
rename from meta-oe/recipes-connectivity/connman/connman_1.0.bbappend
rename to meta-systemd/meta-oe/recipes-connectivity/connman/connman_1.0.bbappend
index 167165f..a9d13e6 100644
--- a/meta-oe/recipes-connectivity/connman/connman_1.0.bbappend
+++ b/meta-systemd/meta-oe/recipes-connectivity/connman/connman_1.0.bbappend
@@ -1,5 +1,7 @@
 inherit systemd
 
+PRINC := "${@int(PRINC) + 1}"
+
 EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/"
 
 SYSTEMD_PACKAGES = "${PN}-systemd"
-- 
1.7.6.5

[meta-oe, V2 22/32] gateone: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-connectivity/gateone/gateone_git.bb    |    9 ++-------
 .../gateone/gateone/gateone.service                |    0
 .../gateone/gateone_git.bbappend                   |   11 +++++++++++
 3 files changed, 13 insertions(+), 7 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/gateone/gateone/gateone.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend

diff --git a/meta-oe/recipes-connectivity/gateone/gateone_git.bb b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
index 12f4e51..f6aa377 100644
--- a/meta-oe/recipes-connectivity/gateone/gateone_git.bb
+++ b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
@@ -2,19 +2,18 @@ DESCRIPTION = "HTML5 (plugin-free) web-based terminal emulator and SSH client"
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ee5b168fc7de89a0cadc49e27830aa2c"
 
-PR = "r7"
+PR = "r8"
 
 PV = "1.1"
 SRCREV = "bb74e1095adb66b04b51ed6ff10ae0aa96afdd46"
 SRC_URI = "git://github.com/liftoff/GateOne.git \
            file://gateone-avahi.service \
-           file://gateone.service \
            file://server.conf \
           "
 
 S = "${WORKDIR}/git"
 
-inherit distutils allarch systemd
+inherit distutils allarch
 
 export prefix = "${localstatedir}/lib"
 
@@ -27,10 +26,6 @@ do_install_append() {
 	install -m 0644 ${WORKDIR}/server.conf ${D}/var/lib/gateone/server.conf
 }
 
-NATIVE_SYSTEMD_SUPPORT = "1"
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE = "gateone.service"
-
 FILES_${PN} = "${localstatedir}/lib ${localstatedir}/log ${base_libdir} ${sysconfdir}"
 RDEPENDS_${PN} = "file \
                   mime-support \
diff --git a/meta-oe/recipes-connectivity/gateone/gateone/gateone.service b/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone/gateone.service
similarity index 100%
rename from meta-oe/recipes-connectivity/gateone/gateone/gateone.service
rename to meta-systemd/meta-oe/recipes-connectivity/gateone/gateone/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
new file mode 100644
index 0000000..dd5fea1
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend
@@ -0,0 +1,11 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SRC_URI += "file://gateone.service"
+
+NATIVE_SYSTEMD_SUPPORT = "1"
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE = "gateone.service"
-- 
1.7.6.5

[meta-oe, V2 23/32] cherokee: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../cherokee/cherokee_1.2.98.bb                    |   10 +++-------
 .../cherokee/cherokee/cherokee.service             |    0
 .../cherokee/cherokee_1.2.98.bbappend              |   10 ++++++++++
 3 files changed, 13 insertions(+), 7 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/cherokee/cherokee/cherokee.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend

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 a4835e0..f481c42 100644
--- a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
+++ b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb
@@ -5,17 +5,16 @@ SECTION = "network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-PR = "r4"
+PR = "r5"
 
 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.service"
+           file://cherokee.init"
 SRC_URI[md5sum] = "21b01e7d45c0e82ecc0c4257a9c27feb"
 SRC_URI[sha256sum] = "042b5687b1a3db3ca818167548ce5d32c35e227c6640732dcb622a6f4a078b7d"
 
-inherit autotools pkgconfig binconfig update-rc.d systemd
+inherit autotools pkgconfig binconfig update-rc.d
 
 EXTRA_OECONF = "--disable-static \
                 --disable-nls \
@@ -45,6 +44,3 @@ CONFFILES_${PN} = " \
 
 INITSCRIPT_NAME = "cherokee"
 INITSCRIPT_PARAMS = "defaults 91 91"
-
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "cherokee.service"
diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service b/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service
similarity index 100%
rename from meta-oe/recipes-connectivity/cherokee/cherokee/cherokee.service
rename to meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee/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
new file mode 100644
index 0000000..7cc7dd8
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SRC_URI += "file://cherokee.service"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "cherokee.service"
-- 
1.7.6.5

[meta-oe, V2 24/32] openssh: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../openssh/openssh/sshd.socket                    |    0
 .../openssh/openssh/sshd@.service                  |    0
 .../openssh/openssh/sshdgenkeys.service            |    0
 .../openssh/openssh_6.0p1.bbappend                 |    2 +-
 4 files changed, 1 insertions(+), 1 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/openssh/openssh/sshd.socket (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/openssh/openssh/sshd@.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/openssh/openssh/sshdgenkeys.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/openssh/openssh_6.0p1.bbappend (88%)

diff --git a/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket
similarity index 100%
rename from meta-oe/recipes-connectivity/openssh/openssh/sshd.socket
rename to meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd.socket
diff --git a/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service
similarity index 100%
rename from meta-oe/recipes-connectivity/openssh/openssh/sshd@.service
rename to meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshd@.service
diff --git a/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service
similarity index 100%
rename from meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service
rename to meta-systemd/meta-oe/recipes-connectivity/openssh/openssh/sshdgenkeys.service
diff --git a/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend
similarity index 88%
rename from meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend
rename to meta-systemd/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend
index de7668f..a708a36 100644
--- a/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend
+++ b/meta-systemd/meta-oe/recipes-connectivity/openssh/openssh_6.0p1.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 3}"
 
 SYSTEMD_PACKAGES = "openssh-sshd-systemd"
 SYSTEMD_SERVICE = "sshd.socket"
-- 
1.7.6.5

[meta-oe, V2 25/32] cloud9: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb      |    9 +--------
 .../recipes-devtools/cloud9/cloud9/cloud9.service  |    0
 .../recipes-devtools/cloud9/cloud9_0.6.bbappend    |   13 +++++++++++++
 3 files changed, 14 insertions(+), 8 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-devtools/cloud9/cloud9/cloud9.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend

diff --git a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
index 0f0c09c..a78c653 100644
--- a/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
+++ b/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://c9.io"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4784c3bcff601fd8f9515f52a11e7018"
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "libxml2 nodejs-native"
 
@@ -31,7 +31,6 @@ SRC_URI = "git://github.com/ajaxorg/cloud9.git;name=cloud9ide \
            git://github.com/ajaxorg/treehugger.git;destsuffix=git/support/treehugger;name=treehugger \
            git://github.com/ajaxorg/UglifyJS.git;destsuffix=git/support/uglify-js;name=uglify-js \
            file://index.js \
-           file://cloud9.service \
            file://cloud9-avahi.service \
            file://0001-ide-use-node-as-interpreter-for-sketches-instead-of-.patch \
           "
@@ -104,9 +103,3 @@ FILES_${PN}-dbg += "${datadir}/cloud9/support/jsdav/support/node-o3-xml-v4/lib/o
                    "
 
 RDEPENDS_${PN} = "nodejs4 nodejs gzip"
-
-inherit systemd
-
-NATIVE_SYSTEMD_SUPPORT = "1"
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "cloud9.service"
diff --git a/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service b/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
similarity index 100%
rename from meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
rename to meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9/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
new file mode 100644
index 0000000..777d2f4
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
@@ -0,0 +1,13 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SRC_URI += "file://cloud9.service"
+
+inherit systemd
+
+NATIVE_SYSTEMD_SUPPORT = "1"
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "cloud9.service"
-- 
1.7.6.5

[meta-oe, V2 26/32] xinput-calibrator: : move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |    8 ++------
 .../xinput-calibrator/xinput-calibrator.service    |    0
 .../xinput-calibrator_0.7.5.bbappend               |   10 ++++++++++
 3 files changed, 12 insertions(+), 6 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bbappend

diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
index fc5da49..edc10bd 100644
--- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
+++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
@@ -4,13 +4,12 @@ LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc"
 DEPENDS = "virtual/libx11 libxi"
 
-PR = "r7"
+PR = "r8"
 
-inherit autotools systemd
+inherit autotools
 
 SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz \
            file://0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch \
-           file://xinput-calibrator.service \
            file://xinput-calibrator-autostart.desktop \
 "
 SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa"
@@ -29,9 +28,6 @@ do_install_append() {
         install -m 0644 ${WORKDIR}/xinput-calibrator-autostart.desktop ${D}${sysconfdir}/xdg/autostart
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
-
 FILES_${PN} += "${sysconfdir}/xdg/autostart"
 RDEPENDS_${PN} = "xinput xterm"
 RRECOMMENDS_${PN} = "pointercal-xinput"
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
similarity index 100%
rename from meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
rename to meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
diff --git a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bbappend b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bbappend
new file mode 100644
index 0000000..e12abec
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SRC_URI += "file://xinput-calibrator.service"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.service"
-- 
1.7.6.5

[meta-oe, V2 27/32] xserver-nodm-init: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../xserver-nodm-init/xserver-nodm-init_2.0.bb     |   16 +-------------
 .../xserver-nodm-init}/xserver-nodm.conf           |    0
 .../xserver-nodm-init}/xserver-nodm.service        |    0
 .../xserver-nodm-init_2.0.bbappend                 |   21 ++++++++++++++++++++
 4 files changed, 23 insertions(+), 14 deletions(-)
 rename {meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0 => meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init}/xserver-nodm.conf (100%)
 rename {meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0 => meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init}/xserver-nodm.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend

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 62c33c9..544ae7f 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,34 +3,22 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
 
-PR = "r16"
+PR = "r17"
 
 SRC_URI = "file://xserver-nodm \
-           file://xserver-nodm.service \
-           file://xserver-nodm.conf \
            file://gplv2-license.patch \
 "
 S = "${WORKDIR}"
 
-inherit allarch
-
-inherit update-rc.d systemd
+inherit allarch update-rc.d
 
 INITSCRIPT_NAME = "xserver-nodm"
 INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ."
 INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ."
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "xserver-nodm.service"
-
 do_install() {
 	install -d ${D}${sysconfdir}/init.d
 	install xserver-nodm ${D}${sysconfdir}/init.d
-	install -d ${D}${sysconfdir}/default
-	install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm
 }
 
-FILES_${PN}-systemd += "${sysconfdir}/default/xserver-nodm"
-
 RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit"
-RDEPENDS_${PN}-systemd += "xserver-common (>= 1.30) xinit"
diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.conf
similarity index 100%
rename from meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf
rename to meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.conf
diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.service
similarity index 100%
rename from meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service
rename to meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.service
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
new file mode 100644
index 0000000..5538805
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend
@@ -0,0 +1,21 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SRC_URI += "file://xserver-nodm.service \
+            file://xserver-nodm.conf \
+"
+
+do_install_append() {
+        install -d ${D}${sysconfdir}/default
+        install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm
+}
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE_${PN}-systemd = "xserver-nodm.service"
+
+FILES_${PN}-systemd += "${sysconfdir}/default/xserver-nodm"
+
+RDEPENDS_${PN}-systemd += "xserver-common (>= 1.30) xinit"
-- 
1.7.6.5

[meta-oe, V2 28/32] dropbear: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-core/dropbear/dropbear/dropbear.socket |    0
 .../dropbear/dropbear/dropbear@.service            |    0
 .../dropbear/dropbear/dropbearkey.service          |    0
 .../dropbear/dropbear_2012.55.bbappend             |    4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-core/dropbear/dropbear/dropbear.socket (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-core/dropbear/dropbear/dropbear@.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-core/dropbear/dropbear/dropbearkey.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-core/dropbear/dropbear_2012.55.bbappend (81%)

diff --git a/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket
similarity index 100%
rename from meta-oe/recipes-core/dropbear/dropbear/dropbear.socket
rename to meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket
diff --git a/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service
similarity index 100%
rename from meta-oe/recipes-core/dropbear/dropbear/dropbear@.service
rename to meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service
diff --git a/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service
similarity index 100%
rename from meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service
rename to meta-systemd/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service
diff --git a/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend
similarity index 81%
rename from meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend
rename to meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend
index fc5d047..15546e1 100644
--- a/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend
+++ b/meta-systemd/meta-oe/recipes-core/dropbear/dropbear_2012.55.bbappend
@@ -1,9 +1,9 @@
 inherit systemd
 
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 3}"
 
 # look for files in the layer first
-FILESEXTRAPATHS := "${THISDIR}/${PN}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://dropbearkey.service \
             file://dropbear@.service \
-- 
1.7.6.5

[meta-oe, V2 29/32] keymaps: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-bsp/keymaps/keymaps/keymaps.service    |    0
 .../recipes-bsp/keymaps/keymaps_1.0.bbappend       |    2 +-
 2 files changed, 1 insertions(+), 1 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-bsp/keymaps/keymaps/keymaps.service (100%)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-bsp/keymaps/keymaps_1.0.bbappend (85%)

diff --git a/meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service b/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service
similarity index 100%
rename from meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service
rename to meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps/keymaps.service
diff --git a/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend b/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
similarity index 85%
rename from meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
rename to meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
index cc6cb7c..7f336a1 100644
--- a/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
+++ b/meta-systemd/meta-oe/recipes-bsp/keymaps/keymaps_1.0.bbappend
@@ -1,5 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PRINC := "${@int(PRINC) + 5}"
+PRINC := "${@int(PRINC) + 6}"
 
 SRC_URI += " file://keymaps.service"
 
-- 
1.7.6.5

[meta-oe, V2 30/32] rsyslog: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-extended/rsyslog/rsyslog.inc       |   10 +++++-----
 .../rsyslog/rsyslog_5.8.0.bbappend                 |   10 ++++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)
 create 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 97fd026..a4bd180 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
@@ -1,19 +1,19 @@
 DESCRIPTION = "Rsyslog is an enhanced multi-threaded syslogd"
-DEPENDS = "zlib systemd"
+DEPENDS = "zlib"
 HOMEPAGE = "http://www.rsyslog.com/"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973"
 
-INC_PR = "r4"
+INC_PR = "r5"
 
 SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \
            file://rsyslog.conf"
            
+inherit autotools
 
-inherit autotools systemd
+SYSTEMD_UNITDIR ??= "no"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
+EXTRA_OECONF = "--with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
 
 do_install_append() {
         install -d ${D}/${sysconfdir}/${PN}
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
new file mode 100644
index 0000000..b813a50
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend
@@ -0,0 +1,10 @@
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+DEPENDS += "systemd"
+
+SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.service"
-- 
1.7.6.5

[meta-oe, V2 31/32] gpsd: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb        |   15 ++++-----------
 meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb        |   15 ++++-----------
 meta-oe/recipes-navigation/gpsd/gpsd_git.bb        |   14 ++++----------
 .../recipes-navigation/gpsd/gpsd/gpsd.service      |    0
 .../recipes-navigation/gpsd/gpsd_3.4.bbappend      |   18 ++++++++++++++++++
 .../recipes-navigation/gpsd/gpsd_3.5.bbappend      |   18 ++++++++++++++++++
 .../recipes-navigation/gpsd/gpsd_git.bbappend      |   14 ++++++++++++++
 7 files changed, 62 insertions(+), 32 deletions(-)
 rename {meta-oe => meta-systemd/meta-oe}/recipes-navigation/gpsd/gpsd/gpsd.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend
 create mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bbappend
 create mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_git.bbappend

diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
index ebc4af6..4f3d2d7 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native"
 PROVIDES = "virtual/gpsd"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch \
@@ -15,20 +15,18 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
   file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \
   file://gpsd-default \
-  file://gpsd.service \
   file://gpsd \
   file://60-gpsd.rules \
 "
 SRC_URI[md5sum] = "c01353459faa68834309109d4e868460"
 SRC_URI[sha256sum] = "79f7de9ead63c7f5d2c9a92e85b5f82e53323c4d451ef8e27ea265ac3ef9a70f"
 
-inherit scons update-rc.d python-dir systemd
+inherit scons update-rc.d python-dir
 
 INITSCRIPT_NAME = "gpsd"
 INITSCRIPT_PARAMS = "defaults 35"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.socket"
+SYSTEMD_OESCONS ??= "false"
 
 export STAGING_INCDIR
 export STAGING_LIBDIR
@@ -38,7 +36,7 @@ EXTRA_OESCONS = " \
   libQgpsmm='false' \
   debug='true' \
   strip='false' \
-  systemd='true' \
+  systemd='${SYSTEMD_OESCONS}' \
 "
 # this cannot be used, because then chrpath is not found and only static lib is built
 # target=${HOST_SYS}
@@ -81,11 +79,6 @@ 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() {
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
index 083163b..3cac186 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus dbus-glib ncurses python libusb1"
 PROVIDES = "virtual/gpsd"
 
-PR = "r2"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
@@ -16,20 +16,18 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
   file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \
   file://gpsd-default \
-  file://gpsd.service \
   file://gpsd \
   file://60-gpsd.rules \
 "
 SRC_URI[md5sum] = "e96881798a0ab67aa3cd5f3249f0e536"
 SRC_URI[sha256sum] = "5ebb0b00c49421eb8fbead81342e5ce63e82065e5ff27da586f10e342b999171"
 
-inherit scons update-rc.d python-dir systemd
+inherit scons update-rc.d python-dir
 
 INITSCRIPT_NAME = "gpsd"
 INITSCRIPT_PARAMS = "defaults 35"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.socket"
+SYSTEMD_OESCONS ??= "false"
 
 export STAGING_INCDIR
 export STAGING_LIBDIR
@@ -39,7 +37,7 @@ EXTRA_OESCONS = " \
   libQgpsmm='false' \
   debug='true' \
   strip='false' \
-  systemd='true' \
+  systemd='${SYSTEMD_OESCONS}' \
 "
 # this cannot be used, because then chrpath is not found and only static lib is built
 # target=${HOST_SYS}
@@ -82,11 +80,6 @@ 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() {
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
index 0cf0685..1c7d76f 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus dbus-glib ncurses python libusb1"
 PROVIDES = "virtual/gpsd"
 
-PR = "r1"
+PR = "r2"
 
 SRCREV = "f8744f4af8cef211de698df5d8e6caddfe33f29d"
 
@@ -25,13 +25,12 @@ SRC_URI = "git://git.sv.gnu.org/gpsd.git;protocol=git;branch=master \
 "
 S = "${WORKDIR}/git"
 
-inherit scons update-rc.d python-dir systemd
+inherit scons update-rc.d python-dir
 
 INITSCRIPT_NAME = "gpsd"
 INITSCRIPT_PARAMS = "defaults 35"
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.socket"
+SYSTEMD_OESCONS ??= "false"
 
 export STAGING_INCDIR
 export STAGING_LIBDIR
@@ -41,7 +40,7 @@ EXTRA_OESCONS = " \
   libQgpsmm='false' \
   debug='true' \
   strip='false' \
-  systemd='true' \
+  systemd='${SYSTEMD_OESCONS}' \
 "
 # this cannot be used, because then chrpath is not found and only static lib is built
 # target=${HOST_SYS}
@@ -84,11 +83,6 @@ 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 ${S}/systemd/${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() {
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service
similarity index 100%
rename from meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service
rename to meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service
diff --git a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend
new file mode 100644
index 0000000..9504761
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend
@@ -0,0 +1,18 @@
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://gpsd.service"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${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
+}
diff --git a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bbappend b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bbappend
new file mode 100644
index 0000000..9504761
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bbappend
@@ -0,0 +1,18 @@
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://gpsd.service"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${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
+}
diff --git a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_git.bbappend b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_git.bbappend
new file mode 100644
index 0000000..1026e22
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_git.bbappend
@@ -0,0 +1,14 @@
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.socket"
+SYSTEMD_OESCONS = "true"
+
+do_install_append() {
+    #support for systemd
+    install -d ${D}${systemd_unitdir}/system/
+    install -m 0644 ${S}/systemd/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
+    install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
+}
-- 
1.7.6.5

[meta-oe, V2 32/32] networkmanager: move systemd support to meta-systemd

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../networkmanager/networkmanager_0.9.2.0.bb       |   13 ++++++-------
 .../networkmanager/networkmanager_0.9.2.0.bbappend |   14 ++++++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)
 create 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 221dc2c..e774cb9 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,10 @@ SECTION = "net/misc"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b"
 
-PR = "r6"
+PR = "r7"
 
-DEPENDS = "systemd libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp"
-inherit gnome gettext systemd
+DEPENDS = "libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp"
+inherit gnome gettext
 
 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 \
@@ -19,6 +19,8 @@ SRC_URI[sha256sum] = "a178ed2f0b5a1045ec47b217ea531d0feba9208f6bcfe64b701174a5c1
 
 S = "${WORKDIR}/NetworkManager-${PV}"
 
+SYSTEMD_UNITDIR ??= "no"
+
 EXTRA_OECONF = " \
 		--with-distro=debian \
 		--with-crypto=gnutls \
@@ -26,6 +28,7 @@ EXTRA_OECONF = " \
                 --with-dhclient=${base_sbindir}/dhclient \
                 --with-iptables=${sbindir}/iptables \
                 --with-tests \
+                --with-systemdsystemunitdir=${SYSTEMD_UNITDIR} \
 "
 
 do_configure_prepend() {
@@ -54,9 +57,6 @@ do_install_append () {
 	install -d ${D}/etc/NetworkManager/VPN
 }
 
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE = "NetworkManager.service"
-
 PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests" 
 
 FILES_libnmutil += "${libdir}/libnm-util.so.*"
@@ -70,7 +70,6 @@ FILES_${PN} += " \
 		${datadir}/polkit-1 \
 		${datadir}/dbus-1 \
 		${base_libdir}/udev/* \
-                ${systemd_unitdir}/system/NetworkManager-wait-online.service \
 "
 
 RRECOMMENDS_${PN} += "iptables"
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
new file mode 100644
index 0000000..6ae5d75
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend
@@ -0,0 +1,14 @@
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+DEPENDS += "systemd"
+
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE = "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.7.6.5

Re: [meta-oe, V2 07/32] task-basic: move systemd support to meta systemd

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 13-07-12 10:30, Andreas Müller schreef:
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- 
> meta-oe/recipes-core/tasks/task-basic.bb           |    7 +++---- 
> .../meta-oe/recipes-core/tasks/task-basic.bbappend |    6 ++++++ 2 files
> changed, 9 insertions(+), 4 deletions(-) create mode 100644
> meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend
> 
> diff --git a/meta-oe/recipes-core/tasks/task-basic.bb
> b/meta-oe/recipes-core/tasks/task-basic.bb index d4a0bd9..47b09de 100644 
> --- a/meta-oe/recipes-core/tasks/task-basic.bb +++
> b/meta-oe/recipes-core/tasks/task-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 = "r8" +PR = "r9"
> 
> inherit task
> 
> @@ -21,7 +21,7 @@ MACHINE_EXTRA_RRECOMMENDS ?= "" # Select between
> dropbear and openssh # Set TASK_BASIC_SSHDAEMON = "openssh-sshd
> openssh-sftp openssh-sftp-server" in your DISTRO config to get
> openssh(d) # -TASK_BASIC_SSHDAEMON ?= "dropbear-systemd openssh-sftp
> openssh-sftp-server" +TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp
> openssh-sftp-server"

If I understand this patchset correctly:

* systemd.bbclass automagically adds ${PN}-systemd to RRECOMMENDS_${PN}
* dropbear bbappend moves to meta-systemd
* everything gets a PR bump

So task-basic can safely drop *-systemd.

Is that understanding correct?

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFP/+IqMkyGM64RGpERAqQMAKCEaghQ1/6fTFqACChwIZKJae+slQCfdYHc
4HJHSKjK7VVTabOy2/Pv8OQ=
=qrFN
-----END PGP SIGNATURE-----

Re: [meta-oe, V2 14/32] udisks: move systemd support to meta-systemd

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 13-07-12 10:30, Andreas Müller schreef:
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- 
> meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |   10 +++------- 
> .../udisks/udisks/add-systemd-support.patch        |    0 
> .../recipes-support/udisks/udisks_1.0.4.bbappend   |   13 +++++++++++++

As a more generic remark about udisks and systemd: no need to start this
units on boot, they get automatically started when needed when using a GUI.
I'm not sure there are any non-GUI users of udisks currently, but if there
are, please speak up!

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFP/+KzMkyGM64RGpERAr9BAJ0bJnr9qyDywPIWZSBXdwsSW3SSBQCgkODi
H0mWKy1inlnWr6FlvoDzEOY=
=0AvB
-----END PGP SIGNATURE-----

Re: [meta-oe, V2 07/32] task-basic: move systemd support to meta systemd

[Andreas Müller]

On Fri, Jul 13, 2012 at 10:54 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 13-07-12 10:30, Andreas Müller schreef:
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---
>> meta-oe/recipes-core/tasks/task-basic.bb           |    7 +++----
>> .../meta-oe/recipes-core/tasks/task-basic.bbappend |    6 ++++++ 2 files
>> changed, 9 insertions(+), 4 deletions(-) create mode 100644
>> meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend
>>
>> diff --git a/meta-oe/recipes-core/tasks/task-basic.bb
>> b/meta-oe/recipes-core/tasks/task-basic.bb index d4a0bd9..47b09de 100644
>> --- a/meta-oe/recipes-core/tasks/task-basic.bb +++
>> b/meta-oe/recipes-core/tasks/task-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 = "r8" +PR = "r9"
>>
>> inherit task
>>
>> @@ -21,7 +21,7 @@ MACHINE_EXTRA_RRECOMMENDS ?= "" # Select between
>> dropbear and openssh # Set TASK_BASIC_SSHDAEMON = "openssh-sshd
>> openssh-sftp openssh-sftp-server" in your DISTRO config to get
>> openssh(d) # -TASK_BASIC_SSHDAEMON ?= "dropbear-systemd openssh-sftp
>> openssh-sftp-server" +TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp
>> openssh-sftp-server"
>
> If I understand this patchset correctly:
>
> * systemd.bbclass automagically adds ${PN}-systemd to RRECOMMENDS_${PN}
> * dropbear bbappend moves to meta-systemd
> * everything gets a PR bump
>
> So task-basic can safely drop *-systemd.
>
> Is that understanding correct?
>
> regards,
>
> Koen
Yes

Andreas

Re: [meta-oe, V2 14/32] udisks: move systemd support to meta-systemd

[Andreas Müller]

On Fri, Jul 13, 2012 at 10:56 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 13-07-12 10:30, Andreas Müller schreef:
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---
>> meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |   10 +++-------
>> .../udisks/udisks/add-systemd-support.patch        |    0
>> .../recipes-support/udisks/udisks_1.0.4.bbappend   |   13 +++++++++++++
>
> As a more generic remark about udisks and systemd: no need to start this
> units on boot, they get automatically started when needed when using a GUI.
> I'm not sure there are any non-GUI users of udisks currently, but if there
> are, please speak up!
>
> regards,
>
> Koen
I did the udisks systemd patch long time ago [1]. At that time it
fixed automount problem in xfce dm-less environment. I will test
without starting on boot and let you know.

Andreas

[1] http://cgit.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/udisks?id=dc32361d19b49c9cb2df1d73dc61dfe7255a11b2

Re: [meta-oe, V2 14/32] udisks: move systemd support to meta-systemd

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 13-07-12 11:40, Andreas Müller schreef:
> On Fri, Jul 13, 2012 at 10:56 AM, Koen Kooi <koen@dominion.thruhere.net>
> wrote:
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>> 
>> Op 13-07-12 10:30, Andreas Müller schreef:
>>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- 
>>> meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |   10 +++------- 
>>> .../udisks/udisks/add-systemd-support.patch        |    0 
>>> .../recipes-support/udisks/udisks_1.0.4.bbappend   |   13
>>> +++++++++++++
>> 
>> As a more generic remark about udisks and systemd: no need to start
>> this units on boot, they get automatically started when needed when
>> using a GUI. I'm not sure there are any non-GUI users of udisks
>> currently, but if there are, please speak up!
>> 
>> regards,
>> 
>> Koen
> I did the udisks systemd patch long time ago [1]. At that time it fixed
> automount problem in xfce dm-less environment. I will test without
> starting on boot and let you know.

To be clear: that change isn't needed for this patchset to go in :)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFP//96MkyGM64RGpERAvM6AJ41XGUAU2NKxCqhYlv3GrTP/x/z3ACfTIr+
DXsxPGVTFlP/1qV+RcfO5RY=
=+wno
-----END PGP SIGNATURE-----

Re: [meta-oe,V2 00/32] transit to meta-systemd

[Martin Jansa]

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

On Fri, Jul 13, 2012 at 10:30:08AM +0200, Andreas Müller wrote:
> v1->v2:
> * rebase to latest head
> * 4 meta-oe/layer.conf: systemd-serialgetty moved to meta-systemd
> * 5 append systemd package to RRECOMMENDS
> * remove warning in case systemd-stuff is packed in ${PN}
> * 7+8 make tasks usable without meta-systemd
> * xserver-nodm-init: include Martin's patch [1]
> * use FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" for multiple bbappends

I haven't tested this V2, because I was away on holidays, but from my
tests with V1 I would say:

Acked-by: Martin Jansa <Martin.Jansa@gmail.com>

and then we can resolve possible minor issues :).

Cheers,

> 
> The series can be pulled from [2] branch systemd
> 
> [1] http://patches.openembedded.org/patch/30383/
> [2] git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded-systemd.git
> 
> Andreas Müller (32):
>   systemd.bbclass: move to meta-systemd
>   move systemd recipes to meta-systemd
>   layer.conf/README: search directory structure for bbappends changed
>   meta-oe/layer.conf: systemd-serialgetty moved to meta-systemd
>   systemd.bbclass: add *-systemd packages to RRECOMMENDS
>   systemd.bbclass: do not warn for systemd files are in ${PN}
>   task-basic: move systemd support to meta systemd
>   task-x11: in case meta-systemd is part of BBLAYERS,
>     xserver-nodm-init-systemd is recommended automatically
>   polkit: meta-systemd rework
>   gdm: move systemd support to meta-systemd
>   busybox: move systemd support to meta-systemd
>   ntp: move systemd support to meta-systemd
>   syslog-ng: move systemd support to meta-systemd
>   udisks: move systemd support to meta-systemd
>   lighttpd: move systemd support to meta-systemd
>   cronie: move systemd support to meta-systemd
>   elsa: move systemd support to meta-systemd
>   net-snmp: move systemd support to meta-systemd
>   atftp: move systemd support to meta-systemd
>   dhcp: move systemd support to meta-systemd
>   connman: move systemd support to meta-systemd
>   gateone: move systemd support to meta-systemd
>   cherokee: move systemd support to meta-systemd
>   openssh: move systemd support to meta-systemd
>   cloud9: move systemd support to meta-systemd
>   xinput-calibrator: : move systemd support to meta-systemd
>   xserver-nodm-init: move systemd support to meta-systemd
>   dropbear: move systemd support to meta-systemd
>   keymaps: move systemd support to meta-systemd
>   rsyslog: move systemd support to meta-systemd
>   gpsd: move systemd support to meta-systemd
>   networkmanager: move systemd support to meta-systemd
> 
>  meta-efl/recipes-efl/efl/elsa_svn.bb               |    9 +----
>  meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb         |    8 +---
>  meta-oe/conf/layer.conf                            |    1 -
>  .../cherokee/cherokee_1.2.98.bb                    |   10 ++----
>  .../recipes-connectivity/gateone/gateone_git.bb    |    9 +----
>  .../networkmanager/networkmanager_0.9.2.0.bb       |   13 +++----
>  .../recipes-core/busybox/busybox_1.19.4.bbappend   |   20 +----------
>  meta-oe/recipes-core/tasks/task-basic.bb           |    7 ++--
>  meta-oe/recipes-core/tasks/task-x11_1.0.bb         |    6 ++--
>  meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb      |    9 +----
>  meta-oe/recipes-extended/atftp/atftp_0.7.bb        |   10 ++----
>  .../recipes-extended/net-snmp/net-snmp_5.7.1.bb    |   17 +--------
>  .../recipes-extended/polkit/polkit_0.104.bbappend  |    4 +-
>  meta-oe/recipes-extended/rsyslog/rsyslog.inc       |   10 +++---
>  .../xinput-calibrator/xinput-calibrator_0.7.5.bb   |    8 +---
>  .../xserver-nodm-init/xserver-nodm-init_2.0.bb     |   16 +--------
>  meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb        |   15 ++------
>  meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb        |   15 ++------
>  meta-oe/recipes-navigation/gpsd/gpsd_git.bb        |   14 ++------
>  meta-oe/recipes-support/ntp/ntp_4.2.6p3.bb         |   18 +---------
>  meta-oe/recipes-support/syslog-ng/syslog-ng.inc    |    9 +----
>  meta-oe/recipes-support/udisks/udisks_1.0.4.bb     |   10 ++----
>  meta-systemd/README                                |    5 +++
>  {meta-oe => meta-systemd}/classes/systemd.bbclass  |   35 +++++++++++++------
>  meta-systemd/conf/layer.conf                       |    2 +-
>  .../recipes-efl/efl/elsa/xserver-nodm.service      |    0
>  .../meta-efl/recipes-efl/efl/elsa_svn.bbappend     |   13 +++++++
>  .../meta-gnome}/recipes-gnome/gdm/gdm/gdm.service  |    0
>  .../recipes-gnome/gdm/gdm_2.32.2.bbappend          |   13 +++++++
>  .../recipes-bsp/keymaps/keymaps/keymaps.service    |    0
>  .../recipes-bsp/keymaps/keymaps_1.0.bbappend       |    2 +-
>  .../cherokee/cherokee/cherokee.service             |    0
>  .../cherokee/cherokee_1.2.98.bbappend              |   10 ++++++
>  .../connman/connman_1.0.bbappend                   |    2 +
>  .../recipes-connectivity/dhcp/dhcp}/dhcpd.service  |    0
>  .../dhcp/dhcp}/dhcrelay.service                    |    0
>  .../dhcp/dhcp_4.2.3-P2.bbappend                    |    4 +-
>  .../gateone/gateone/gateone.service                |    0
>  .../gateone/gateone_git.bbappend                   |   11 ++++++
>  .../networkmanager/networkmanager_0.9.2.0.bbappend |   14 ++++++++
>  .../openssh/openssh/sshd.socket                    |    0
>  .../openssh/openssh/sshd@.service                  |    0
>  .../openssh/openssh/sshdgenkeys.service            |    0
>  .../openssh/openssh_6.0p1.bbappend                 |    2 +-
>  .../busybox/busybox/busybox-klogd.service.in       |    0
>  .../busybox/busybox/busybox-syslog.service.in      |    0
>  .../recipes-core/busybox/busybox_1.19.4.bbappend   |   23 +++++++++++++
>  .../recipes-core/dropbear/dropbear/dropbear.socket |    0
>  .../dropbear/dropbear/dropbear@.service            |    0
>  .../dropbear/dropbear/dropbearkey.service          |    0
>  .../dropbear/dropbear_2012.55.bbappend             |    4 +-
>  .../meta-oe/recipes-core/tasks/task-basic.bbappend |    6 +++
>  .../recipes-devtools/cloud9/cloud9/cloud9.service  |    0
>  .../recipes-devtools/cloud9/cloud9_0.6.bbappend    |   13 +++++++
>  .../recipes-extended/atftp/atftp}/atftpd.service   |    0
>  .../recipes-extended/atftp/atftp_0.7.bbappend      |   10 ++++++
>  .../recipes-extended/cronie/cronie/crond.service   |    0
>  .../recipes-extended/cronie/cronie_1.4.8.bbappend  |    4 +-
>  .../lighttpd/lighttpd/lighttpd.service             |    0
>  .../lighttpd/lighttpd_1.4.31.bbappend              |    4 +-
>  .../net-snmp/net-snmp}/snmpd.service               |    0
>  .../net-snmp/net-snmp}/snmptrapd.service           |    0
>  .../net-snmp/net-snmp}/systemd-support.patch       |    0
>  .../net-snmp/net-snmp_5.7.1.bbappend               |   19 +++++++++++
>  .../recipes-extended/polkit/polkit_0.104.bbappend  |    3 ++
>  .../rsyslog/rsyslog_5.8.0.bbappend                 |   10 ++++++
>  .../xinput-calibrator/xinput-calibrator.service    |    0
>  .../xinput-calibrator_0.7.5.bbappend               |   10 ++++++
>  .../xserver-nodm-init}/xserver-nodm.conf           |    0
>  .../xserver-nodm-init}/xserver-nodm.service        |    0
>  .../xserver-nodm-init_2.0.bbappend                 |   21 ++++++++++++
>  .../recipes-navigation/gpsd/gpsd/gpsd.service      |    0
>  .../recipes-navigation/gpsd/gpsd_3.4.bbappend      |   18 ++++++++++
>  .../recipes-navigation/gpsd/gpsd_3.5.bbappend      |   18 ++++++++++
>  .../recipes-navigation/gpsd/gpsd_git.bbappend      |   14 ++++++++
>  .../meta-oe/recipes-support/ntp/ntp}/ntpd.service  |    0
>  .../recipes-support/ntp/ntp}/ntpdate.service       |    0
>  .../recipes-support/ntp/ntp_4.2.6p3.bbappend       |   20 +++++++++++
>  .../syslog-ng/syslog-ng_3.2.5.bbappend             |   11 ++++++
>  .../udisks/udisks/add-systemd-support.patch        |    0
>  .../recipes-support/udisks/udisks_1.0.4.bbappend   |   13 +++++++
>  .../recipes-core/systemd/systemd-compat-units.bb   |    0
>  .../systemd/systemd-compat-units/machineid.service |    0
>  .../systemd-compat-units/run-postinsts.service     |    0
>  .../systemd/systemd-machine-units_1.0.bb           |    0
>  .../recipes-core/systemd/systemd-serialgetty.bb    |    0
>  .../systemd/systemd-serialgetty/LICENSE            |    0
>  .../systemd-serialgetty/serial-getty@.service      |    0
>  .../recipes-core/systemd/systemd-speed-hacks.bb    |    0
>  .../systemd/systemd-systemctl-native.bb            |    0
>  .../systemd/systemd-systemctl-native/systemctl     |    0
>  .../systemd/systemd/format-replace-m-uclibc.patch  |    0
>  .../systemd/systemd/paper-over-mkostemp.patch      |    0
>  .../recipes-core/systemd/systemd_git.bb            |    0
>  94 files changed, 369 insertions(+), 203 deletions(-)
>  rename {meta-oe => meta-systemd}/classes/systemd.bbclass (85%)
>  rename {meta-efl => meta-systemd/meta-efl}/recipes-efl/efl/elsa/xserver-nodm.service (100%)
>  create mode 100644 meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend
>  rename {meta-gnome => meta-systemd/meta-gnome}/recipes-gnome/gdm/gdm/gdm.service (100%)
>  create mode 100644 meta-systemd/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bbappend
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-bsp/keymaps/keymaps/keymaps.service (100%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-bsp/keymaps/keymaps_1.0.bbappend (85%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/cherokee/cherokee/cherokee.service (100%)
>  create mode 100644 meta-systemd/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/connman/connman_1.0.bbappend (84%)
>  rename {meta-oe/recipes-connectivity/dhcp/files => meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp}/dhcpd.service (100%)
>  rename {meta-oe/recipes-connectivity/dhcp/files => meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp}/dhcrelay.service (100%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend (79%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/gateone/gateone/gateone.service (100%)
>  create mode 100644 meta-systemd/meta-oe/recipes-connectivity/gateone/gateone_git.bbappend
>  create mode 100644 meta-systemd/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bbappend
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/openssh/openssh/sshd.socket (100%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/openssh/openssh/sshd@.service (100%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/openssh/openssh/sshdgenkeys.service (100%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/openssh/openssh_6.0p1.bbappend (88%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-core/busybox/busybox/busybox-klogd.service.in (100%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-core/busybox/busybox/busybox-syslog.service.in (100%)
>  create mode 100644 meta-systemd/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-core/dropbear/dropbear/dropbear.socket (100%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-core/dropbear/dropbear/dropbear@.service (100%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-core/dropbear/dropbear/dropbearkey.service (100%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-core/dropbear/dropbear_2012.55.bbappend (81%)
>  create mode 100644 meta-systemd/meta-oe/recipes-core/tasks/task-basic.bbappend
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-devtools/cloud9/cloud9/cloud9.service (100%)
>  create mode 100644 meta-systemd/meta-oe/recipes-devtools/cloud9/cloud9_0.6.bbappend
>  rename {meta-oe/recipes-extended/atftp/files => meta-systemd/meta-oe/recipes-extended/atftp/atftp}/atftpd.service (100%)
>  create mode 100644 meta-systemd/meta-oe/recipes-extended/atftp/atftp_0.7.bbappend
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-extended/cronie/cronie/crond.service (100%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-extended/cronie/cronie_1.4.8.bbappend (69%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-extended/lighttpd/lighttpd/lighttpd.service (100%)
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend (62%)
>  rename {meta-oe/recipes-extended/net-snmp/files => meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp}/snmpd.service (100%)
>  rename {meta-oe/recipes-extended/net-snmp/files => meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp}/snmptrapd.service (100%)
>  rename {meta-oe/recipes-extended/net-snmp/files => meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp}/systemd-support.patch (100%)
>  create mode 100644 meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend
>  create mode 100644 meta-systemd/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
>  create mode 100644 meta-systemd/meta-oe/recipes-extended/rsyslog/rsyslog_5.8.0.bbappend
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service (100%)
>  create mode 100644 meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bbappend
>  rename {meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0 => meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init}/xserver-nodm.conf (100%)
>  rename {meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0 => meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init}/xserver-nodm.service (100%)
>  create mode 100644 meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-navigation/gpsd/gpsd/gpsd.service (100%)
>  create mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend
>  create mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bbappend
>  create mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_git.bbappend
>  rename {meta-oe/recipes-support/ntp/files => meta-systemd/meta-oe/recipes-support/ntp/ntp}/ntpd.service (100%)
>  rename {meta-oe/recipes-support/ntp/files => meta-systemd/meta-oe/recipes-support/ntp/ntp}/ntpdate.service (100%)
>  create mode 100644 meta-systemd/meta-oe/recipes-support/ntp/ntp_4.2.6p3.bbappend
>  create mode 100644 meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend
>  rename {meta-oe => meta-systemd/meta-oe}/recipes-support/udisks/udisks/add-systemd-support.patch (100%)
>  create mode 100644 meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend
>  rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-compat-units.bb (100%)
>  rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-compat-units/machineid.service (100%)
>  rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-compat-units/run-postinsts.service (100%)
>  rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-machine-units_1.0.bb (100%)
>  rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-serialgetty.bb (100%)
>  rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-serialgetty/LICENSE (100%)
>  rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-serialgetty/serial-getty@.service (100%)
>  rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-speed-hacks.bb (100%)
>  rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-systemctl-native.bb (100%)
>  rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd-systemctl-native/systemctl (100%)
>  rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd/format-replace-m-uclibc.patch (100%)
>  rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd/paper-over-mkostemp.patch (100%)
>  rename {meta-oe => meta-systemd}/recipes-core/systemd/systemd_git.bb (100%)
> 
> -- 
> 1.7.6.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

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

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

Re: [meta-oe,V2 00/32] transit to meta-systemd

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 16-07-12 09:21, Martin Jansa schreef:
> On Fri, Jul 13, 2012 at 10:30:08AM +0200, Andreas Müller wrote:
>> v1->v2: * rebase to latest head * 4 meta-oe/layer.conf:
>> systemd-serialgetty moved to meta-systemd * 5 append systemd package to
>> RRECOMMENDS * remove warning in case systemd-stuff is packed in ${PN} *
>> 7+8 make tasks usable without meta-systemd * xserver-nodm-init: include
>> Martin's patch [1] * use FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>> for multiple bbappends
> 
> I haven't tested this V2, because I was away on holidays, but from my 
> tests with V1 I would say:
> 
> Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> 
> and then we can resolve possible minor issues :).

Pushed
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQA9npMkyGM64RGpERAtqTAJ9412kJIdC9EG08zoayP9JfjcpubgCgoZTJ
qH7+dTWAs55otaFpMcBNNsM=
=HYhp
-----END PGP SIGNATURE-----