From ca3e1d9f86212282ca59f384055497eb0d156d49 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Thu, 12 Aug 2021 10:21:36 +0000 Subject: meta-ampere: fix compilation error with latest Yocto Make the following changes to fix compilation errors: 1. Add honister to LAYERSERIES_COMPAT 2. Increase CONF_VERSION to 2. 3. Fix mistake on previous change on Yocto syntax update. Tested: 1. Compile OpenBMC for Mt.Jade without error. Signed-off-by: Thang Q. Nguyen Change-Id: I5ac3f568d776109955759fab78844b1d38a51af1 --- meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb | 4 ++-- .../meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb | 4 ++-- meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb | 4 ++-- .../recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend | 4 ++-- meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb | 9 ++++----- .../gpio/psu-hotswap-reset/psu1_hotswap_reset.service | 2 +- .../gpio/psu-hotswap-reset/psu2_hotswap_reset.service | 2 +- .../meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend | 4 ++-- .../meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 2 +- 9 files changed, 17 insertions(+), 18 deletions(-) (limited to 'meta-ampere/meta-jade/recipes-phosphor') diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb index 4994183a0..49376ee9b 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb @@ -19,7 +19,7 @@ do_install() { OBMC_FAULT_MONITOR_INSTANCES = "s0_fault_alert s1_fault_alert" -SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/gpio/s0_fault_alert \ +SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/gpio/s0_fault_alert \ obmc/gpio/s1_fault_alert \ " @@ -29,5 +29,5 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "ampere_fault_led.service" -SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_FAULT_MONITOR_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_FAULT_MONITOR_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb index 79bfb726e..cde625f5b 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb @@ -10,7 +10,7 @@ RDEPENDS:${PN} += "virtual/obmc-gpio-monitor" OBMC_HOST_ACK_MONITOR_INSTANCES = "reboot_ack shutdown_ack" -SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/reboot_ack \ +SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/reboot_ack \ obmc/gpio/shutdown_ack \ " @@ -20,4 +20,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "ampere-host-shutdown-ack@.service" -SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_ACK_MONITOR_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_ACK_MONITOR_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb index c1a616a9c..8e57c3ea2 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb @@ -16,7 +16,7 @@ do_install() { ${D}${bindir}/toggle_identify_led.sh } -SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/id_button" +SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button" ID_BUTTON_SERVICE = "id_button" @@ -26,4 +26,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" -SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 527cbbda0..c6400c2f0 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -5,8 +5,8 @@ INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK:${PN}-presence:append:mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK_${PN}-presence:append:mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb index 90c4520d1..2ca18a0be 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb @@ -13,7 +13,7 @@ OBMC_PSU_MONITOR_INSTANCES = "PSU1_B25 PSU2_B25" # Copies config file having arguments for psu # via GPIO assertion -SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/PSU1_B25 \ +SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/PSU1_B25 \ obmc/gpio/PSU2_B25 \ " SYSTEMD_SERVICE:${PN} ?= "psu1_hotswap_reset.service psu2_hotswap_reset.service" @@ -21,13 +21,12 @@ SYSTEMD_SERVICE:${PN} ?= "psu1_hotswap_reset.service psu2_hotswap_reset.service" SRC_URI += "file://ampere_psu_reset_hotswap.sh" do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/ampere_psu_reset_hotswap.sh \ - ${D}${bindir}/ampere_psu_reset_hotswap.sh + install -d ${D}${sbindir} + install -m 0755 ${WORKDIR}/ampere_psu_reset_hotswap.sh ${D}${sbindir}/ } GPIO_MONITOR_TMPL = "phosphor-gpio-monitor@.service" GPIO_MONITOR_TGTFMT = "phosphor-gpio-monitor@{0}.service" TGT = "multi-user.target" PSU_MONITOR_FMT = "../${GPIO_MONITOR_TMPL}:${TGT}.requires/${GPIO_MONITOR_TGTFMT}" -SYSTEMD_LINK:${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_PSU_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_PSU_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu1_hotswap_reset.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu1_hotswap_reset.service index fec3ad6a2..9694d2a70 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu1_hotswap_reset.service +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu1_hotswap_reset.service @@ -3,4 +3,4 @@ Description=Ampere Computing LLC PSU1 reset hotswap [Service] Restart=no -ExecStart=ampere_psu_reset_hotswap.sh 1 +ExecStart=/usr/sbin/ampere_psu_reset_hotswap.sh 1 diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu2_hotswap_reset.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu2_hotswap_reset.service index fdb8692a5..c94b42a4b 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu2_hotswap_reset.service +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu2_hotswap_reset.service @@ -3,4 +3,4 @@ Description=Ampere Computing LLC PSU2 reset hotswap [Service] Restart=no -ExecStart=ampere_psu_reset_hotswap.sh 2 +ExecStart=/usr/sbin/ampere_psu_reset_hotswap.sh 2 diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 5150e2312..d7128f4f4 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -16,11 +16,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK:${PN}:append:mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK_${PN}:append:mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 11cdbe666..b93843773 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -21,7 +21,7 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS_${MACHINE}')}" ITEMS += "iio-hwmon.conf iio-hwmon-adc14.conf iio-hwmon-battery.conf" ENVS = "obmc/${MACHINE}/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}" do_install:append:mtjade() { SOURCEDIR="${WORKDIR}/obmc/${MACHINE}/hwmon" -- cgit v1.2.3