summaryrefslogtreecommitdiffstats
path: root/meta-systemd
diff options
context:
space:
mode:
Diffstat (limited to 'meta-systemd')
-rw-r--r--meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend1
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend2
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend2
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend2
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend2
-rw-r--r--meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend2
-rw-r--r--meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb2
7 files changed, 1 insertions, 12 deletions
diff --git a/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend b/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend
index 36b83e05e..bc40c6022 100644
--- a/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend
+++ b/meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend
@@ -1,5 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2PRINC := "${@int(PRINC) + 7}"
3 2
4SRC_URI += " file://keymaps.service" 3SRC_URI += " file://keymaps.service"
5 4
diff --git a/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend b/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend
index d3f4775b7..5b6e559cc 100644
--- a/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/avahi/avahi_0.6.31.bbappend
@@ -1,5 +1,3 @@
1PRINC := "${@int(PRINC) + 2}"
2
3inherit systemd 1inherit systemd
4 2
5RPROVIDES_${PN} += "${PN}-systemd" 3RPROVIDES_${PN} += "${PN}-systemd"
diff --git a/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend b/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend
index 495fffad2..da01b0583 100644
--- a/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/bluez/bluez4_4.101.bbappend
@@ -1,5 +1,3 @@
1PRINC := "${@int(PRINC) + 2}"
2
3inherit systemd 1inherit systemd
4 2
5EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/" 3EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/"
diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend
index e9e09d34d..1dd6d58eb 100644
--- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend
@@ -3,8 +3,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3 3
4inherit systemd 4inherit systemd
5 5
6PRINC := "${@int(PRINC) + 3}"
7
8SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client" 6SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client"
9SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" 7SYSTEMD_SERVICE_dhcp-server = "dhcpd.service"
10SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" 8SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service"
diff --git a/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend b/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend
index 5efba3ed9..765f4b328 100644
--- a/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend
@@ -1,7 +1,5 @@
1FILESEXTRAPATHS := "${THISDIR}/${PN}" 1FILESEXTRAPATHS := "${THISDIR}/${PN}"
2 2
3PRINC := "${@int(PRINC) + 2}"
4
5inherit systemd 3inherit systemd
6 4
7RPROVIDES_${PN} += "${PN}-systemd" 5RPROVIDES_${PN} += "${PN}-systemd"
diff --git a/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend b/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend
index 5b9181bd6..db5508209 100644
--- a/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend
+++ b/meta-systemd/oe-core/recipes-extended/pam/libpam_1.1.6.bbappend
@@ -1,5 +1,3 @@
1PRINC := "${@int(PRINC) + 2}"
2
3# Register with logind to make screen/tmux/etc work 1# Register with logind to make screen/tmux/etc work
4do_install_append() { 2do_install_append() {
5 echo "session required pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session 3 echo "session required pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session
diff --git a/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb b/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb
index 73f4e6e29..6a66ac214 100644
--- a/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb
+++ b/meta-systemd/recipes-core/systemd/systemd-machine-units_1.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
5 5
6PACKAGE_ARCH = "${MACHINE_ARCH}" 6PACKAGE_ARCH = "${MACHINE_ARCH}"
7 7
8PR = "r1" 8PR = "r18"
9 9
10inherit systemd 10inherit systemd
11SYSTEMD_SERVICE_${PN} = "" 11SYSTEMD_SERVICE_${PN} = ""