diff options
Diffstat (limited to 'meta-fii/meta-mori/recipes-phosphor')
11 files changed, 66 insertions, 59 deletions
diff --git a/meta-fii/meta-mori/recipes-phosphor/console/obmc-console_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/console/obmc-console_%.bbappend index 90b21cd5f3..54c15d13af 100644 --- a/meta-fii/meta-mori/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-fii/meta-mori/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,30 +1,34 @@ FILESEXTRAPATHS:prepend:mori := "${THISDIR}/${PN}:" -RDEPENDS:${PN}:append:mori = " bash" - -OBMC_CONSOLE_TTYS:mori = "ttyS1 ttyS3" -SRC_URI:append:mori = " file://${BPN}@.service \ - file://host_console_uart_config.service \ - file://mori_uart_mux_ctrl.sh \ - file://server.ttyS1.conf \ - file://server.ttyS3.conf \ - " +SRC_URI:append:mori = " \ + file://${BPN}@.service \ + file://host_console_uart_config.service \ + file://mori_uart_mux_ctrl.sh \ + file://server.ttyS1.conf \ + file://server.ttyS3.conf \ +" SYSTEMD_SERVICE:${PN}:append:mori = " \ - ${BPN}@.service \ - host_console_uart_config.service \ - " + ${BPN}@.service \ + host_console_uart_config.service \ +" do_install:append:mori() { install -d ${D}${libexecdir}/${PN} - install -m 0755 ${WORKDIR}/mori_uart_mux_ctrl.sh ${D}${libexecdir}/${PN}/mori_uart_mux_ctrl.sh - install -m 0644 ${WORKDIR}/host_console_uart_config.service ${D}${systemd_unitdir}/system + install -m 0755 ${WORKDIR}/mori_uart_mux_ctrl.sh \ + ${D}${libexecdir}/${PN}/mori_uart_mux_ctrl.sh + install -m 0644 ${WORKDIR}/host_console_uart_config.service \ + ${D}${systemd_unitdir}/system # Overwrite base package's obmc-console@.service with our own - install -m 0644 ${WORKDIR}/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service + install -m 0644 ${WORKDIR}/${BPN}@.service \ + ${D}${systemd_unitdir}/system/${BPN}@.service } +RDEPENDS:${PN}:append:mori = " bash" + pkg_postinst:${PN}:append:mori () { systemctl --root=$D enable obmc-console@ttyS1.service systemctl --root=$D enable obmc-console@ttyS3.service } +OBMC_CONSOLE_TTYS:mori = "ttyS1 ttyS3" diff --git a/meta-fii/meta-mori/recipes-phosphor/fans/pwm-init.bb b/meta-fii/meta-mori/recipes-phosphor/fans/pwm-init.bb index 97daab696e..798bf2bac7 100644 --- a/meta-fii/meta-mori/recipes-phosphor/fans/pwm-init.bb +++ b/meta-fii/meta-mori/recipes-phosphor/fans/pwm-init.bb @@ -1,29 +1,27 @@ SUMMARY = "Initialize PWM sensors" DESCRIPTION = "Initialize PWM sensors" LICENSE = "CLOSED" +DEPENDS:append = " systemd" PR = "r1" -inherit systemd - -DEPENDS = "systemd" -RDEPENDS:${PN} = "bash" - -S = "${WORKDIR}" -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += " \ +SRC_URI = " \ file://pwm_init.service \ file://bin/pwm_init.sh \ - " +" -SYSTEMD_PACKAGES = "${PN}" +S = "${WORKDIR}" SYSTEMD_AUTO_ENABLE = "enable" -SYSTEMD_SERVICE:${PN} += "pwm_init.service" +SYSTEMD_SERVICE:${PN} = " pwm_init.service" -FILES:${PN} += "${bindir}/* ${systemd_system_unitdir}/*" +inherit systemd -do_install:append() { +do_install() { install -d ${D}${libexecdir}/${PN} install -m 0755 ${S}/bin/* ${D}${libexecdir}/${PN}/ install -d ${D}${systemd_system_unitdir} install -m 0644 ${S}/*.service ${D}${systemd_system_unitdir} } + +RDEPENDS:${PN}:append = " bash" + +FILES:${PN}:append = " ${bindir}/* ${systemd_system_unitdir}/*" diff --git a/meta-fii/meta-mori/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend index 3a353a2de1..967e308fbb 100644 --- a/meta-fii/meta-mori/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend +++ b/meta-fii/meta-mori/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend @@ -1,8 +1,10 @@ FILESEXTRAPATHS:prepend:mori := "${THISDIR}/${PN}:" + SRC_URI:append:mori = " file://config.json" -FILES:${PN}:append:mori = " ${datadir}/binaryblob/config.json" do_install:append:mori() { install -d ${D}${datadir}/binaryblob/ install ${WORKDIR}/config.json ${D}${datadir}/binaryblob/config.json } + +FILES:${PN}:append:mori = " ${datadir}/binaryblob/config.json" diff --git a/meta-fii/meta-mori/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend index ad45d1ab91..905611a383 100644 --- a/meta-fii/meta-mori/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend +++ b/meta-fii/meta-mori/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend @@ -1,3 +1,2 @@ PACKAGECONFIG:append:mori = " nuvoton-p2a-mbox net-bridge" - IPMI_FLASH_BMC_ADDRESS:mori = "0xF0848000" diff --git a/meta-fii/meta-mori/recipes-phosphor/leds/mori-led-manager-config-native.bb b/meta-fii/meta-mori/recipes-phosphor/leds/mori-led-manager-config-native.bb index 0a5282f4bd..843b7e39dc 100644 --- a/meta-fii/meta-mori/recipes-phosphor/leds/mori-led-manager-config-native.bb +++ b/meta-fii/meta-mori/recipes-phosphor/leds/mori-led-manager-config-native.bb @@ -1,15 +1,15 @@ SUMMARY = "Phosphor LED Group Management for mori" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PROVIDES:append = " virtual/phosphor-led-manager-config-native" +PR = "r1" -FILES:${PN} += "${datadir}/phosphor-led-manager/led.yaml" +SRC_URI = "file://led.yaml" -inherit native -PROVIDES += "virtual/phosphor-led-manager-config-native" -SRC_URI += "file://led.yaml" S = "${WORKDIR}" +inherit native + # Overwrite the example led layout yaml file prior # to building the phosphor-led-manager package do_install() { @@ -17,3 +17,5 @@ do_install() { DEST=${D}${datadir}/phosphor-led-manager install -D ${SRC}/led.yaml ${DEST}/led.yaml } + +FILES:${PN}:append = " ${datadir}/phosphor-led-manager/led.yaml" diff --git a/meta-fii/meta-mori/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index 1231cae2ac..8e85c11e94 100644 --- a/meta-fii/meta-mori/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-fii/meta-mori/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -1 +1 @@ -CHASSIS_TARGETS="" +CHASSIS_TARGETS:mori = "" diff --git a/meta-fii/meta-mori/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 84f448dc88..9299c56dea 100644 --- a/meta-fii/meta-mori/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-fii/meta-mori/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1,2 +1,4 @@ # Enable threshold, pulse, and watchdog monitoring -PACKAGECONFIG:append:mori = " log-threshold log-alarm log-pulse log-watchdog clears-sel" +PACKAGECONFIG:append:mori = " \ + log-threshold log-alarm log-pulse log-watchdog clears-sel \ +" diff --git a/meta-fii/meta-mori/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index bace54ca1f..a76d585f95 100644 --- a/meta-fii/meta-mori/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-fii/meta-mori/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,2 +1,3 @@ FILESEXTRAPATHS:append:mori := ":${THISDIR}/${PN}" + SRC_URI:append:mori = " file://chassis_capabilities.override.yml" diff --git a/meta-fii/meta-mori/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 2b62a49a9e..d321224303 100644 --- a/meta-fii/meta-mori/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-fii/meta-mori/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1,4 +1,3 @@ FILESEXTRAPATHS:append:mori := ":${THISDIR}/${PN}" SRC_URI:append:mori = " file://gpio_defs.json" - diff --git a/meta-fii/meta-mori/recipes-phosphor/smbios/smbios-mdr_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/smbios/smbios-mdr_%.bbappend index 0b7e413996..12f45c32e9 100644 --- a/meta-fii/meta-mori/recipes-phosphor/smbios/smbios-mdr_%.bbappend +++ b/meta-fii/meta-mori/recipes-phosphor/smbios/smbios-mdr_%.bbappend @@ -1,3 +1,2 @@ PACKAGECONFIG:append:mori = " smbios-ipmi-blob" - PACKAGECONFIG:remove:mori = " cpuinfo" diff --git a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend index 1eb8793046..c351919c3f 100644 --- a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -1,19 +1,36 @@ FILESEXTRAPATHS:prepend:mori := "${THISDIR}/${PN}:" - DEPENDS:append:mori = " gpioplus" -EXTRA_OEMESON:append = " -Dhost-gpios=enabled" + +SRC_URI:append:mori = " \ + file://xyz.openbmc_project.State.Chassis@.service \ + file://xyz.openbmc_project.State.Host@.service \ +" + +SYSTEMD_SERVICE:${PN}-host:append:mori = " phosphor-host-condition-gpio@.service" + +EXTRA_OEMESON:append:mori = " -Dhost-gpios=enabled" + +do_install:append:mori() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/xyz.openbmc_project.State.Chassis@.service \ + ${D}${systemd_system_unitdir}/xyz.openbmc_project.State.Chassis@.service + install -m 0644 ${WORKDIR}/xyz.openbmc_project.State.Host@.service \ + ${D}${systemd_system_unitdir}/xyz.openbmc_project.State.Host@.service +} FILES:${PN}:append:mori = " ${systemd_system_unitdir}/*" FILES:${PN}-host:append:mori = " ${bindir}/phosphor-host-condition-gpio" -SYSTEMD_SERVICE:${PN}-host:append:mori = " phosphor-host-condition-gpio@.service" +pkg_prerm:${PN}-obmc-targets:prepend:mori() { + LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service" + rm $LINK +} pkg_postinst:${PN}-obmc-targets:prepend:mori() { mkdir -p $D$systemd_system_unitdir/multi-user.target.requires LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service" TARGET="../phosphor-host-condition-gpio@.service" ln -s $TARGET $LINK } - pkg_postinst:${PN}-obmc-targets:append:mori() { rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/obmc-host-shutdown@0.target" rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/phosphor-reboot-host@0.service" @@ -23,19 +40,3 @@ pkg_postinst:${PN}-obmc-targets:append:mori() { rm "$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/obmc-host-stop@0.target" rm "$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/phosphor-reboot-host@0.service" } - -pkg_prerm:${PN}-obmc-targets:prepend:mori() { - LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service" - rm $LINK -} - -SRC_URI:append:mori = " \ - file://xyz.openbmc_project.State.Chassis@.service \ - file://xyz.openbmc_project.State.Host@.service \ - " - -do_install:append:mori() { - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/xyz.openbmc_project.State.Chassis@.service ${D}${systemd_system_unitdir}/xyz.openbmc_project.State.Chassis@.service - install -m 0644 ${WORKDIR}/xyz.openbmc_project.State.Host@.service ${D}${systemd_system_unitdir}/xyz.openbmc_project.State.Host@.service -} |