From abeb2e95c6e5b286283dfe7198d5a222f7139458 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Thu, 26 Aug 2021 05:42:06 -0400 Subject: 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 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-extended/at/at_3.2.2.bb | 6 +++--- meta/recipes-extended/cronie/cronie_1.5.7.bb | 6 +++--- meta/recipes-extended/iputils/iputils_20210722.bb | 4 ++-- meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb | 6 +++--- meta/recipes-extended/man-db/man-db_2.9.4.bb | 2 +- meta/recipes-extended/mdadm/mdadm_4.1.bb | 2 +- meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb | 2 +- meta/recipes-extended/sysstat/sysstat.inc | 6 +++--- meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb | 6 +++--- 9 files changed, 20 insertions(+), 20 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/at/at_3.2.2.bb b/meta/recipes-extended/at/at_3.2.2.bb index efe569479b..14b9dace2a 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 () { install -m 0755 ${WORKDIR}/atd.init ${D}${sysconfdir}/init.d/atd # install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_system_unitdir} + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/atd.service if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then 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 2cbae591b0..72a45089fd 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 () { install -m 0755 ${WORKDIR}/crond.init ${D}${sysconfdir}/init.d/crond # install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_unitdir}/system + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_system_unitdir} sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ - ${D}${systemd_unitdir}/system/crond.service + ${D}${systemd_system_unitdir}/crond.service # below are necessary for a complete cron environment 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 cafb0f634e..a9821e556f 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" PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," -PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd" +PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_system_unitdir},,systemd" PACKAGECONFIG[tftpd] = "-DBUILD_TFTPD=true, -DBUILD_TFTPD=false," PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," PACKAGECONFIG[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" FILES:${PN}-traceroute6 = "${base_bindir}/traceroute6" FILES:${PN}-clockdiff = "${base_bindir}/clockdiff" FILES:${PN}-tftpd = "${base_bindir}/tftpd ${sysconfdir}/xinetd.d/tftp" -FILES:${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd@.service" +FILES:${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_system_unitdir}/rarpd@.service" FILES:${PN}-rdisc = "${base_sbindir}/rdisc" FILES:${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.59.bb index f74016f834..8cb3a9a18c 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() { install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_unitdir}/system + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_system_unitdir} sed -i -e 's,@SBINDIR@,${sbindir},g' \ -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@BASE_BINDIR@,${base_bindir},g' \ - ${D}${systemd_unitdir}/system/lighttpd.service + ${D}${systemd_system_unitdir}/lighttpd.service #For FHS compliance, create symbolic links to /var/log and /var/tmp for logs and temporary data ln -sf ${localstatedir}/log ${D}/www/logs 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 b068af95d8..f97974abb8 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" inherit gettext pkgconfig autotools systemd -EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_unitdir}/system" +EXTRA_OECONF = "--with-pager=less --with-systemdsystemunitdir=${systemd_system_unitdir}" EXTRA_AUTORECONF += "-I ${S}/gl/m4" PACKAGECONFIG[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 062797afe6..35535aef86 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__' CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' -EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_unitdir}/system \ +EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev"' DEBUG_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 e58214d55a..344faa37a4 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 / \ --shell /bin/false --user-group rpc" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/, \ +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}/, \ --without-systemdsystemunitdir, \ systemd \ " diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 14c6f07784..8345c1e3d1 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -51,9 +51,9 @@ do_install() { # Unless both cron and systemd are enabled, install our own # systemd unit file. Otherwise the package will install one. if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_unitdir}/system - sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/sysstat.service + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir} + sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service fi fi } 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 ec90de830d..da051c119f 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() { install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" # Install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_unitdir}/system + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_system_unitdir} sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ - ${D}${systemd_unitdir}/system/xinetd.service + ${D}${systemd_system_unitdir}/xinetd.service } RDEPENDS:${PN} += "perl" -- cgit v1.2.3-54-g00ecf