diff options
Diffstat (limited to 'meta-quanta/meta-gsj/recipes-phosphor')
9 files changed, 41 insertions, 41 deletions
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 13d037e41..1160fcfc6 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,25 +1,25 @@ -FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" -SRC_URI_append_gsj = " file://config-8ssd.json" -SRC_URI_append_gsj = " file://config-2ssd.json" -SRC_URI_append_gsj = " file://fan-control.sh" -SRC_URI_append_gsj = " file://fan-default-speed.sh" -SRC_URI_append_gsj = " file://phosphor-pid-control.service" -SRC_URI_append_gsj = " file://fan-reboot-control.service" -SRC_URI_append_gsj = " file://fan-boot-control.service" +FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:" +SRC_URI:append:gsj = " file://config-8ssd.json" +SRC_URI:append:gsj = " file://config-2ssd.json" +SRC_URI:append:gsj = " file://fan-control.sh" +SRC_URI:append:gsj = " file://fan-default-speed.sh" +SRC_URI:append:gsj = " file://phosphor-pid-control.service" +SRC_URI:append:gsj = " file://fan-reboot-control.service" +SRC_URI:append:gsj = " file://fan-boot-control.service" -FILES_${PN}_append_gsj = " ${datadir}/swampd/config-8ssd.json" -FILES_${PN}_append_gsj = " ${datadir}/swampd/config-2ssd.json" -FILES_${PN}_append_gsj = " ${bindir}/fan-control.sh" -FILES_${PN}_append_gsj = " ${bindir}/fan-default-speed.sh" +FILES:${PN}:append:gsj = " ${datadir}/swampd/config-8ssd.json" +FILES:${PN}:append:gsj = " ${datadir}/swampd/config-2ssd.json" +FILES:${PN}:append:gsj = " ${bindir}/fan-control.sh" +FILES:${PN}:append:gsj = " ${bindir}/fan-default-speed.sh" inherit systemd -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" -SYSTEMD_SERVICE_${PN}_append_gsj = " phosphor-pid-control.service" -SYSTEMD_SERVICE_${PN}_append_gsj = " fan-reboot-control.service" -SYSTEMD_SERVICE_${PN}_append_gsj = " fan-boot-control.service" +SYSTEMD_SERVICE:${PN}:append:gsj = " phosphor-pid-control.service" +SYSTEMD_SERVICE:${PN}:append:gsj = " fan-reboot-control.service" +SYSTEMD_SERVICE:${PN}:append:gsj = " fan-boot-control.service" -do_install_append_gsj() { +do_install:append:gsj() { install -d ${D}/${bindir} install -m 0755 ${WORKDIR}/fan-control.sh ${D}/${bindir} install -m 0755 ${WORKDIR}/fan-default-speed.sh ${D}/${bindir} diff --git a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend index 7d217b7d9..dc75f60e6 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,8 +1,8 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " quanta-nvme-powerctrl" -OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-nvme" -OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-pid-control" -OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " detect-fan-fail" -OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " google-ipmi-sys" -OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " gsj-hotswap-change-setting" -OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " iperf3" -IMAGE_FEATURES_remove_gsj = "obmc-user-mgmt-ldap" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " quanta-nvme-powerctrl" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-nvme" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-pid-control" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " detect-fan-fail" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " google-ipmi-sys" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " gsj-hotswap-change-setting" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " iperf3" +IMAGE_FEATURES:remove:gsj = "obmc-user-mgmt-ldap" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 5723801b2..45c2ab20b 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend index a51d07ef8..10b1d2901 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_gsj = " net-bridge reboot-update static-bmc" +PACKAGECONFIG:append:gsj = " net-bridge reboot-update static-bmc" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 32989f2bb..2fb5443fb 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,6 @@ inherit obmc-phosphor-systemd -FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:" EEPROM_NAMES = "hsbp bmc" @@ -10,11 +10,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_gsj := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj := " ${@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_gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK_${PN}:append:gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index f695261ba..70b2b63f2 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # Replace the default whitelist for GSJ board. -SRC_URI_append_gsj = " file://gsj-ipmid-whitelist.conf" +SRC_URI:append:gsj = " file://gsj-ipmid-whitelist.conf" -WHITELIST_CONF_remove_gsj = " ${S}/host-ipmid-whitelist.conf" -WHITELIST_CONF_append_gsj = " ${WORKDIR}/gsj-ipmid-whitelist.conf" +WHITELIST_CONF:remove:gsj = " ${S}/host-ipmid-whitelist.conf" +WHITELIST_CONF:append:gsj = " ${WORKDIR}/gsj-ipmid-whitelist.conf" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend index ac2c0ba5e..aee769c32 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -1,3 +1,3 @@ # In gsj, usb0 is the interface. -RMCPP_IFACE_gsj = "usb0" +RMCPP_IFACE:gsj = "usb0" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index e2d753040..4363aa352 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" NAMES = " \ @@ -15,9 +15,9 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS += "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gsj = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # Fan sensors FITEMS = "pwm-fan-controller@103000.conf" FENVS = "obmc/hwmon/ahb/apb/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gsj = " ${@compose_list(d, 'FENVS', 'FITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj = " ${@compose_list(d, 'FENVS', 'FITEMS')}" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 53db04d03..bbc797a45 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${BPN}:" -SRC_URI_append_gsj = " file://time-default.override.yml" -SRC_URI_append_gsj = " file://restrictionmode-default-whitelist.override.yml" +FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${BPN}:" +SRC_URI:append:gsj = " file://time-default.override.yml" +SRC_URI:append:gsj = " file://restrictionmode-default-whitelist.override.yml" |