diff options
Diffstat (limited to 'meta-ibm/recipes-core/systemd/systemd_%.bbappend')
| -rw-r--r-- | meta-ibm/recipes-core/systemd/systemd_%.bbappend | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/meta-ibm/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/recipes-core/systemd/systemd_%.bbappend index 3e490153d..354ea4055 100644 --- a/meta-ibm/recipes-core/systemd/systemd_%.bbappend +++ b/meta-ibm/recipes-core/systemd/systemd_%.bbappend @@ -1,27 +1,33 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_ibm-ac-server = " file://journald-storage-policy.conf" -SRC_URI_append_ibm-ac-server = " file://systemd-journald-override.conf" -SRC_URI_append_ibm-ac-server = " file://journald-size-policy-2MB.conf" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI:append:ibm-ac-server = " file://journald-storage-policy.conf" +SRC_URI:append:ibm-ac-server = " file://systemd-journald-override.conf" +SRC_URI:append:ibm-ac-server = " file://journald-size-policy-2MB.conf" -SRC_URI_append_p10bmc = " file://journald-storage-policy.conf" -SRC_URI_append_p10bmc = " file://systemd-journald-override.conf" -SRC_URI_append_p10bmc = " file://journald-size-policy-16MB.conf" +SRC_URI:append:p10bmc = " file://journald-storage-policy.conf" +SRC_URI:append:p10bmc = " file://systemd-journald-override.conf" +SRC_URI:append:p10bmc = " file://journald-size-policy-16MB.conf" -FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" -FILES_${PN}_append_ibm-ac-server = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" -FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" +FILES:${PN}:append:ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" +FILES:${PN}:append:ibm-ac-server = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" +FILES:${PN}:append:ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" -FILES_${PN}_append_p10bmc = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" -FILES_${PN}_append_p10bmc = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" -FILES_${PN}_append_p10bmc = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" +FILES:${PN}:append:p10bmc = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" +FILES:${PN}:append:p10bmc = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" +FILES:${PN}:append:p10bmc = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" -do_install_append_ibm-ac-server() { +do_install:append:ibm-ac-server() { install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf install -m 644 -D ${WORKDIR}/journald-size-policy-2MB.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf } -do_install_append_p10bmc() { +do_install:append:p10bmc() { install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf install -m 644 -D ${WORKDIR}/journald-size-policy-16MB.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf } + +# Witherspoon doesn't have the space for the both zstd and xz compression +# libraries and currently phosphor-debug-collector is using xz. Switch systemd +# to use xz so only one of the two is added into the image. +PACKAGECONFIG:remove:witherspoon = "zstd" +PACKAGECONFIG:append:witherspoon = " xz" |