mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
3a70262357
commit
abeb2e95c6
@@ -129,7 +129,7 @@ do_install () {
|
||||
export DESTDIR="${D}"
|
||||
export LIBDIR="${base_libdir}"
|
||||
export PKGLIBDIR="${base_libdir}/bootchart"
|
||||
export SYSTEMD_UNIT_DIR="${systemd_unitdir}/system"
|
||||
export SYSTEMD_UNIT_DIR="${systemd_system_unitdir}"
|
||||
|
||||
oe_runmake install
|
||||
install -d ${D}${sysconfdir}/init.d
|
||||
|
||||
@@ -52,9 +52,9 @@ do_install() {
|
||||
install -d ${D}${sysconfdir}/default
|
||||
install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/
|
||||
install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc
|
||||
install -d ${D}${systemd_unitdir}/system/
|
||||
install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_unitdir}/system
|
||||
sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/distcc.service
|
||||
install -d ${D}${systemd_system_unitdir}/
|
||||
install -m 0644 ${WORKDIR}/distcc.service ${D}${systemd_system_unitdir}
|
||||
sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/distcc.service
|
||||
}
|
||||
|
||||
FILES:${PN}-server = "${sysconfdir} \
|
||||
|
||||
@@ -33,13 +33,13 @@ do_install() {
|
||||
install -d ${D}${sysconfdir}/init.d/
|
||||
install -m 0755 ${WORKDIR}/run-postinsts.init ${D}${sysconfdir}/init.d/run-postinsts
|
||||
|
||||
install -d ${D}${systemd_unitdir}/system/
|
||||
install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system/
|
||||
install -d ${D}${systemd_system_unitdir}/
|
||||
install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_system_unitdir}/
|
||||
|
||||
sed -i -e 's:#SYSCONFDIR#:${sysconfdir}:g' \
|
||||
-e 's:#SBINDIR#:${sbindir}:g' \
|
||||
-e 's:#BASE_BINDIR#:${base_bindir}:g' \
|
||||
-e 's:#LOCALSTATEDIR#:${localstatedir}:g' \
|
||||
${D}${sbindir}/run-postinsts \
|
||||
${D}${systemd_unitdir}/system/run-postinsts.service
|
||||
${D}${systemd_system_unitdir}/run-postinsts.service
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ do_configure:prepend() {
|
||||
rm -f ${S}/m4/intltool.m4
|
||||
}
|
||||
|
||||
FILES:${PN} += "${systemd_unitdir}/systemd-bootchart"
|
||||
FILES:${PN} += "${systemd_system_unitdir}d-bootchart"
|
||||
|
||||
EXTRA_OECONF = " --with-rootprefix=${root_prefix} \
|
||||
--with-rootlibdir=${base_libdir}"
|
||||
|
||||
@@ -56,8 +56,8 @@ do_install() {
|
||||
oe_runmake install INSTALLROOT=${D}
|
||||
install -d ${D}${sysconfdir}/init.d/
|
||||
install -m 0755 ${WORKDIR}/tcf-agent.init ${D}${sysconfdir}/init.d/tcf-agent
|
||||
install -d ${D}${systemd_unitdir}/system
|
||||
install -m 0644 ${WORKDIR}/tcf-agent.service ${D}${systemd_unitdir}/system
|
||||
sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tcf-agent.service
|
||||
install -d ${D}${systemd_system_unitdir}
|
||||
install -m 0644 ${WORKDIR}/tcf-agent.service ${D}${systemd_system_unitdir}
|
||||
sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/tcf-agent.service
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user