summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2021-08-26 09:42:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-07 20:54:11 (GMT)
commitabeb2e95c6e5b286283dfe7198d5a222f7139458 (patch)
tree1a1f5526ee2b663abf27252c02bb33573f6205dc
parent3a702623573a973ff9b4d3d5f934ef55497de167 (diff)
downloadpoky-abeb2e95c6e5b286283dfe7198d5a222f7139458.tar.gz
systemd: '${systemd_unitdir}/system' => '${systemd_system_unitdir}'
Repo-wide replacement to use newer variable to represent systemd system unitdir directory. (From OE-Core rev: 5ace3ada5c54500c71becc8e0c6eddeb8bc053e3) Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/rootfs-postcommands.bbclass4
-rw-r--r--meta/lib/oe/rootfs.py2
-rw-r--r--meta/recipes-bsp/acpid/acpid.inc6
-rw-r--r--meta/recipes-bsp/apmd/apmd_3.2.2-15.bb6
-rw-r--r--meta/recipes-connectivity/avahi/avahi_0.8.bb2
-rw-r--r--meta/recipes-connectivity/bind/bind_9.16.20.bb6
-rw-r--r--meta/recipes-connectivity/connman/connman.inc6
-rw-r--r--meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb4
-rw-r--r--meta/recipes-connectivity/neard/neard_0.16.bb2
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb18
-rw-r--r--meta/recipes-connectivity/ofono/ofono_1.32.bb2
-rw-r--r--meta/recipes-connectivity/openssh/openssh_8.7p1.bb12
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.9.bb8
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb4
-rw-r--r--meta/recipes-core/busybox/busybox.inc14
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc10
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc6
-rw-r--r--meta/recipes-core/psplash/psplash_git.bb6
-rw-r--r--meta/recipes-core/systemd/systemd-compat-units.bb2
-rw-r--r--meta/recipes-core/systemd/systemd-conf_1.0.bb6
-rw-r--r--meta/recipes-core/systemd/systemd-serialgetty.bb18
-rw-r--r--meta/recipes-core/systemd/systemd_249.3.bb76
-rw-r--r--meta/recipes-core/volatile-binds/volatile-binds.bb6
-rw-r--r--meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb2
-rw-r--r--meta/recipes-devtools/distcc/distcc_3.4.bb6
-rw-r--r--meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb6
-rw-r--r--meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb2
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent_git.bb6
-rw-r--r--meta/recipes-extended/at/at_3.2.2.bb6
-rw-r--r--meta/recipes-extended/cronie/cronie_1.5.7.bb6
-rw-r--r--meta/recipes-extended/iputils/iputils_20210722.bb4
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb6
-rw-r--r--meta/recipes-extended/man-db/man-db_2.9.4.bb2
-rw-r--r--meta/recipes-extended/mdadm/mdadm_4.1.bb2
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb2
-rw-r--r--meta/recipes-extended/sysstat/sysstat.inc6
-rw-r--r--meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb6
-rw-r--r--meta/recipes-graphics/wayland/weston-init.bb2
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb6
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb6
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb4
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb2
-rw-r--r--meta/recipes-support/consolekit/consolekit_0.4.6.bb2
43 files changed, 155 insertions, 155 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index c5746eb..7fe9e3d 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -218,8 +218,8 @@ postinst_enable_logging () {
218# Modify systemd default target 218# Modify systemd default target
219# 219#
220set_systemd_default_target () { 220set_systemd_default_target () {
221 if [ -d ${IMAGE_ROOTFS}${sysconfdir}/systemd/system -a -e ${IMAGE_ROOTFS}${systemd_unitdir}/system/${SYSTEMD_DEFAULT_TARGET} ]; then 221 if [ -d ${IMAGE_ROOTFS}${sysconfdir}/systemd/system -a -e ${IMAGE_ROOTFS}${systemd_system_unitdir}/${SYSTEMD_DEFAULT_TARGET} ]; then
222 ln -sf ${systemd_unitdir}/system/${SYSTEMD_DEFAULT_TARGET} ${IMAGE_ROOTFS}${sysconfdir}/systemd/system/default.target 222 ln -sf ${systemd_system_unitdir}/${SYSTEMD_DEFAULT_TARGET} ${IMAGE_ROOTFS}${sysconfdir}/systemd/system/default.target
223 fi 223 fi
224} 224}
225 225
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 4ea5adb..b0dd625 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -253,7 +253,7 @@ class Rootfs(object, metaclass=ABCMeta):
253 # Remove the run-postinsts package if no delayed postinsts are found 253 # Remove the run-postinsts package if no delayed postinsts are found
254 delayed_postinsts = self._get_delayed_postinsts() 254 delayed_postinsts = self._get_delayed_postinsts()
255 if delayed_postinsts is None: 255 if delayed_postinsts is None:
256 if os.path.exists(self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/init.d/run-postinsts")) or os.path.exists(self.d.expand("${IMAGE_ROOTFS}${systemd_unitdir}/system/run-postinsts.service")): 256 if os.path.exists(self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/init.d/run-postinsts")) or os.path.exists(self.d.expand("${IMAGE_ROOTFS}${systemd_system_unitdir}/run-postinsts.service")):
257 self.pm.remove(["run-postinsts"]) 257 self.pm.remove(["run-postinsts"])
258 258
259 image_rorfs = bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", 259 image_rorfs = bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs",
diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc
index f48e519..d39828e 100644
--- a/meta/recipes-bsp/acpid/acpid.inc
+++ b/meta/recipes-bsp/acpid/acpid.inc
@@ -32,7 +32,7 @@ do_install:append () {
32 install -d ${D}${sysconfdir}/acpi 32 install -d ${D}${sysconfdir}/acpi
33 install -d ${D}${sysconfdir}/acpi/events 33 install -d ${D}${sysconfdir}/acpi/events
34 34
35 install -d ${D}${systemd_unitdir}/system 35 install -d ${D}${systemd_system_unitdir}
36 install -m 0644 ${WORKDIR}/acpid.service ${D}${systemd_unitdir}/system 36 install -m 0644 ${WORKDIR}/acpid.service ${D}${systemd_system_unitdir}
37 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/acpid.service 37 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/acpid.service
38} 38}
diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
index 5368abf..da17e5a 100644
--- a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
+++ b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
@@ -73,10 +73,10 @@ do_install() {
73 sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/apmd 73 sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/apmd
74 chmod 755 ${D}${sysconfdir}/init.d/apmd 74 chmod 755 ${D}${sysconfdir}/init.d/apmd
75 75
76 install -d ${D}${systemd_unitdir}/system 76 install -d ${D}${systemd_system_unitdir}
77 install -m 0644 ${WORKDIR}/apmd.service ${D}${systemd_unitdir}/system/ 77 install -m 0644 ${WORKDIR}/apmd.service ${D}${systemd_system_unitdir}/
78 sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ 78 sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
79 -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apmd.service 79 -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/apmd.service
80} 80}
81 81
82PACKAGES =+ "libapm apm" 82PACKAGES =+ "libapm apm"
diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb
index 934044d..cd0489e 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
@@ -67,7 +67,7 @@ EXTRA_OECONF = "--with-avahi-priv-access-group=adm \
67 67
68# The distro choice determines what init scripts are installed 68# The distro choice determines what init scripts are installed
69EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}" 69EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
70EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}" 70EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_system_unitdir}/','--without-systemdsystemunitdir',d)}"
71 71
72do_configure:prepend() { 72do_configure:prepend() {
73 # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes 73 # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes
diff --git a/meta/recipes-connectivity/bind/bind_9.16.20.bb b/meta/recipes-connectivity/bind/bind_9.16.20.bb
index f7d0416..ddf323f 100644
--- a/meta/recipes-connectivity/bind/bind_9.16.20.bb
+++ b/meta/recipes-connectivity/bind/bind_9.16.20.bb
@@ -77,11 +77,11 @@ do_install:append() {
77 # Install systemd related files 77 # Install systemd related files
78 install -d ${D}${sbindir} 78 install -d ${D}${sbindir}
79 install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir} 79 install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir}
80 install -d ${D}${systemd_unitdir}/system 80 install -d ${D}${systemd_system_unitdir}
81 install -m 0644 ${WORKDIR}/named.service ${D}${systemd_unitdir}/system 81 install -m 0644 ${WORKDIR}/named.service ${D}${systemd_system_unitdir}
82 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ 82 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
83 -e 's,@SBINDIR@,${sbindir},g' \ 83 -e 's,@SBINDIR@,${sbindir},g' \
84 ${D}${systemd_unitdir}/system/named.service 84 ${D}${systemd_system_unitdir}/named.service
85 85
86 install -d ${D}${sysconfdir}/default 86 install -d ${D}${sysconfdir}/default
87 install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default 87 install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 856bb9e..342a512 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -36,7 +36,7 @@ PACKAGECONFIG ??= "wispr iptables client\
36# local.conf or distro config 36# local.conf or distro config
37# PACKAGECONFIG:append:pn-connman = " openvpn vpnc l2tp pptp" 37# PACKAGECONFIG:append:pn-connman = " openvpn vpnc l2tp pptp"
38 38
39PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/ --with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' --with-tmpfilesdir=''" 39PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_system_unitdir}/ --with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' --with-tmpfilesdir=''"
40PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant" 40PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant"
41PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5, bluez5" 41PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5, bluez5"
42PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono" 42PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono"
@@ -173,13 +173,13 @@ VPN technogies are implemented using plug-ins."
173FILES:${PN}-vpn += "${sbindir}/connman-vpnd \ 173FILES:${PN}-vpn += "${sbindir}/connman-vpnd \
174 ${sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf \ 174 ${sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf \
175 ${datadir}/dbus-1/system-services/net.connman.vpn.service \ 175 ${datadir}/dbus-1/system-services/net.connman.vpn.service \
176 ${systemd_unitdir}/system/connman-vpn.service" 176 ${systemd_system_unitdir}/connman-vpn.service"
177 177
178SUMMARY:${PN}-wait-online = "A program that will return once ConnMan has connected to a network" 178SUMMARY:${PN}-wait-online = "A program that will return once ConnMan has connected to a network"
179DESCRIPTION:${PN}-wait-online = "A service that can be enabled so that \ 179DESCRIPTION:${PN}-wait-online = "A service that can be enabled so that \
180the system waits until a network connection is established." 180the system waits until a network connection is established."
181FILES:${PN}-wait-online += "${sbindir}/connmand-wait-online \ 181FILES:${PN}-wait-online += "${sbindir}/connmand-wait-online \
182 ${systemd_unitdir}/system/connman-wait-online.service" 182 ${systemd_system_unitdir}/connman-wait-online.service"
183 183
184SUMMARY:${PN}-plugin-vpn-openvpn = "An OpenVPN plugin for ConnMan VPN" 184SUMMARY:${PN}-plugin-vpn-openvpn = "An OpenVPN plugin for ConnMan VPN"
185DESCRIPTION:${PN}-plugin-vpn-openvpn = "The ConnMan OpenVPN plugin uses openvpn client \ 185DESCRIPTION:${PN}-plugin-vpn-openvpn = "The ConnMan OpenVPN plugin uses openvpn client \
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb
index 4e9a367..dbad8c8 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb
@@ -48,8 +48,8 @@ USERADD_PARAM:${PN} = "--system -d ${localstatedir}/lib/${BPN} -M -s /bin/false
48 48
49do_install:append () { 49do_install:append () {
50 # install systemd unit files 50 # install systemd unit files
51 install -d ${D}${systemd_unitdir}/system 51 install -d ${D}${systemd_system_unitdir}
52 install -m 0644 ${WORKDIR}/dhcpcd*.service ${D}${systemd_unitdir}/system 52 install -m 0644 ${WORKDIR}/dhcpcd*.service ${D}${systemd_system_unitdir}
53 53
54 chmod 700 ${D}${localstatedir}/lib/${BPN} 54 chmod 700 ${D}${localstatedir}/lib/${BPN}
55 chown dhcpcd:dhcpcd ${D}${localstatedir}/lib/${BPN} 55 chown dhcpcd:dhcpcd ${D}${localstatedir}/lib/${BPN}
diff --git a/meta/recipes-connectivity/neard/neard_0.16.bb b/meta/recipes-connectivity/neard/neard_0.16.bb
index d55cf6a..b6cc1d6 100644
--- a/meta/recipes-connectivity/neard/neard_0.16.bb
+++ b/meta/recipes-connectivity/neard/neard_0.16.bb
@@ -22,7 +22,7 @@ inherit autotools pkgconfig systemd update-rc.d
22 22
23PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 23PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
24 24
25PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd" 25PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd"
26 26
27EXTRA_OECONF += "--enable-tools" 27EXTRA_OECONF += "--enable-tools"
28 28
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb
index a655de2..459f68f 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb
@@ -85,7 +85,7 @@ FILES:${PN}-client = "${sbindir}/*statd \
85 ${sysconfdir}/nfs-utils.conf \ 85 ${sysconfdir}/nfs-utils.conf \
86 ${sysconfdir}/nfsmount.conf \ 86 ${sysconfdir}/nfsmount.conf \
87 ${sysconfdir}/init.d/nfscommon \ 87 ${sysconfdir}/init.d/nfscommon \
88 ${systemd_unitdir}/system/nfs-statd.service" 88 ${systemd_system_unitdir}/nfs-statd.service"
89RDEPENDS:${PN}-client = "${PN}-mount rpcbind" 89RDEPENDS:${PN}-client = "${PN}-mount rpcbind"
90 90
91FILES:${PN}-mount = "${base_sbindir}/*mount.nfs*" 91FILES:${PN}-mount = "${base_sbindir}/*mount.nfs*"
@@ -119,18 +119,18 @@ do_install:append () {
119 install -m 0755 ${WORKDIR}/nfs-utils.conf ${D}${sysconfdir} 119 install -m 0755 ${WORKDIR}/nfs-utils.conf ${D}${sysconfdir}
120 install -m 0755 ${S}/utils/mount/nfsmount.conf ${D}${sysconfdir} 120 install -m 0755 ${S}/utils/mount/nfsmount.conf ${D}${sysconfdir}
121 121
122 install -d ${D}${systemd_unitdir}/system 122 install -d ${D}${systemd_system_unitdir}
123 install -m 0644 ${WORKDIR}/nfs-server.service ${D}${systemd_unitdir}/system/ 123 install -m 0644 ${WORKDIR}/nfs-server.service ${D}${systemd_system_unitdir}/
124 install -m 0644 ${WORKDIR}/nfs-mountd.service ${D}${systemd_unitdir}/system/ 124 install -m 0644 ${WORKDIR}/nfs-mountd.service ${D}${systemd_system_unitdir}/
125 install -m 0644 ${WORKDIR}/nfs-statd.service ${D}${systemd_unitdir}/system/ 125 install -m 0644 ${WORKDIR}/nfs-statd.service ${D}${systemd_system_unitdir}/
126 sed -i -e 's,@SBINDIR@,${sbindir},g' \ 126 sed -i -e 's,@SBINDIR@,${sbindir},g' \
127 -e 's,@SYSCONFDIR@,${sysconfdir},g' \ 127 -e 's,@SYSCONFDIR@,${sysconfdir},g' \
128 -e 's,@HIGH_RLIMIT_NOFILE@,${HIGH_RLIMIT_NOFILE},g' \ 128 -e 's,@HIGH_RLIMIT_NOFILE@,${HIGH_RLIMIT_NOFILE},g' \
129 ${D}${systemd_unitdir}/system/*.service 129 ${D}${systemd_system_unitdir}/*.service
130 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 130 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
131 install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/ 131 install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/
132 install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/ 132 install -d ${D}${systemd_system_unitdir}/sysinit.target.wants/
133 ln -sf ../proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount 133 ln -sf ../proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/sysinit.target.wants/proc-fs-nfsd.mount
134 fi 134 fi
135 135
136 # kernel code as of 3.8 hard-codes this path as a default 136 # kernel code as of 3.8 hard-codes this path as a default
diff --git a/meta/recipes-connectivity/ofono/ofono_1.32.bb b/meta/recipes-connectivity/ofono/ofono_1.32.bb
index c3db52d..61424c7 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.32.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.32.bb
@@ -25,7 +25,7 @@ PACKAGECONFIG ??= "\
25 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ 25 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
26 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 26 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
27" 27"
28PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" 28PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_system_unitdir}/,--with-systemdunitdir="
29PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5" 29PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5"
30 30
31EXTRA_OECONF += "--enable-test --enable-external-ell" 31EXTRA_OECONF += "--enable-test --enable-external-ell"
diff --git a/meta/recipes-connectivity/openssh/openssh_8.7p1.bb b/meta/recipes-connectivity/openssh/openssh_8.7p1.bb
index 8a2e761..07cd6b7 100644
--- a/meta/recipes-connectivity/openssh/openssh_8.7p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_8.7p1.bb
@@ -126,15 +126,15 @@ do_install:append () {
126 echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly 126 echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly
127 echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly 127 echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly
128 128
129 install -d ${D}${systemd_unitdir}/system 129 install -d ${D}${systemd_system_unitdir}
130 install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system 130 install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_system_unitdir}
131 install -c -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system 131 install -c -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_system_unitdir}
132 install -c -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system 132 install -c -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_system_unitdir}
133 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ 133 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
134 -e 's,@SBINDIR@,${sbindir},g' \ 134 -e 's,@SBINDIR@,${sbindir},g' \
135 -e 's,@BINDIR@,${bindir},g' \ 135 -e 's,@BINDIR@,${bindir},g' \
136 -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \ 136 -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
137 ${D}${systemd_unitdir}/system/sshd.socket ${D}${systemd_unitdir}/system/*.service 137 ${D}${systemd_system_unitdir}/sshd.socket ${D}${systemd_system_unitdir}/*.service
138 138
139 sed -i -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \ 139 sed -i -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
140 ${D}${sysconfdir}/init.d/sshd 140 ${D}${sysconfdir}/init.d/sshd
@@ -152,7 +152,7 @@ ALLOW_EMPTY:${PN} = "1"
152PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" 152PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server"
153FILES:${PN}-scp = "${bindir}/scp.${BPN}" 153FILES:${PN}-scp = "${bindir}/scp.${BPN}"
154FILES:${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" 154FILES:${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"
155FILES:${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system" 155FILES:${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_system_unitdir}"
156FILES:${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd ${sysconfdir}/pam.d/sshd" 156FILES:${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd ${sysconfdir}/pam.d/sshd"
157FILES:${PN}-sshd += "${libexecdir}/${BPN}/sshd_check_keys" 157FILES:${PN}-sshd += "${libexecdir}/${BPN}/sshd_check_keys"
158FILES:${PN}-sftp = "${bindir}/sftp" 158FILES:${PN}-sftp = "${bindir}/sftp"
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.9.bb b/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
index 023d0fe..235595f 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.9.bb
@@ -60,10 +60,10 @@ do_install:append () {
60 install -m 0755 ${WORKDIR}/pap ${D}${sysconfdir}/chatscripts 60 install -m 0755 ${WORKDIR}/pap ${D}${sysconfdir}/chatscripts
61 install -m 0755 ${WORKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot 61 install -m 0755 ${WORKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot
62 install -m 0755 ${WORKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider 62 install -m 0755 ${WORKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider
63 install -d ${D}${systemd_unitdir}/system 63 install -d ${D}${systemd_system_unitdir}
64 install -m 0644 ${WORKDIR}/ppp@.service ${D}${systemd_unitdir}/system 64 install -m 0644 ${WORKDIR}/ppp@.service ${D}${systemd_system_unitdir}
65 sed -i -e 's,@SBINDIR@,${sbindir},g' \ 65 sed -i -e 's,@SBINDIR@,${sbindir},g' \
66 ${D}${systemd_unitdir}/system/ppp@.service 66 ${D}${systemd_system_unitdir}/ppp@.service
67 rm -rf ${D}/${mandir}/man8/man8 67 rm -rf ${D}/${mandir}/man8/man8
68 chmod u+s ${D}${sbindir}/pppd 68 chmod u+s ${D}${sbindir}/pppd
69} 69}
@@ -74,7 +74,7 @@ do_install:append:libc-musl () {
74 74
75CONFFILES:${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" 75CONFFILES:${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
76PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools" 76PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools"
77FILES:${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_unitdir}/system/ppp@.service" 77FILES:${PN} = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_system_unitdir}/ppp@.service"
78FILES:${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so" 78FILES:${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so"
79FILES:${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/*pppoe.so" 79FILES:${PN}-oe = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/*pppoe.so"
80FILES:${PN}-radius = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so" 80FILES:${PN}-radius = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so"
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
index 309bb4a..33b1495 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb
@@ -100,8 +100,8 @@ do_install () {
100 install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services 100 install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services
101 101
102 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 102 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
103 install -d ${D}/${systemd_unitdir}/system 103 install -d ${D}/${systemd_system_unitdir}
104 install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system 104 install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_system_unitdir}
105 fi 105 fi
106 106
107 install -d ${D}/etc/default/volatiles 107 install -d ${D}/etc/default/volatiles
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index d85e2a3..808c3dc 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -24,7 +24,7 @@ EXTRA_OEMAKE = "CC='${CC}' LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${
24PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" 24PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock"
25 25
26FILES:${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" 26FILES:${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
27FILES:${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* ${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog" 27FILES:${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* ${systemd_system_unitdir}/syslog.service ${sysconfdir}/default/busybox-syslog"
28FILES:${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf ${sysconfdir}/mdev/*" 28FILES:${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf ${sysconfdir}/mdev/*"
29FILES:${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" 29FILES:${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
30FILES:${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" 30FILES:${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc"
@@ -317,17 +317,17 @@ do_install () {
317 317
318 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 318 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
319 if grep -q "CONFIG_KLOGD=y" ${B}/.config; then 319 if grep -q "CONFIG_KLOGD=y" ${B}/.config; then
320 install -d ${D}${systemd_unitdir}/system 320 install -d ${D}${systemd_system_unitdir}
321 sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \ 321 sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
322 > ${D}${systemd_unitdir}/system/busybox-klogd.service 322 > ${D}${systemd_system_unitdir}/busybox-klogd.service
323 fi 323 fi
324 324
325 if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then 325 if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then
326 install -d ${D}${systemd_unitdir}/system 326 install -d ${D}${systemd_system_unitdir}
327 sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \ 327 sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \
328 > ${D}${systemd_unitdir}/system/busybox-syslog.service 328 > ${D}${systemd_system_unitdir}/busybox-syslog.service
329 if [ ! -e ${D}${systemd_unitdir}/system/busybox-klogd.service ] ; then 329 if [ ! -e ${D}${systemd_system_unitdir}/busybox-klogd.service ] ; then
330 sed -i '/klog/d' ${D}${systemd_unitdir}/system/busybox-syslog.service 330 sed -i '/klog/d' ${D}${systemd_system_unitdir}/busybox-syslog.service
331 fi 331 fi
332 if [ -f ${WORKDIR}/busybox-syslog.default ] ; then 332 if [ -f ${WORKDIR}/busybox-syslog.default ] ; then
333 install -d ${D}${sysconfdir}/default 333 install -d ${D}${sysconfdir}/default
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index f2a490c..78f9f9a 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -97,14 +97,14 @@ do_install() {
97 fi 97 fi
98 98
99 # deal with systemd unit files 99 # deal with systemd unit files
100 install -d ${D}${systemd_unitdir}/system 100 install -d ${D}${systemd_system_unitdir}
101 install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_unitdir}/system 101 install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${systemd_system_unitdir}
102 install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_unitdir}/system 102 install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_system_unitdir}
103 install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system 103 install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_system_unitdir}
104 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ 104 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
105 -e 's,@BINDIR@,${bindir},g' \ 105 -e 's,@BINDIR@,${bindir},g' \
106 -e 's,@SBINDIR@,${sbindir},g' \ 106 -e 's,@SBINDIR@,${sbindir},g' \
107 ${D}${systemd_unitdir}/system/dropbear.socket ${D}${systemd_unitdir}/system/*.service 107 ${D}${systemd_system_unitdir}/dropbear.socket ${D}${systemd_system_unitdir}/*.service
108} 108}
109 109
110inherit update-alternatives 110inherit update-alternatives
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index e25561d..601dedb 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -42,7 +42,7 @@ FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
42FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" 42FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal"
43RDEPENDS:${PN}-dev = "linux-libc-headers-dev" 43RDEPENDS:${PN}-dev = "linux-libc-headers-dev"
44FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" 44FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a"
45FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \ 45FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_system_unitdir}/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \
46 ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd" 46 ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd"
47FILES:${PN}-mtrace = "${bindir}/mtrace" 47FILES:${PN}-mtrace = "${bindir}/mtrace"
48FILES:tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump" 48FILES:tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump"
@@ -107,8 +107,8 @@ do_install() {
107 sed -i "s%daemon%start-stop-daemon --start --exec%g" ${D}${sysconfdir}/init.d/nscd 107 sed -i "s%daemon%start-stop-daemon --start --exec%g" ${D}${sysconfdir}/init.d/nscd
108 sed -i "s|\(enable-cache\t\+netgroup\t\+\)yes|\1no|" ${D}${sysconfdir}/nscd.conf 108 sed -i "s|\(enable-cache\t\+netgroup\t\+\)yes|\1no|" ${D}${sysconfdir}/nscd.conf
109 109
110 install -d ${D}${systemd_unitdir}/system 110 install -d ${D}${systemd_system_unitdir}
111 install -m 0644 ${S}/nscd/nscd.service ${D}${systemd_unitdir}/system/ 111 install -m 0644 ${S}/nscd/nscd.service ${D}${systemd_system_unitdir}/
112 112
113 # The dynamic loader will have been installed into 113 # The dynamic loader will have been installed into
114 # ${base_libdir}. However, if that isn't going to end up being 114 # ${base_libdir}. However, if that isn't going to end up being
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index e9789c4..1be7ece 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -109,9 +109,9 @@ do_install:append() {
109 fi 109 fi
110 110
111 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 111 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
112 install -d ${D}${systemd_unitdir}/system 112 install -d ${D}${systemd_system_unitdir}
113 install -m 644 ${WORKDIR}/psplash-start.service ${D}/${systemd_unitdir}/system 113 install -m 644 ${WORKDIR}/psplash-start.service ${D}/${systemd_system_unitdir}
114 install -m 644 ${WORKDIR}/psplash-systemd.service ${D}/${systemd_unitdir}/system 114 install -m 644 ${WORKDIR}/psplash-systemd.service ${D}/${systemd_system_unitdir}
115 fi 115 fi
116 116
117 install -d ${D}${bindir} 117 install -d ${D}${bindir}
diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb
index f7505f1..55ebf99 100644
--- a/meta/recipes-core/systemd/systemd-compat-units.bb
+++ b/meta/recipes-core/systemd/systemd-compat-units.bb
@@ -38,7 +38,7 @@ pkg_postinst:${PN} () {
38 fi 38 fi
39 39
40 for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do 40 for i in ${SYSTEMD_DISABLED_SYSV_SERVICES} ; do
41 if [ -e $i -o -e $i.sh ] && ! [ -e $D${sysconfdir}/systemd/system/$i.service -o -e $D${systemd_unitdir}/system/$i.service ] ; then 41 if [ -e $i -o -e $i.sh ] && ! [ -e $D${sysconfdir}/systemd/system/$i.service -o -e $D${systemd_system_unitdir}/$i.service ] ; then
42 echo -n "$i: " 42 echo -n "$i: "
43 systemctl $OPTS mask $i.service 43 systemctl $OPTS mask $i.service
44 fi 44 fi
diff --git a/meta/recipes-core/systemd/systemd-conf_1.0.bb b/meta/recipes-core/systemd/systemd-conf_1.0.bb
index 61ce793..53af7c6 100644
--- a/meta/recipes-core/systemd/systemd-conf_1.0.bb
+++ b/meta/recipes-core/systemd/systemd-conf_1.0.bb
@@ -21,7 +21,7 @@ SRC_URI = "\
21do_install() { 21do_install() {
22 install -D -m0644 ${WORKDIR}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf 22 install -D -m0644 ${WORKDIR}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf
23 install -D -m0644 ${WORKDIR}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf 23 install -D -m0644 ${WORKDIR}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf
24 install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf 24 install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_system_unitdir}.conf.d/00-${PN}.conf
25 25
26 if ${@bb.utils.contains('PACKAGECONFIG', 'dhcp-ethernet', 'true', 'false', d)}; then 26 if ${@bb.utils.contains('PACKAGECONFIG', 'dhcp-ethernet', 'true', 'false', d)}; then
27 install -D -m0644 ${WORKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network 27 install -D -m0644 ${WORKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network
@@ -30,7 +30,7 @@ do_install() {
30 30
31# Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 31# Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52
32do_install:append:qemuall() { 32do_install:append:qemuall() {
33 install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf 33 install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_system_unitdir}.conf.d/01-${PN}.conf
34} 34}
35 35
36PACKAGE_ARCH = "${MACHINE_ARCH}" 36PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -38,6 +38,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
38FILES:${PN} = "\ 38FILES:${PN} = "\
39 ${systemd_unitdir}/journald.conf.d/ \ 39 ${systemd_unitdir}/journald.conf.d/ \
40 ${systemd_unitdir}/logind.conf.d/ \ 40 ${systemd_unitdir}/logind.conf.d/ \
41 ${systemd_unitdir}/system.conf.d/ \ 41 ${systemd_system_unitdir}.conf.d/ \
42 ${systemd_unitdir}/network/ \ 42 ${systemd_unitdir}/network/ \
43" 43"
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb
index 92d35eb..7ca951c 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -19,11 +19,11 @@ REQUIRED_DISTRO_FEATURES = "systemd"
19do_install() { 19do_install() {
20 if [ ! -z "${SERIAL_CONSOLES}" ] ; then 20 if [ ! -z "${SERIAL_CONSOLES}" ] ; then
21 default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'` 21 default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'`
22 install -d ${D}${systemd_unitdir}/system/ 22 install -d ${D}${systemd_system_unitdir}/
23 install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/ 23 install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/
24 install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_unitdir}/system/ 24 install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_system_unitdir}/
25 sed -i -e "s/\@BAUDRATE\@/$default_baudrate/g" ${D}${systemd_unitdir}/system/serial-getty@.service 25 sed -i -e "s/\@BAUDRATE\@/$default_baudrate/g" ${D}${systemd_system_unitdir}/serial-getty@.service
26 sed -i -e "s/\@TERM\@/${SERIAL_TERM}/g" ${D}${systemd_unitdir}/system/serial-getty@.service 26 sed -i -e "s/\@TERM\@/${SERIAL_TERM}/g" ${D}${systemd_system_unitdir}/serial-getty@.service
27 27
28 tmp="${SERIAL_CONSOLES}" 28 tmp="${SERIAL_CONSOLES}"
29 for entry in $tmp ; do 29 for entry in $tmp ; do
@@ -31,14 +31,14 @@ do_install() {
31 ttydev=`echo $entry | sed -e 's/^[0-9]*\;//' -e 's/\;.*//'` 31 ttydev=`echo $entry | sed -e 's/^[0-9]*\;//' -e 's/\;.*//'`
32 if [ "$baudrate" = "$default_baudrate" ] ; then 32 if [ "$baudrate" = "$default_baudrate" ] ; then
33 # enable the service 33 # enable the service
34 ln -sf ${systemd_unitdir}/system/serial-getty@.service \ 34 ln -sf ${systemd_system_unitdir}/serial-getty@.service \
35 ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@$ttydev.service 35 ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty@$ttydev.service
36 else 36 else
37 # install custom service file for the non-default baudrate 37 # install custom service file for the non-default baudrate
38 install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_unitdir}/system/serial-getty$baudrate@.service 38 install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_system_unitdir}/serial-getty$baudrate@.service
39 sed -i -e "s/\@BAUDRATE\@/$baudrate/g" ${D}${systemd_unitdir}/system/serial-getty$baudrate@.service 39 sed -i -e "s/\@BAUDRATE\@/$baudrate/g" ${D}${systemd_system_unitdir}/serial-getty$baudrate@.service
40 # enable the service 40 # enable the service
41 ln -sf ${systemd_unitdir}/system/serial-getty$baudrate@.service \ 41 ln -sf ${systemd_system_unitdir}/serial-getty$baudrate@.service \
42 ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty$baudrate@$ttydev.service 42 ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty$baudrate@$ttydev.service
43 fi 43 fi
44 done 44 done
@@ -46,7 +46,7 @@ do_install() {
46} 46}
47 47
48# This is a machine specific file 48# This is a machine specific file
49FILES:${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}" 49FILES:${PN} = "${systemd_system_unitdir}/*.service ${sysconfdir}"
50PACKAGE_ARCH = "${MACHINE_ARCH}" 50PACKAGE_ARCH = "${MACHINE_ARCH}"
51 51
52ALLOW_EMPTY:${PN} = "1" 52ALLOW_EMPTY:${PN} = "1"
diff --git a/meta/recipes-core/systemd/systemd_249.3.bb b/meta/recipes-core/systemd/systemd_249.3.bb
index e848eea..c1594d7 100644
--- a/meta/recipes-core/systemd/systemd_249.3.bb
+++ b/meta/recipes-core/systemd/systemd_249.3.bb
@@ -241,7 +241,7 @@ do_install() {
241 install -d ${D}/${base_sbindir} 241 install -d ${D}/${base_sbindir}
242 if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then 242 if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then
243 # Provided by a separate recipe 243 # Provided by a separate recipe
244 rm ${D}${systemd_unitdir}/system/serial-getty* -f 244 rm ${D}${systemd_system_unitdir}/serial-getty* -f
245 fi 245 fi
246 246
247 # Provide support for initramfs 247 # Provide support for initramfs
@@ -260,7 +260,7 @@ do_install() {
260 install -d ${D}${sysconfdir}/init.d 260 install -d ${D}${sysconfdir}/init.d
261 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd 261 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd
262 sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd 262 sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
263 install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install 263 install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_system_unitdir}d-sysv-install
264 fi 264 fi
265 265
266 chown root:systemd-journal ${D}/${localstatedir}/log/journal 266 chown root:systemd-journal ${D}/${localstatedir}/log/journal
@@ -271,19 +271,19 @@ do_install() {
271 # journal-remote creates this at start 271 # journal-remote creates this at start
272 rm -rf ${D}/${localstatedir}/log/journal/remote 272 rm -rf ${D}/${localstatedir}/log/journal/remote
273 273
274 install -d ${D}${systemd_unitdir}/system/graphical.target.wants 274 install -d ${D}${systemd_system_unitdir}/graphical.target.wants
275 install -d ${D}${systemd_unitdir}/system/multi-user.target.wants 275 install -d ${D}${systemd_system_unitdir}/multi-user.target.wants
276 install -d ${D}${systemd_unitdir}/system/poweroff.target.wants 276 install -d ${D}${systemd_system_unitdir}/poweroff.target.wants
277 install -d ${D}${systemd_unitdir}/system/reboot.target.wants 277 install -d ${D}${systemd_system_unitdir}/reboot.target.wants
278 install -d ${D}${systemd_unitdir}/system/rescue.target.wants 278 install -d ${D}${systemd_system_unitdir}/rescue.target.wants
279 279
280 # Create symlinks for systemd-update-utmp-runlevel.service 280 # Create symlinks for systemd-update-utmp-runlevel.service
281 if ${@bb.utils.contains('PACKAGECONFIG', 'utmp', 'true', 'false', d)}; then 281 if ${@bb.utils.contains('PACKAGECONFIG', 'utmp', 'true', 'false', d)}; then
282 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/graphical.target.wants/systemd-update-utmp-runlevel.service 282 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service
283 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/multi-user.target.wants/systemd-update-utmp-runlevel.service 283 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service
284 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/poweroff.target.wants/systemd-update-utmp-runlevel.service 284 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/poweroff.target.wants/systemd-update-utmp-runlevel.service
285 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/reboot.target.wants/systemd-update-utmp-runlevel.service 285 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/reboot.target.wants/systemd-update-utmp-runlevel.service
286 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/rescue.target.wants/systemd-update-utmp-runlevel.service 286 ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_system_unitdir}/rescue.target.wants/systemd-update-utmp-runlevel.service
287 fi 287 fi
288 288
289 # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it 289 # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it
@@ -316,8 +316,8 @@ do_install() {
316 # If polkit is not available and a fallback was requested, install a drop-in that allows networkd to 316 # If polkit is not available and a fallback was requested, install a drop-in that allows networkd to
317 # request hostname changes via DBUS without elevating its privileges 317 # request hostname changes via DBUS without elevating its privileges
318 if ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'true', 'false', d)}; then 318 if ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'true', 'false', d)}; then
319 install -d ${D}${systemd_unitdir}/system/systemd-hostnamed.service.d/ 319 install -d ${D}${systemd_system_unitdir}/systemd-hostnamed.service.d/
320 install -m 0644 ${WORKDIR}/00-hostnamed-network-user.conf ${D}${systemd_unitdir}/system/systemd-hostnamed.service.d/ 320 install -m 0644 ${WORKDIR}/00-hostnamed-network-user.conf ${D}${systemd_system_unitdir}/systemd-hostnamed.service.d/
321 install -d ${D}${datadir}/dbus-1/system.d/ 321 install -d ${D}${datadir}/dbus-1/system.d/
322 install -m 0644 ${WORKDIR}/org.freedesktop.hostname1_no_polkit.conf ${D}${datadir}/dbus-1/system.d/ 322 install -m 0644 ${WORKDIR}/org.freedesktop.hostname1_no_polkit.conf ${D}${datadir}/dbus-1/system.d/
323 fi 323 fi
@@ -331,7 +331,7 @@ do_install() {
331 331
332 # install default policy for presets 332 # install default policy for presets
333 # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto 333 # https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto
334 install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset 334 install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_system_unitdir}-preset/99-default.preset
335 335
336 # add a profile fragment to disable systemd pager with busybox less 336 # add a profile fragment to disable systemd pager with busybox less
337 install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh 337 install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh
@@ -406,8 +406,8 @@ RDEPENDS:${PN}-initramfs = "${PN}"
406FILES:${PN}-gui = "${bindir}/systemadm" 406FILES:${PN}-gui = "${bindir}/systemadm"
407 407
408FILES:${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ 408FILES:${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \
409 ${systemd_unitdir}/system/systemd-vconsole-setup.service \ 409 ${systemd_system_unitdir}/systemd-vconsole-setup.service \
410 ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service" 410 ${systemd_system_unitdir}/sysinit.target.wants/systemd-vconsole-setup.service"
411 411
412RDEPENDS:${PN}-kernel-install += "bash" 412RDEPENDS:${PN}-kernel-install += "bash"
413FILES:${PN}-kernel-install = "${bindir}/kernel-install \ 413FILES:${PN}-kernel-install = "${bindir}/kernel-install \
@@ -422,8 +422,8 @@ FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions"
422FILES:${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ 422FILES:${PN}-binfmt = "${sysconfdir}/binfmt.d/ \
423 ${exec_prefix}/lib/binfmt.d \ 423 ${exec_prefix}/lib/binfmt.d \
424 ${rootlibexecdir}/systemd/systemd-binfmt \ 424 ${rootlibexecdir}/systemd/systemd-binfmt \
425 ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.* \ 425 ${systemd_system_unitdir}/proc-sys-fs-binfmt_misc.* \
426 ${systemd_unitdir}/system/systemd-binfmt.service" 426 ${systemd_system_unitdir}/systemd-binfmt.service"
427RRECOMMENDS:${PN}-binfmt = "kernel-module-binfmt-misc" 427RRECOMMENDS:${PN}-binfmt = "kernel-module-binfmt-misc"
428 428
429RRECOMMENDS:${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" 429RRECOMMENDS:${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps"
@@ -512,31 +512,31 @@ FILES:${PN}-extra-utils = "\
512 ${bindir}/systemd-sysext \ 512 ${bindir}/systemd-sysext \
513 ${base_bindir}/systemd-ask-password \ 513 ${base_bindir}/systemd-ask-password \
514 ${base_bindir}/systemd-tty-ask-password-agent \ 514 ${base_bindir}/systemd-tty-ask-password-agent \
515 ${systemd_unitdir}/system/systemd-ask-password-console.path \ 515 ${systemd_system_unitdir}/systemd-ask-password-console.path \
516 ${systemd_unitdir}/system/systemd-ask-password-console.service \ 516 ${systemd_system_unitdir}/systemd-ask-password-console.service \
517 ${systemd_unitdir}/system/systemd-ask-password-wall.path \ 517 ${systemd_system_unitdir}/systemd-ask-password-wall.path \
518 ${systemd_unitdir}/system/systemd-ask-password-wall.service \ 518 ${systemd_system_unitdir}/systemd-ask-password-wall.service \
519 ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-console.path \ 519 ${systemd_system_unitdir}/sysinit.target.wants/systemd-ask-password-console.path \
520 ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-wall.path \ 520 ${systemd_system_unitdir}/sysinit.target.wants/systemd-ask-password-wall.path \
521 ${systemd_unitdir}/system/multi-user.target.wants/systemd-ask-password-wall.path \ 521 ${systemd_system_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path \
522 ${rootlibexecdir}/systemd/systemd-resolve-host \ 522 ${rootlibexecdir}/systemd/systemd-resolve-host \
523 ${rootlibexecdir}/systemd/systemd-ac-power \ 523 ${rootlibexecdir}/systemd/systemd-ac-power \
524 ${rootlibexecdir}/systemd/systemd-activate \ 524 ${rootlibexecdir}/systemd/systemd-activate \
525 ${rootlibexecdir}/systemd/systemd-bus-proxyd \ 525 ${rootlibexecdir}/systemd/systemd-bus-proxyd \
526 ${systemd_unitdir}/system/systemd-bus-proxyd.service \ 526 ${systemd_system_unitdir}/systemd-bus-proxyd.service \
527 ${systemd_unitdir}/system/systemd-bus-proxyd.socket \ 527 ${systemd_system_unitdir}/systemd-bus-proxyd.socket \
528 ${rootlibexecdir}/systemd/systemd-socket-proxyd \ 528 ${rootlibexecdir}/systemd/systemd-socket-proxyd \
529 ${rootlibexecdir}/systemd/systemd-reply-password \ 529 ${rootlibexecdir}/systemd/systemd-reply-password \
530 ${rootlibexecdir}/systemd/systemd-sleep \ 530 ${rootlibexecdir}/systemd/systemd-sleep \
531 ${rootlibexecdir}/systemd/system-sleep \ 531 ${rootlibexecdir}/systemd/system-sleep \
532 ${systemd_unitdir}/system/systemd-hibernate.service \ 532 ${systemd_system_unitdir}/systemd-hibernate.service \
533 ${systemd_unitdir}/system/systemd-hybrid-sleep.service \ 533 ${systemd_system_unitdir}/systemd-hybrid-sleep.service \
534 ${systemd_unitdir}/system/systemd-suspend.service \ 534 ${systemd_system_unitdir}/systemd-suspend.service \
535 ${systemd_unitdir}/system/sleep.target \ 535 ${systemd_system_unitdir}/sleep.target \
536 ${rootlibexecdir}/systemd/systemd-initctl \ 536 ${rootlibexecdir}/systemd/systemd-initctl \
537 ${systemd_unitdir}/system/systemd-initctl.service \ 537 ${systemd_system_unitdir}/systemd-initctl.service \
538 ${systemd_unitdir}/system/systemd-initctl.socket \ 538 ${systemd_system_unitdir}/systemd-initctl.socket \
539 ${systemd_unitdir}/system/sockets.target.wants/systemd-initctl.socket \ 539 ${systemd_system_unitdir}/sockets.target.wants/systemd-initctl.socket \
540 ${rootlibexecdir}/systemd/system-generators/systemd-gpt-auto-generator \ 540 ${rootlibexecdir}/systemd/system-generators/systemd-gpt-auto-generator \
541 ${rootlibexecdir}/systemd/systemd-cgroups-agent \ 541 ${rootlibexecdir}/systemd/systemd-cgroups-agent \
542" 542"
@@ -694,14 +694,14 @@ FILES:udev += "${base_sbindir}/udevd \
694 ${rootlibexecdir}/udev/rules.d/README \ 694 ${rootlibexecdir}/udev/rules.d/README \
695 ${sysconfdir}/udev \ 695 ${sysconfdir}/udev \
696 ${sysconfdir}/init.d/systemd-udevd \ 696 ${sysconfdir}/init.d/systemd-udevd \
697 ${systemd_unitdir}/system/*udev* \ 697 ${systemd_system_unitdir}/*udev* \
698 ${systemd_unitdir}/system/*.wants/*udev* \ 698 ${systemd_system_unitdir}/*.wants/*udev* \
699 ${base_bindir}/systemd-hwdb \ 699 ${base_bindir}/systemd-hwdb \
700 ${base_bindir}/udevadm \ 700 ${base_bindir}/udevadm \
701 ${base_sbindir}/udevadm \ 701 ${base_sbindir}/udevadm \
702 ${libexecdir}/${MLPREFIX}udevadm \ 702 ${libexecdir}/${MLPREFIX}udevadm \
703 ${datadir}/bash-completion/completions/udevadm \ 703 ${datadir}/bash-completion/completions/udevadm \
704 ${systemd_unitdir}/system/systemd-hwdb-update.service \ 704 ${systemd_system_unitdir}/systemd-hwdb-update.service \
705 " 705 "
706 706
707FILES:udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \ 707FILES:udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \
diff --git a/meta/recipes-core/volatile-binds/volatile-binds.bb b/meta/recipes-core/volatile-binds/volatile-binds.bb
index b693c24..d5c5538 100644
--- a/meta/recipes-core/volatile-binds/volatile-binds.bb
+++ b/meta/recipes-core/volatile-binds/volatile-binds.bb
@@ -35,7 +35,7 @@ def volatile_systemd_services(d):
35 35
36SYSTEMD_SERVICE:${PN} = "${@volatile_systemd_services(d)}" 36SYSTEMD_SERVICE:${PN} = "${@volatile_systemd_services(d)}"
37 37
38FILES:${PN} += "${systemd_unitdir}/system/*.service ${servicedir}" 38FILES:${PN} += "${systemd_system_unitdir}/*.service ${servicedir}"
39 39
40do_compile () { 40do_compile () {
41 while read spec mountpoint; do 41 while read spec mountpoint; do
@@ -67,9 +67,9 @@ do_install () {
67 install -d ${D}${servicedir} 67 install -d ${D}${servicedir}
68 install -m 0755 mount-copybind ${D}${base_sbindir}/ 68 install -m 0755 mount-copybind ${D}${base_sbindir}/
69 69
70 install -d ${D}${systemd_unitdir}/system 70 install -d ${D}${systemd_system_unitdir}
71 for service in ${SYSTEMD_SERVICE:${PN}}; do 71 for service in ${SYSTEMD_SERVICE:${PN}}; do
72 install -m 0644 $service ${D}${systemd_unitdir}/system/ 72 install -m 0644 $service ${D}${systemd_system_unitdir}/
73 done 73 done
74 74
75 # Suppress attempts to process some tmpfiles that are not temporary. 75 # Suppress attempts to process some tmpfiles that are not temporary.
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb
index b1d359e..974faa3 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb
+++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb
@@ -129,7 +129,7 @@ do_install () {
129 export DESTDIR="${D}" 129 export DESTDIR="${D}"
130 export LIBDIR="${base_libdir}" 130 export LIBDIR="${base_libdir}"
131 export PKGLIBDIR="${base_libdir}/bootchart" 131 export PKGLIBDIR="${base_libdir}/bootchart"
132 export SYSTEMD_UNIT_DIR="${systemd_unitdir}/system" 132 export SYSTEMD_UNIT_DIR="${systemd_system_unitdir}"
133 133
134 oe_runmake install 134 oe_runmake install
135 install -d ${D}${sysconfdir}/init.d 135 install -d ${D}${sysconfdir}/init.d
diff --git a/meta/recipes-devtools/distcc/distcc_3.4.bb b/meta/recipes-devtools/distcc/distcc_3.4.bb
index d4fc035..7adf8a8 100644
--- a/meta/recipes-devtools/distcc/distcc_3.4.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.4.bb
@@ -52,9 +52,9 @@ do_install() {
52 install -d ${D}${sysconfdir}/default 52 install -d ${D}${sysconfdir}/default
53 install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/ 53 install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/
54 install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc 54 install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc
55 install -d ${D}${systemd_unitdir}/system/ 55 install -d ${D}${systemd_system_unitdir}/
56 install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_unitdir}/system 56 install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_system_unitdir}
57 sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service 57 sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/distcc.service
58} 58}
59 59
60FILES:${PN}-server = "${sysconfdir} \ 60FILES:${PN}-server = "${sysconfdir} \
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
index deddf11..db353d6 100644
--- a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
+++ b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
@@ -33,13 +33,13 @@ do_install() {
33 install -d ${D}${sysconfdir}/init.d/ 33 install -d ${D}${sysconfdir}/init.d/
34 install -m 0755 ${WORKDIR}/run-postinsts.init ${D}${sysconfdir}/init.d/run-postinsts 34 install -m 0755 ${WORKDIR}/run-postinsts.init ${D}${sysconfdir}/init.d/run-postinsts
35 35
36 install -d ${D}${systemd_unitdir}/system/ 36 install -d ${D}${systemd_system_unitdir}/
37 install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system/ 37 install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_system_unitdir}/
38 38
39 sed -i -e 's:#SYSCONFDIR#:${sysconfdir}:g' \ 39 sed -i -e 's:#SYSCONFDIR#:${sysconfdir}:g' \
40 -e 's:#SBINDIR#:${sbindir}:g' \ 40 -e 's:#SBINDIR#:${sbindir}:g' \
41 -e 's:#BASE_BINDIR#:${base_bindir}:g' \ 41 -e 's:#BASE_BINDIR#:${base_bindir}:g' \
42 -e 's:#LOCALSTATEDIR#:${localstatedir}:g' \ 42 -e 's:#LOCALSTATEDIR#:${localstatedir}:g' \
43 ${D}${sbindir}/run-postinsts \ 43 ${D}${sbindir}/run-postinsts \
44 ${D}${systemd_unitdir}/system/run-postinsts.service 44 ${D}${systemd_system_unitdir}/run-postinsts.service
45} 45}
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb
index fd6f17b..30dbbcc 100644
--- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb
+++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_234.bb
@@ -38,7 +38,7 @@ do_configure:prepend() {
38 rm -f ${S}/m4/intltool.m4 38 rm -f ${S}/m4/intltool.m4
39} 39}
40 40
41FILES:${PN} += "${systemd_unitdir}/systemd-bootchart" 41FILES:${PN} += "${systemd_system_unitdir}d-bootchart"
42 42
43EXTRA_OECONF = " --with-rootprefix=${root_prefix} \ 43EXTRA_OECONF = " --with-rootprefix=${root_prefix} \
44 --with-rootlibdir=${base_libdir}" 44 --with-rootlibdir=${base_libdir}"
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
index c186db6..4ff309d 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
@@ -56,8 +56,8 @@ do_install() {
56 oe_runmake install INSTALLROOT=${D} 56 oe_runmake install INSTALLROOT=${D}
57 install -d ${D}${sysconfdir}/init.d/ 57 install -d ${D}${sysconfdir}/init.d/
58 install -m 0755 ${WORKDIR}/tcf-agent.init ${D}${sysconfdir}/init.d/tcf-agent 58 install -m 0755 ${WORKDIR}/tcf-agent.init ${D}${sysconfdir}/init.d/tcf-agent
59 install -d ${D}${systemd_unitdir}/system 59 install -d ${D}${systemd_system_unitdir}
60 install -m 0644 ${WORKDIR}/tcf-agent.service ${D}${systemd_unitdir}/system 60 install -m 0644 ${WORKDIR}/tcf-agent.service ${D}${systemd_system_unitdir}
61 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tcf-agent.service 61 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/tcf-agent.service
62} 62}
63 63
diff --git a/meta/recipes-extended/at/at_3.2.2.bb b/meta/recipes-extended/at/at_3.2.2.bb
index efe5694..14b9dac 100644
--- a/meta/recipes-extended/at/at_3.2.2.bb
+++ b/meta/recipes-extended/at/at_3.2.2.bb
@@ -65,9 +65,9 @@ do_install () {
65 install -m 0755 ${WORKDIR}/atd.init ${D}${sysconfdir}/init.d/atd 65 install -m 0755 ${WORKDIR}/atd.init ${D}${sysconfdir}/init.d/atd
66 66
67 # install systemd unit files 67 # install systemd unit files
68 install -d ${D}${systemd_unitdir}/system 68 install -d ${D}${systemd_system_unitdir}
69 install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system 69 install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_system_unitdir}
70 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service 70 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/atd.service
71 71
72 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then 72 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
73 install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd 73 install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd
diff --git a/meta/recipes-extended/cronie/cronie_1.5.7.bb b/meta/recipes-extended/cronie/cronie_1.5.7.bb
index 2cbae59..72a4508 100644
--- a/meta/recipes-extended/cronie/cronie_1.5.7.bb
+++ b/meta/recipes-extended/cronie/cronie_1.5.7.bb
@@ -50,11 +50,11 @@ do_install:append () {
50 install -m 0755 ${WORKDIR}/crond.init ${D}${sysconfdir}/init.d/crond 50 install -m 0755 ${WORKDIR}/crond.init ${D}${sysconfdir}/init.d/crond
51 51
52 # install systemd unit files 52 # install systemd unit files
53 install -d ${D}${systemd_unitdir}/system 53 install -d ${D}${systemd_system_unitdir}
54 install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_unitdir}/system 54 install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_system_unitdir}
55 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ 55 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
56 -e 's,@SBINDIR@,${sbindir},g' \ 56 -e 's,@SBINDIR@,${sbindir},g' \
57 ${D}${systemd_unitdir}/system/crond.service 57 ${D}${systemd_system_unitdir}/crond.service
58 58
59 # below are necessary for a complete cron environment 59 # below are necessary for a complete cron environment
60 install -d ${D}${localstatedir}/spool/cron 60 install -d ${D}${localstatedir}/spool/cron
diff --git a/meta/recipes-extended/iputils/iputils_20210722.bb b/meta/recipes-extended/iputils/iputils_20210722.bb
index cafb0f6..a9821e5 100644
--- a/meta/recipes-extended/iputils/iputils_20210722.bb
+++ b/meta/recipes-extended/iputils/iputils_20210722.bb
@@ -32,7 +32,7 @@ PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2"
32PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" 32PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext"
33PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," 33PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false,"
34PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," 34PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false,"
35PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd" 35PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_system_unitdir},,systemd"
36PACKAGECONFIG[tftpd] = "-DBUILD_TFTPD=true, -DBUILD_TFTPD=false," 36PACKAGECONFIG[tftpd] = "-DBUILD_TFTPD=true, -DBUILD_TFTPD=false,"
37PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," 37PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false,"
38PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" 38PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt"
@@ -62,7 +62,7 @@ FILES:${PN}-tracepath = "${base_bindir}/tracepath"
62FILES:${PN}-traceroute6 = "${base_bindir}/traceroute6" 62FILES:${PN}-traceroute6 = "${base_bindir}/traceroute6"
63FILES:${PN}-clockdiff = "${base_bindir}/clockdiff" 63FILES:${PN}-clockdiff = "${base_bindir}/clockdiff"
64FILES:${PN}-tftpd = "${base_bindir}/tftpd ${sysconfdir}/xinetd.d/tftp" 64FILES:${PN}-tftpd = "${base_bindir}/tftpd ${sysconfdir}/xinetd.d/tftp"
65FILES:${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd@.service" 65FILES:${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_system_unitdir}/rarpd@.service"
66FILES:${PN}-rdisc = "${base_sbindir}/rdisc" 66FILES:${PN}-rdisc = "${base_sbindir}/rdisc"
67FILES:${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" 67FILES:${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh"
68 68
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb
index f74016f..8cb3a9a 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb
@@ -58,12 +58,12 @@ do_install:append() {
58 install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd 58 install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd
59 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html 59 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
60 60
61 install -d ${D}${systemd_unitdir}/system 61 install -d ${D}${systemd_system_unitdir}
62 install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_unitdir}/system 62 install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_system_unitdir}
63 sed -i -e 's,@SBINDIR@,${sbindir},g' \ 63 sed -i -e 's,@SBINDIR@,${sbindir},g' \
64 -e 's,@SYSCONFDIR@,${sysconfdir},g' \ 64 -e 's,@SYSCONFDIR@,${sysconfdir},g' \
65 -e 's,@BASE_BINDIR@,${base_bindir},g' \ 65 -e 's,@BASE_BINDIR@,${base_bindir},g' \
66 ${D}${systemd_unitdir}/system/lighttpd.service 66 ${D}${systemd_system_unitdir}/lighttpd.service
67 #For FHS compliance, create symbolic links to /var/log and /var/tmp for logs and temporary data 67 #For FHS compliance, create symbolic links to /var/log and /var/tmp for logs and temporary data
68 ln -sf ${localstatedir}/log ${D}/www/logs 68 ln -sf ${localstatedir}/log ${D}/www/logs
69 ln -sf ${localstatedir}/tmp ${D}/www/var 69 ln -sf ${localstatedir}/tmp ${D}/www/var
diff --git a/meta/recipes-extended/man-db/man-db_2.9.4.bb b/meta/recipes-extended/man-db/man-db_2.9.4.bb
index b068af9..f97974a 100644
--- a/meta/recipes-extended/man-db/man-db_2.9.4.bb
+++ b/meta/recipes-extended/man-db/man-db_2.9.4.bb
@@ -23,7 +23,7 @@ USE_NLS:libc-musl = "no"
23 23
24inherit gettext pkgconfig autotools systemd 24inherit gettext pkgconfig autotools systemd
25 25
26EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_unitdir}/system" 26EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_system_unitdir}"
27EXTRA_AUTORECONF += "-I ${S}/gl/m4" 27EXTRA_AUTORECONF += "-I ${S}/gl/m4"
28 28
29PACKAGECONFIG[bzip2] = "--with-bzip2=bzip2,ac_cv_prog_have_bzip2='',bzip2" 29PACKAGECONFIG[bzip2] = "--with-bzip2=bzip2,ac_cv_prog_have_bzip2='',bzip2"
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 062797a..35535ae 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -44,7 +44,7 @@ CFLAGS:append:powerpc64 = ' -D__SANE_USERSPACE_TYPES__'
44CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' 44CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
45CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' 45CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
46 46
47EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_unitdir}/system \ 47EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \
48 BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev"' 48 BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev"'
49 49
50DEBUG_OPTIMIZATION:append = " -Wno-error" 50DEBUG_OPTIMIZATION:append = " -Wno-error"
diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb
index e58214d..344faa3 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb
@@ -35,7 +35,7 @@ USERADD_PARAM:${PN} = "--system --no-create-home --home-dir / \
35 --shell /bin/false --user-group rpc" 35 --shell /bin/false --user-group rpc"
36 36
37PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 37PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
38PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/, \ 38PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}/, \
39 --without-systemdsystemunitdir, \ 39 --without-systemdsystemunitdir, \
40 systemd \ 40 systemd \
41" 41"
diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc
index 14c6f07..8345c1e 100644
--- a/meta/recipes-extended/sysstat/sysstat.inc
+++ b/meta/recipes-extended/sysstat/sysstat.inc
@@ -51,9 +51,9 @@ do_install() {
51 # Unless both cron and systemd are enabled, install our own 51 # Unless both cron and systemd are enabled, install our own
52 # systemd unit file. Otherwise the package will install one. 52 # systemd unit file. Otherwise the package will install one.
53 if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then 53 if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then
54 install -d ${D}${systemd_unitdir}/system 54 install -d ${D}${systemd_system_unitdir}
55 install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_unitdir}/system 55 install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir}
56 sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/sysstat.service 56 sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service
57 fi 57 fi
58 fi 58 fi
59} 59}
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb
index ec90de8..da051c1 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb
@@ -39,11 +39,11 @@ do_install:append() {
39 install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" 39 install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd"
40 40
41 # Install systemd unit files 41 # Install systemd unit files
42 install -d ${D}${systemd_unitdir}/system 42 install -d ${D}${systemd_system_unitdir}
43 install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_unitdir}/system 43 install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_system_unitdir}
44 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ 44 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
45 -e 's,@SBINDIR@,${sbindir},g' \ 45 -e 's,@SBINDIR@,${sbindir},g' \
46 ${D}${systemd_unitdir}/system/xinetd.service 46 ${D}${systemd_system_unitdir}/xinetd.service
47} 47}
48 48
49RDEPENDS:${PN} += "perl" 49RDEPENDS:${PN} += "perl"
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb
index fecf926..e02da0c 100644
--- a/meta/recipes-graphics/wayland/weston-init.bb
+++ b/meta/recipes-graphics/wayland/weston-init.bb
@@ -44,7 +44,7 @@ do_install() {
44 sed -i -e s:/etc:${sysconfdir}:g \ 44 sed -i -e s:/etc:${sysconfdir}:g \
45 -e s:/usr/bin:${bindir}:g \ 45 -e s:/usr/bin:${bindir}:g \
46 -e s:/var:${localstatedir}:g \ 46 -e s:/var:${localstatedir}:g \
47 ${D}${systemd_unitdir}/system/weston.service 47 ${D}${systemd_system_unitdir}/weston.service
48 # Install weston-start script 48 # Install weston-start script
49 install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start 49 install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start
50 sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start 50 sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
index 3f20ad4..573ab7b 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
@@ -52,9 +52,9 @@ do_install() {
52 sed -i "s:@NO_CURSOR_ARG@:${NO_CURSOR_ARG}:" ${D}${sysconfdir}/default/xserver-nodm 52 sed -i "s:@NO_CURSOR_ARG@:${NO_CURSOR_ARG}:" ${D}${sysconfdir}/default/xserver-nodm
53 53
54 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 54 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
55 install -d ${D}${systemd_unitdir}/system 55 install -d ${D}${systemd_system_unitdir}
56 install -m 0644 ${WORKDIR}/xserver-nodm.service.in ${D}${systemd_unitdir}/system/xserver-nodm.service 56 install -m 0644 ${WORKDIR}/xserver-nodm.service.in ${D}${systemd_system_unitdir}/xserver-nodm.service
57 sed -i "s:@USER@:${XUSER}:" ${D}${systemd_unitdir}/system/xserver-nodm.service 57 sed -i "s:@USER@:${XUSER}:" ${D}${systemd_system_unitdir}/xserver-nodm.service
58 fi 58 fi
59 59
60 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then 60 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb
index d12ad4e..95ff5e6 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb
@@ -54,8 +54,8 @@ do_install:append () {
54 54
55 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 55 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
56 install -D -m 0755 ${WORKDIR}/kdump ${D}${libexecdir}/kdump-helper 56 install -D -m 0755 ${WORKDIR}/kdump ${D}${libexecdir}/kdump-helper
57 install -D -m 0644 ${WORKDIR}/kdump.service ${D}${systemd_unitdir}/system/kdump.service 57 install -D -m 0644 ${WORKDIR}/kdump.service ${D}${systemd_system_unitdir}/kdump.service
58 sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_unitdir}/system/kdump.service 58 sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_system_unitdir}/kdump.service
59 fi 59 fi
60} 60}
61 61
@@ -69,7 +69,7 @@ FILES:kdump = "${sbindir}/kdump \
69 ${sysconfdir}/sysconfig/kdump.conf \ 69 ${sysconfdir}/sysconfig/kdump.conf \
70 ${sysconfdir}/init.d/kdump \ 70 ${sysconfdir}/init.d/kdump \
71 ${libexecdir}/kdump-helper \ 71 ${libexecdir}/kdump-helper \
72 ${systemd_unitdir}/system/kdump.service \ 72 ${systemd_system_unitdir}/kdump.service \
73" 73"
74 74
75FILES:vmcore-dmesg = "${sbindir}/vmcore-dmesg" 75FILES:vmcore-dmesg = "${sbindir}/vmcore-dmesg"
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb b/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
index dc2e1f3..ba26c15 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
@@ -64,8 +64,8 @@ PRIVATE_LIBS:${PN}-ptest = "libfoo.so"
64 64
65do_install:append () { 65do_install:append () {
66 # install systemd unit file 66 # install systemd unit file
67 install -d ${D}${systemd_unitdir}/system 67 install -d ${D}${systemd_system_unitdir}
68 install -m 0644 ${WORKDIR}/lttng-sessiond.service ${D}${systemd_unitdir}/system 68 install -m 0644 ${WORKDIR}/lttng-sessiond.service ${D}${systemd_system_unitdir}
69} 69}
70 70
71do_install_ptest () { 71do_install_ptest () {
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 8161a44..8f0de5f 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -35,7 +35,7 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3-probes', 'distutils3-base
35PACKAGES =+ "${PN}-exporter" 35PACKAGES =+ "${PN}-exporter"
36FILES:${PN}-exporter = "${sysconfdir}/stap-exporter/* \ 36FILES:${PN}-exporter = "${sysconfdir}/stap-exporter/* \
37 ${sysconfdir}/sysconfig/stap-exporter \ 37 ${sysconfdir}/sysconfig/stap-exporter \
38 ${systemd_unitdir}/system/stap-exporter.service \ 38 ${systemd_system_unitdir}/stap-exporter.service \
39 ${sbindir}/stap-exporter" 39 ${sbindir}/stap-exporter"
40RDEPENDS:${PN}-exporter = "${PN} python3-core python3-netclient" 40RDEPENDS:${PN}-exporter = "${PN} python3-core python3-netclient"
41SYSTEMD_SERVICE:${PN}-exporter = "stap-exporter.service" 41SYSTEMD_SERVICE:${PN}-exporter = "stap-exporter.service"
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
index 3d28ba2..95ce97e 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
@@ -29,7 +29,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd polkit', d
29 29
30PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" 30PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam"
31PACKAGECONFIG[polkit] = "--with-polkit,--without-polkit,polkit" 31PACKAGECONFIG[polkit] = "--with-polkit,--without-polkit,polkit"
32PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--with-systemdsystemunitdir=" 32PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}/,--with-systemdsystemunitdir="
33 33
34FILES:${PN} += "${exec_prefix}/lib/ConsoleKit \ 34FILES:${PN} += "${exec_prefix}/lib/ConsoleKit \
35 ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \ 35 ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \