diff options
Diffstat (limited to 'meta-systemd')
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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | PRINC := "${@int(PRINC) + 7}" | ||
3 | 2 | ||
4 | SRC_URI += " file://keymaps.service" | 3 | SRC_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 @@ | |||
1 | PRINC := "${@int(PRINC) + 2}" | ||
2 | |||
3 | inherit systemd | 1 | inherit systemd |
4 | 2 | ||
5 | RPROVIDES_${PN} += "${PN}-systemd" | 3 | RPROVIDES_${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 @@ | |||
1 | PRINC := "${@int(PRINC) + 2}" | ||
2 | |||
3 | inherit systemd | 1 | inherit systemd |
4 | 2 | ||
5 | EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/" | 3 | EXTRA_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 | ||
4 | inherit systemd | 4 | inherit systemd |
5 | 5 | ||
6 | PRINC := "${@int(PRINC) + 3}" | ||
7 | |||
8 | SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client" | 6 | SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client" |
9 | SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" | 7 | SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" |
10 | SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" | 8 | SYSTEMD_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 @@ | |||
1 | FILESEXTRAPATHS := "${THISDIR}/${PN}" | 1 | FILESEXTRAPATHS := "${THISDIR}/${PN}" |
2 | 2 | ||
3 | PRINC := "${@int(PRINC) + 2}" | ||
4 | |||
5 | inherit systemd | 3 | inherit systemd |
6 | 4 | ||
7 | RPROVIDES_${PN} += "${PN}-systemd" | 5 | RPROVIDES_${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 @@ | |||
1 | PRINC := "${@int(PRINC) + 2}" | ||
2 | |||
3 | # Register with logind to make screen/tmux/etc work | 1 | # Register with logind to make screen/tmux/etc work |
4 | do_install_append() { | 2 | do_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 | ||
6 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 6 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
7 | 7 | ||
8 | PR = "r1" | 8 | PR = "r18" |
9 | 9 | ||
10 | inherit systemd | 10 | inherit systemd |
11 | SYSTEMD_SERVICE_${PN} = "" | 11 | SYSTEMD_SERVICE_${PN} = "" |