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/glibc | |
| 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/glibc')
| -rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 6 |
1 files changed, 3 insertions, 3 deletions
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 |