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-connectivity/nfs-utils | |
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-connectivity/nfs-utils')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb | 18 |
1 files changed, 9 insertions, 9 deletions
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 a655de2aca..459f68f05e 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" |
89 | RDEPENDS:${PN}-client = "${PN}-mount rpcbind" | 89 | RDEPENDS:${PN}-client = "${PN}-mount rpcbind" |
90 | 90 | ||
91 | FILES:${PN}-mount = "${base_sbindir}/*mount.nfs*" | 91 | FILES:${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 |