diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-30 14:23:37 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-02 15:15:51 +0100 |
| commit | 0ea63b6a439fe97f840c69d08cf381687baaae3f (patch) | |
| tree | c632ba15d6b67617859f335fe9263930cbf1a0fa /meta/recipes-extended/sysstat | |
| parent | 3288587aeb009fb65652776242c0a526b90771e2 (diff) | |
| download | poky-0ea63b6a439fe97f840c69d08cf381687baaae3f.tar.gz | |
recipes: Update WORKDIR references to UNPACKDIR
Since we want to be able to stop unpacking to WORKDIR, correct the WORKDIR
references in recipe do_compile/do_install tasks to use UNPACKDIR in the
appropraite places instead.
(From OE-Core rev: d73595df69667fe9d12ecd407b77a0b8dae2109c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sysstat')
| -rw-r--r-- | meta/recipes-extended/sysstat/sysstat_12.7.5.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-extended/sysstat/sysstat_12.7.5.bb b/meta/recipes-extended/sysstat/sysstat_12.7.5.bb index 150f4932d8..d598d5366f 100644 --- a/meta/recipes-extended/sysstat/sysstat_12.7.5.bb +++ b/meta/recipes-extended/sysstat/sysstat_12.7.5.bb | |||
| @@ -45,7 +45,7 @@ do_install() { | |||
| 45 | rm -rf ${D}/var | 45 | rm -rf ${D}/var |
| 46 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 46 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
| 47 | install -d ${D}/etc/default/volatiles | 47 | install -d ${D}/etc/default/volatiles |
| 48 | install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles | 48 | install -m 0644 ${UNPACKDIR}/99_sysstat ${D}/etc/default/volatiles |
| 49 | fi | 49 | fi |
| 50 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 50 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
| 51 | install -d ${D}${nonarch_libdir}/tmpfiles.d | 51 | install -d ${D}${nonarch_libdir}/tmpfiles.d |
| @@ -56,7 +56,7 @@ do_install() { | |||
| 56 | # systemd unit file. Otherwise the package will install one. | 56 | # systemd unit file. Otherwise the package will install one. |
| 57 | if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then | 57 | if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then |
| 58 | install -d ${D}${systemd_system_unitdir} | 58 | install -d ${D}${systemd_system_unitdir} |
| 59 | install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir} | 59 | install -m 0644 ${UNPACKDIR}/sysstat.service ${D}${systemd_system_unitdir} |
| 60 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service | 60 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service |
| 61 | fi | 61 | fi |
| 62 | fi | 62 | fi |
