diff options
author | Robert P. J. Day <rpjday@crashcourse.ca> | 2021-08-26 05:42:06 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-07 21:54:11 +0100 |
commit | abeb2e95c6e5b286283dfe7198d5a222f7139458 (patch) | |
tree | 1a1f5526ee2b663abf27252c02bb33573f6205dc /meta/recipes-core | |
parent | 3a702623573a973ff9b4d3d5f934ef55497de167 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 14 | ||||
-rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 10 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 6 | ||||
-rw-r--r-- | meta/recipes-core/psplash/psplash_git.bb | 6 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd-compat-units.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd-conf_1.0.bb | 6 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd-serialgetty.bb | 18 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_249.3.bb | 76 | ||||
-rw-r--r-- | meta/recipes-core/volatile-binds/volatile-binds.bb | 6 |
9 files changed, 72 insertions, 72 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index d85e2a3d7a..808c3dc700 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=${ | |||
24 | PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" | 24 | PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" |
25 | 25 | ||
26 | FILES:${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" | 26 | FILES:${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" |
27 | FILES:${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* ${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog" | 27 | FILES:${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* ${systemd_system_unitdir}/syslog.service ${sysconfdir}/default/busybox-syslog" |
28 | FILES:${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf ${sysconfdir}/mdev/*" | 28 | FILES:${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf ${sysconfdir}/mdev/*" |
29 | FILES:${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" | 29 | FILES:${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" |
30 | FILES:${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" | 30 | FILES:${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 f2a490c473..78f9f9adbd 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 | ||
110 | inherit update-alternatives | 110 | inherit update-alternatives |
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index e25561d9b9..601dedb9fa 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}" | |||
42 | FILES:${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" | 42 | FILES:${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" |
43 | RDEPENDS:${PN}-dev = "linux-libc-headers-dev" | 43 | RDEPENDS:${PN}-dev = "linux-libc-headers-dev" |
44 | FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" | 44 | FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" |
45 | FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \ | 45 | FILES: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" |
47 | FILES:${PN}-mtrace = "${bindir}/mtrace" | 47 | FILES:${PN}-mtrace = "${bindir}/mtrace" |
48 | FILES:tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump" | 48 | FILES: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 e9789c4ce0..1be7ece79d 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 f7505f1eb8..55ebf99117 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 61ce7939d3..53af7c616a 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 = "\ | |||
21 | do_install() { | 21 | do_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 |
32 | do_install:append:qemuall() { | 32 | do_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 | ||
36 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 36 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
@@ -38,6 +38,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
38 | FILES:${PN} = "\ | 38 | FILES:${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 92d35ebcf7..7ca951cdbd 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" | |||
19 | do_install() { | 19 | do_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 |
49 | FILES:${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}" | 49 | FILES:${PN} = "${systemd_system_unitdir}/*.service ${sysconfdir}" |
50 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 50 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
51 | 51 | ||
52 | ALLOW_EMPTY:${PN} = "1" | 52 | ALLOW_EMPTY:${PN} = "1" |
diff --git a/meta/recipes-core/systemd/systemd_249.3.bb b/meta/recipes-core/systemd/systemd_249.3.bb index e848eea361..c1594d7cc5 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}" | |||
406 | FILES:${PN}-gui = "${bindir}/systemadm" | 406 | FILES:${PN}-gui = "${bindir}/systemadm" |
407 | 407 | ||
408 | FILES:${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ | 408 | FILES:${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 | ||
412 | RDEPENDS:${PN}-kernel-install += "bash" | 412 | RDEPENDS:${PN}-kernel-install += "bash" |
413 | FILES:${PN}-kernel-install = "${bindir}/kernel-install \ | 413 | FILES:${PN}-kernel-install = "${bindir}/kernel-install \ |
@@ -422,8 +422,8 @@ FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" | |||
422 | FILES:${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ | 422 | FILES:${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" |
427 | RRECOMMENDS:${PN}-binfmt = "kernel-module-binfmt-misc" | 427 | RRECOMMENDS:${PN}-binfmt = "kernel-module-binfmt-misc" |
428 | 428 | ||
429 | RRECOMMENDS:${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" | 429 | RRECOMMENDS:${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 | ||
707 | FILES:udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \ | 707 | FILES: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 b693c24c4c..d5c5538cd7 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 | ||
36 | SYSTEMD_SERVICE:${PN} = "${@volatile_systemd_services(d)}" | 36 | SYSTEMD_SERVICE:${PN} = "${@volatile_systemd_services(d)}" |
37 | 37 | ||
38 | FILES:${PN} += "${systemd_unitdir}/system/*.service ${servicedir}" | 38 | FILES:${PN} += "${systemd_system_unitdir}/*.service ${servicedir}" |
39 | 39 | ||
40 | do_compile () { | 40 | do_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. |