diff options
53 files changed, 1052 insertions, 997 deletions
diff --git a/meta-aspeed/recipes-bsp/u-boot/files/save-default-environment-on-crc-fail.patch b/meta-aspeed/recipes-bsp/u-boot/files/save-default-environment-on-crc-fail.patch new file mode 100644 index 000000000..a6b58b6dd --- /dev/null +++ b/meta-aspeed/recipes-bsp/u-boot/files/save-default-environment-on-crc-fail.patch @@ -0,0 +1,14 @@ +diff --git a/common/env_common.c b/common/env_common.c +index 13db7dc..00ca394 100644 +--- a/common/env_common.c ++++ b/common/env_common.c +@@ -122,6 +122,9 @@ void set_default_env(const char *s) + 0, NULL) == 0) + error("Environment import failed: errno = %d\n", errno); + ++ puts("Storing new environment in Flash\n\n"); ++ saveenv(); ++ + gd->flags |= GD_FLG_ENV_READY; + gd->flags |= GD_FLG_ENV_DEFAULT; + } diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb index ac1ead714..1409ca786 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb @@ -1,6 +1,8 @@ require u-boot-common-aspeed_${PV}.inc require recipes-bsp/u-boot/u-boot.inc +SRC_URI += "file://save-default-environment-on-crc-fail.patch" + PROVIDES += "u-boot" DEPENDS += "dtc-native" diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb index e9f724df2..4c73670e6 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb @@ -28,6 +28,11 @@ do_install () { install -d ${D}${sysconfdir} install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config install -m 644 ${WORKDIR}/alt_fw_env.config ${D}${sysconfdir}/alt_fw_env.config + + install -d ${STAGING_DIR}/bin + install -m 755 ${S}/tools/env/fw_printenv ${STAGING_DIR}/bin/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${STAGING_DIR}/bin/fw_setenv + install -m 644 ${WORKDIR}/fw_env.config ${STAGING_DIR}/fw_env.config } do_install_class-cross () { diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb index 42bc7a306..71e7a9d2a 100644 --- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_git.bb @@ -23,6 +23,11 @@ do_install () { install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config + + install -d ${STAGING_DIR}/bin + install -m 755 ${S}/tools/env/fw_printenv ${STAGING_DIR}/bin/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${STAGING_DIR}/bin/fw_setenv + install -m 644 ${WORKDIR}/fw_env.config ${STAGING_DIR}/fw_env.config } do_install_class-cross () { diff --git a/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb b/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb index 6a806ffba..ed864b865 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb @@ -31,7 +31,7 @@ FILES_libvncclient = "${libdir}/libvncclient.*" inherit cmake SRC_URI = "git://github.com/LibVNC/libvncserver" -SRCREV = "c0a23857a5c42b45b6d22ccf7218becd1fa69402" +SRCREV = "74a937c75de916624ddce6633da5f4fd89fa94e9" S = "${WORKDIR}/git" diff --git a/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd/state_hook b/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd/state_hook new file mode 100755 index 000000000..0df6ff973 --- /dev/null +++ b/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd/state_hook @@ -0,0 +1,68 @@ +#!/bin/sh + +if [ $# -ne 2 ] +then + echo "usage: $0 <start|stop> <config>" >&2 + exit 1 +fi + +action=$1 +config=$2 + +gadget_name=mass-storage +gadget_dir=/sys/kernel/config/usb_gadget/$gadget_name + +case "$config" in +0) + nbd_device=/dev/nbd0 + ;; +*) + echo "invalid config $config" >&2 + exit 1 + ;; +esac + +set -ex + +case "$action" in +start) + mkdir -p $gadget_dir + ( + cd $gadget_dir + # http://www.linux-usb.org/usb.ids + # |-> 1d6b Linux Foundation + # |-> 0104 Multifunction Composite Gadget + echo "0x1d6b" > idVendor + echo "0x0104" > idProduct + mkdir -p strings/0x409 + echo "OpenBMC" > strings/0x409/manufacturer + echo "Virtual Media Device" > strings/0x409/product + mkdir -p configs/c.1/strings/0x409 + echo "config 1" > configs/c.1/strings/0x409/configuration + mkdir -p functions/mass_storage.usb0 + ln -s functions/mass_storage.usb0 configs/c.1 + echo 1 > functions/mass_storage.usb0/lun.0/removable + echo 1 > functions/mass_storage.usb0/lun.0/ro + echo 0 > functions/mass_storage.usb0/lun.0/cdrom + echo $nbd_device > functions/mass_storage.usb0/lun.0/file + echo "1e6a0000.usb-vhub:p4" > UDC + ) + ;; +stop) + ( + cd $gadget_dir + rm configs/c.1/mass_storage.usb0 + rmdir functions/mass_storage.usb0 + rmdir configs/c.1/strings/0x409 + rmdir configs/c.1 + rmdir strings/0x409 + ) + rmdir $gadget_dir + ;; +*) + echo "invalid action $action" >&2 + exit 1 +esac + +exit 0 + diff --git a/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend b/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend new file mode 100644 index 000000000..3ccc08798 --- /dev/null +++ b/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +FILES_${PN} += "${sysconfdir}/nbd-proxy/state" +SRC_URI += "file://state_hook" + +do_install_append() { + install -d ${D}${sysconfdir}/nbd-proxy/ + install -m 0755 ${WORKDIR}/state_hook ${D}${sysconfdir}/nbd-proxy/state +} diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 5981066b8..d0005629b 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -73,7 +73,7 @@ IMAGE_FEATURES += " \ obmc-software \ obmc-system-mgmt \ obmc-user-mgmt \ - ssh-server-dropbear \ + ssh-server-openssh \ obmc-debug-collector \ obmc-network-mgmt \ obmc-settings-mgmt \ diff --git a/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb b/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb index f9195476d..b31e3885e 100644 --- a/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb +++ b/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb @@ -14,8 +14,8 @@ RDEPENDS_${PN} += "nbd-client" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/jsnbd" -SRCREV = "d5b9857609401e3cf9c53b111134a6aab8e4573c" +SRC_URI = "git://scm.raptorcs.com/scm/git/jsnbd;protocol=https" +SRCREV = "bcc6cc5bcadb20005ae03c8c4a4eb87006f0d222" NBD_PROXY_CONFIG_JSON ??= "${S}/config.sample.json" diff --git a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb index 65bfc12c5..2ce544a00 100644 --- a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb +++ b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=75859989545e37968a99b631ef42722e" DEPENDS = " libvncserver systemd sdbusplus phosphor-logging phosphor-dbus-interfaces" -SRC_URI = "git://github.com/openbmc/obmc-ikvm" -SRCREV = "63c3ea18c3ad560fb30d952e37a084c9d730b78a" +SRC_URI = "git://scm.raptorcs.com/scm/git/obmc-ikvm;protocol=https" +SRCREV = "861337e8ec92767c4c88237ec5db494a2a67fa8d" PV = "1.0+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service index 82ffe7919..6fa97466a 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service +++ b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service @@ -1,12 +1,14 @@ [Unit] Description=Phosphor Host Console SSH Per-Connection Wants=obmc-console@{OBMC_CONSOLE_HOST_TTY}.service +Wants=sshdgenkeys.service [Service] -Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear" -EnvironmentFile={envfiledir}/dropbear -ExecStart=-/usr/bin/env dropbear -i -r ${{DROPBEAR_RSAKEY_DIR}}/dropbear_rsa_host_key -c "/usr/bin/env obmc-console-client" $DROPBEAR_EXTRA_ARGS -SyslogIdentifier=dropbear -ExecReload={base_bindir}/kill -HUP $MAINPID +Environment="SSHD_OPTS=" +EnvironmentFile=-/etc/default/ssh +ExecStart=-@SBINDIR@/sshd -i -o ForceCommand="/usr/bin/env obmc-console-client" +SyslogIdentifier=sshd +ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID StandardInput=socket +StandardError=syslog KillMode=process diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index 12aacdf4c..410547f4b 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -6,14 +6,15 @@ PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit flto-automake pkgconfig +inherit autotools pkgconfig inherit phosphor-pid-control inherit obmc-phosphor-ipmiprovider-symlink +inherit systemd S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "ce6a3f36cedc2f822fb446bc5094eaeab47eb4af" +SRC_URI = "git://scm.raptorcs.com/scm/git/phosphor-pid-control;protocol=https" +SRCREV = "3660b3888af789266b6c84714b4e161a32e6ea54" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if @@ -24,7 +25,6 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "sdbusplus" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "phosphor-logging" -DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "libevdev" DEPENDS += "nlohmann-json" DEPENDS += "cli11" @@ -33,6 +33,14 @@ DEPENDS += "boost" # We depend on this to be built first so we can build our providers. DEPENDS += "phosphor-ipmi-host" +SERVICE_FILE = "phosphor-pid-control.service" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "${SERVICE_FILE}" + +EXTRA_OECONF = " \ + SYSTEMD_TARGET="multi-user.target" \ + " + FILES_${PN} = "${bindir}/swampd ${bindir}/setsensor" # The following installs the OEM IPMI handler for the fan controls. diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-update.sh b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-update.sh index 278cd41d7..c342e504d 100755 --- a/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-update.sh +++ b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-update.sh @@ -232,6 +232,14 @@ done if test -n "$doflash" then + mkdir -p /var/lock + + BMC_MAC_ADDRESS=$(fw_printenv -n ethaddr) + if test -n "$BMC_MAC_ADDRESS" + then + echo "Detected RCS BMC MAC address $BMC_MAC_ADDRESS" + fi + for f in $imglist do if test ! -s $f @@ -240,6 +248,29 @@ then rm $f continue fi + + UPDATE_IMAGE_MAC=0 + if test -n "$BMC_MAC_ADDRESS" + then + if test "${f#$image}" = "bmc" + then + UPDATE_IMAGE_MAC=1 + fi + if test "${f#$image}" = "u-boot" + then + UPDATE_IMAGE_MAC=1 + fi + fi + + if test $UPDATE_IMAGE_MAC -eq 1 + then + echo "Restoring RCS BMC MAC address..." + bbe -e "s/rptaddr=01:23:45:67:89:ab/ethaddr=${BMC_MAC_ADDRESS}/" -o /run/initramfs/${f#$image}.modified $f + rm $f + bbe -e "s/rpt1addr=01:23:45:67:89:ab/eth1addr=${BMC_MAC_ADDRESS}/" -o $f /run/initramfs/${f#$image}.modified + rm /run/initramfs/${f#$image}.modified + fi + m=$(findmtd ${f#$image}) echo "Updating ${f#$image}..." flashcp -v $f /dev/$m && rm $f diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/files/whitelist b/meta-phosphor/recipes-phosphor/initrdscripts/files/whitelist index 20f1ec2a6..3dfc7a40f 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/files/whitelist +++ b/meta-phosphor/recipes-phosphor/initrdscripts/files/whitelist @@ -6,6 +6,11 @@ /etc/resolv.conf /etc/shadow /etc/systemd/network +/etc/ssh/ssh_host_ecdsa_key +/etc/ssh/ssh_host_ecdsa_key.pub +/etc/ssh/ssh_host_ed25519_key +/etc/ssh/ssh_host_ed25519_key.pub +/etc/ssh/ssh_host_rsa_key /var/cache/obmc /var/lib/obmc /var/lib/phosphor-inventory-manager diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb b/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb index ab2c38e90..be18a7cb1 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb +++ b/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb @@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d71 PR = "r1" -inherit allarch +INSANE_SKIP_${PN} += "already-stripped" + +DEPENDS += "${@d.getVar('PREFERRED_PROVIDER_u-boot', True) or 'u-boot'}" +DEPENDS += "${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'}" RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" @@ -29,7 +32,14 @@ do_install() { install -m 0644 ${WORKDIR}/whitelist ${D}/whitelist install -d ${D}/dev mknod -m 622 ${D}/dev/console c 5 1 + + install -d ${D}/etc + install -m 0644 ${STAGING_DIR}/fw_env.config ${D}/etc/fw_env.config + install -d ${D}/bin + install -m 0755 ${STAGING_DIR}/bin/fw_printenv ${D}/bin/fw_printenv + install -m 0755 ${STAGING_DIR}/bin/bbe ${D}/bin/bbe } FILES_${PN} += " /init /shutdown /update /whitelist /dev " FILES_${PN} += " /init-options /init-download-url " +FILES_${PN} += " /bin/fw_printenv /bin/bbe " diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb/0001-Increase-request-limit.patch b/meta-phosphor/recipes-phosphor/interfaces/bmcweb/0001-Increase-request-limit.patch new file mode 100644 index 000000000..ce710cbfd --- /dev/null +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb/0001-Increase-request-limit.patch @@ -0,0 +1,15 @@ +diff --git a/crow/include/crow/http_connection.h b/crow/include/crow/http_connection.h +index 6f44186..6c23b63 100644 +--- a/crow/include/crow/http_connection.h ++++ b/crow/include/crow/http_connection.h +@@ -241,8 +241,8 @@ typename std::enable_if<(N > 0)>::type + static std::atomic<int> connectionCount; + #endif + +-// request body limit size: 30M +-constexpr unsigned int httpReqBodyLimit = 1024 * 1024 * 30; ++// request body limit size: 128M ++constexpr unsigned int httpReqBodyLimit = 1024 * 1024 * 128; + + template <typename Adaptor, typename Handler, typename... Middlewares> + class Connection diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 3fd1f4e35..e6f50e12f 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -12,10 +12,12 @@ GROUPMEMS_PARAM_${PN} = "-g web -a root; -g redfish -a root" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" -SRC_URI = "git://github.com/openbmc/bmcweb.git" +SRC_URI = "git://scm.raptorcs.com/scm/git/bmcweb;protocol=https \ + file://0001-Increase-request-limit.patch \ + " PV = "1.0+git${SRCPV}" -SRCREV = "4418c7f0ddcc5d3518831729a380a0b67e5d4093" +SRCREV = "1bfbe0e0372de7991bab9bb0a7ba015356f7d3b2" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index d08dfdc40..ea4f76b3d 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -11,5 +11,5 @@ inherit autotools pkgconfig DEPENDS += "autoconf-archive-native" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/ipmi-blob-tool" -SRCREV = "06561460bded9bf42398d987ac87bcec170740aa" +SRC_URI = "git://scm.raptorcs.com/scm/git/ipmi-blob-tool;protocol=https" +SRCREV = "00f39b84037a840a1b169a8017be75ac6636cb6f" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb index 58ef897a0..b87933fb9 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb @@ -15,8 +15,8 @@ DEPENDS += "phosphor-logging" DEPENDS += "ipmi-blob-tool" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs" -SRCREV = "924bc380c47f33689a1243b2d79cb619674c86fa" +SRC_URI = "git://scm.raptorcs.com/scm/git/phosphor-ipmi-blobs;protocol=https" +SRCREV = "9cd8f76d3a786645ba6e21e146f66f5f27a6290c" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 8b3b6ccc9..e2d4da536 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -2,25 +2,68 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-flash" SUMMARY = "Phosphor OEM IPMI In-band Firmware Update over BLOB" DESCRIPTION = "This package handles a series of OEM IPMI commands that implement the firmware update handler over the BLOB protocol." PR = "r1" -PV = "0.1+git${SRCPV}" +PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit autotools pkgconfig inherit obmc-phosphor-ipmiprovider-symlink +inherit systemd DEPENDS += "autoconf-archive-native" DEPENDS += "phosphor-ipmi-blobs" DEPENDS += "phosphor-logging" DEPENDS += "sdbusplus" +DEPENDS += "systemd" DEPENDS += "ipmi-blob-tool" +DEPENDS += "pciutils" + +PACKAGECONFIG ?= "cleanup-delete" +PACKAGECONFIG[cleanup-delete] = "--enable-cleanup-delete, --disable-cleanup-delete" +# If using static-layout, reboot-update is a good option to handle updating. +# To be able to track the update status, update-status option can be used. +# Note that both reboot-update and update-status cannot be enabled at the same time. +PACKAGECONFIG[reboot-update] = "--enable-reboot-update, --disable-reboot-update" +PACKAGECONFIG[update-status] = "--enable-update-status, --disable-update-status" + +# Default options for supporting various flash types: +PACKAGECONFIG[static-bmc] = "--enable-static-layout, --disable-static-layout" +PACKAGECONFIG[ubitar-bmc] = "--enable-tarball-ubi, --disable-tarball-ubi" +PACKAGECONFIG[host-bios] = "--enable-host-bios, --disable-host-bios" + +# Hardware options to enable transmitting the data from the host. +PACKAGECONFIG[aspeed-p2a] = "--enable-aspeed-p2a, --disable-aspeed-p2a" +PACKAGECONFIG[aspeed-lpc] = "--enable-aspeed-lpc, --disable-aspeed-lpc" +PACKAGECONFIG[nuvoton-lpc] = "--enable-nuvoton-lpc, --disable-nuvoton-lpc" +PACKAGECONFIG[net-bridge] = "--enable-net-bridge, --disable-net-bridge" + +EXTRA_OECONF = "--disable-tests --disable-build-host-tool" + +# Set this variable in your recipe to set it instead of using MAPPED_ADDRESS directly. +IPMI_FLASH_BMC_ADDRESS ?= "0" +EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "4679e50a5e19157b6bb4e4760a9fb92577ad37f5" +SRC_URI = "git://scm.raptorcs.com/scm/git/phosphor-ipmi-flash;protocol=https" +SRCREV = "79fc7c0680ebb0d5399eab83230b3d047dc8eb82" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ + phosphor-ipmi-flash-bmc-verify.target \ + phosphor-ipmi-flash-bmc-update.target" + +# If they enabled host-bios, add those three extra targets. +HOST_BIOS_TARGETS = "phosphor-ipmi-flash-bios-prepare.target \ + phosphor-ipmi-flash-bios-verify.target \ + phosphor-ipmi-flash-bios-update.target" + +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'host-bios', '${HOST_BIOS_TARGETS}', '', d)}" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" BLOBIPMI_PROVIDER_LIBRARY += "libfirmwareblob.so" +BLOBIPMI_PROVIDER_LIBRARY += "${@bb.utils.contains('PACKAGECONFIG', 'cleanup-delete', 'libfirmwarecleanupblob.so', '', d)}" + +do_configure[depends] += "virtual/kernel:do_shared_workdir" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 446008a9e..2b0977a63 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://scm.raptorcs.com/scm/git/phosphor-host-ipmid;protocol=https" -SRCREV = "f442e119aed2dc87f320bf230ad39e7dc5c72524" +SRCREV = "5d06cc6dfee3aa0c42bb181dd7e050f4f8f8dd1e" diff --git a/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service index 35de4304b..934ebaef5 100644 --- a/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service +++ b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service @@ -7,7 +7,7 @@ ConditionPathExists=!/run/openbmc/host@%i-on [Service] Restart=no Type=oneshot -ExecStart=/bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/state/host%i` /xyz/openbmc_project/state/host%i xyz.openbmc_project.Control.Boot.RebootAttempts AttemptsLeft u 3" +ExecStart=/bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/state/host%i` /xyz/openbmc_project/state/host%i xyz.openbmc_project.Control.Boot.RebootAttempts AttemptsLeft u 4" [Install] WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 512a66819..231c13a61 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -5,8 +5,8 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "4733a11b42fca6013e3957bf0e345d0cea086d96" +SRC_URI = "git://scm.raptorcs.com/scm/git/phosphor-webui;protocol=https" +SRCREV = "44da471fceb3790b49a43bc023781f62b19f9fde" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " diff --git a/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/favicon.ico b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/favicon.ico Binary files differnew file mode 100644 index 000000000..530ba868a --- /dev/null +++ b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/favicon.ico diff --git a/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/login-logo-size.patch b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/login-logo-size.patch new file mode 100644 index 000000000..9d2623dfe --- /dev/null +++ b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/login-logo-size.patch @@ -0,0 +1,13 @@ +diff --git a/app/login/styles/index.scss b/app/login/styles/index.scss +index 07d45bf..86117e9 100644 +--- a/app/login/styles/index.scss ++++ b/app/login/styles/index.scss +@@ -21,7 +21,7 @@ + margin-left: 0; + } + .login__logo { +- max-width: 200px; ++ max-width: 400px; + display: block; + margin: 0 auto 2em; + @include mediaQuery(small) { diff --git a/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/logo.svg b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/logo.svg new file mode 100644 index 000000000..f38286d87 --- /dev/null +++ b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui/logo.svg @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="3423.7102" + height="1032" + id="svg2" + version="1.1" + inkscape:version="0.48.4 r9939" + sodipodi:docname="raptor_cs_logo_large.svg"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.979899" + inkscape:cx="537.91596" + inkscape:cy="835.80387" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1920" + inkscape:window-height="1152" + inkscape:window-x="1917" + inkscape:window-y="-3" + inkscape:window-maximized="1" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(1158.6609,-7.53327)"> + <g + id="g3092" + transform="translate(-216.3077,-204.97177)"> + <path + style="fill:#5bb5e2" + d="m -254.74951,1086.755 c -24.60951,-86.76246 -44.72983,-158.17534 -44.71182,-158.69524 0.018,-0.51991 1.10075,-2.09491 2.40609,-3.5 2.59576,-2.79413 101.02137,-131.05544 109.60541,-142.83004 2.91716,-4.00143 5.41082,-7.15143 5.54147,-7 0.13065,0.15143 -3.93233,74.75032 -9.02885,165.77532 -5.09652,91.02496 -10.99827,196.66246 -13.115,234.74996 -2.52013,45.346 -4.21176,69.25 -4.90067,69.25 -0.57863,0 -21.18712,-70.9875 -45.79663,-157.75 z M 1254.4438,910.75504 c -1.2438,-1.58606 -1.2085,-1.62143 0.3776,-0.37756 0.9625,0.75485 1.75,1.54235 1.75,1.75 0,0.82304 -0.8212,0.29331 -2.1276,-1.37244 z m -359.94809,-262 -2.4243,-2.75 2.75,2.42431 c 1.5125,1.33338 2.75,2.57088 2.75,2.75 0,0.78428 -0.8098,0.14598 -3.0757,-2.42431 z m 62.5757,0.75 c 0.9955,-1.1 2.035,-2 2.31,-2 0.275,0 -0.3145,0.9 -1.31,2 -0.9955,1.1 -2.035,2 -2.31,2 -0.275,0 0.3145,-0.9 1.31,-2 z m -1258,-44.96941 c -7.7,-1.49816 -29.075,-5.55176 -47.5,-9.00799 l -33.5,-6.28405 -263,-101.28234 c -144.65,-55.70529 -265.025,-102.14272 -267.5,-103.1943 -8.88266,-3.22028 -13.48008,-5.30177 -29.80358,-12.17126 -0.34599,-1.03898 0.0264,-1.20597 1.41713,-0.63543 105.40402,33.39034 170.14867,51.78106 239.88645,72.55701 33.55,9.99471 76.075,22.66755 94.5,28.16187 18.425,5.49431 41.6,12.39061 51.5,15.32511 9.9,2.9345 52.2,15.5381 94,28.00799 41.8,12.4699 99.175,29.57871 127.5,38.01959 28.325,8.44088 56,16.70099 61.5,18.35581 l 10,3.00875 2.13277,-2.69567 c 1.17303,-1.48263 32.00797,-38.02318 68.52209,-81.20124 36.51412,-43.17806 67.12463,-79.55537 68.02335,-80.83848 0.89872,-1.2831 27.74081,-21.9806 59.6491,-45.99444 31.90829,-24.01383 90.44859,-68.07402 130.08959,-97.91152 39.641,-29.8375 72.7844,-54.25 73.6521,-54.25 0.8677,0 1.4322,0.65899 1.2543,1.46442 -0.3114,1.41069 -252.11798,317.7854 -256.44848,322.20695 -1.16966,1.19426 -3.18163,3.66926 -4.47105,5.5 -1.28942,1.83075 -13.52662,17.39113 -27.19378,34.57863 l -24.84938,31.25 -57.6803,-0.12274 -57.68031,-0.12273 z m 1196,-59.03059 c 0.9955,-1.1 2.035,-2 2.31,-2 0.275,0 -0.3145,0.9 -1.31,2 -0.9955,1.1 -2.035,2 -2.31,2 -0.275,0 0.3145,-0.9 1.31,-2 z m 61.905,-0.25 -1.905,-2.25 2.25,1.90499 c 1.2375,1.04774 2.25,2.06024 2.25,2.25 0,0.80025 -0.8048,0.20945 -2.595,-1.90499 z" + id="path3100" + inkscape:connector-curvature="0" + sodipodi:nodetypes="scsssssssccscscsssssssssscsccccssssscsssssscssscccssssssscsss" /> + <path + style="fill:#3e95c7" + d="m -298.95566,907.50504 c 0.34473,-10.725 1.95906,-74.625 3.58739,-142 l 2.96061,-122.5 3.14669,-17.75 3.1467,-18.28571 56.79325,0.35714 57.1504,0.17857 -0.62647,8.75 c -0.34456,4.8125 -2.488,42.27378 -4.76322,83.24729 l -4.49389,75.033 -6.48228,8.68421 c -14.35303,19.22853 -106.23609,138.90028 -108.58452,141.2855 l -2.46144,2.5 z" + id="path3098" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sscccccsscsscs" /> + </g> + <path + style="fill:#000000" + d="m -109.2489,725.69824 c -17.1854,-2.4783 -30.6396,-9.0006 -42.1276,-20.4224 -6.4679,-6.4306 -8.9613,-9.8051 -12.2102,-16.5246 -6.0773,-12.5693 -7.5664,-19.8402 -7.5664,-36.9438 0,-17.1036 1.4891,-24.3745 7.5664,-36.9438 5.7217,-11.834 16.8841,-23.014 28.8502,-28.8959 23.8476,-11.7221 55.0804,-12.0827 81.2376,-0.9379 l 4.75,2.0239 0,14.9449 0,14.945 -2.75,-1.9415 c -9.4289,-6.6565 -21.9407,-10.9796 -34.25,-11.8341 -15.3092,-1.0627 -25.7599,2.3409 -34.797,11.3325 -8.5697,8.5267 -13.1683,21.5548 -13.1683,37.3069 0,15.7521 4.5986,28.7801 13.1683,37.3068 9.0371,8.9917 19.4878,12.3952 34.797,11.3325 12.3093,-0.8544 24.8211,-5.1775 34.25,-11.8341 l 2.75,-1.9414 0,14.9449 0,14.945 -4.75,2.0238 c -16.9106,7.2051 -37.1799,9.7913 -55.75,7.1133 z m 139.8602,-0.3671 c -9.6898,-1.7587 -13.5134,-3.0753 -22.7706,-7.8411 -15.2344,-7.8429 -26.693,-22.7692 -31.7787,-41.3959 -1.7675,-6.4736 -2.126,-10.5691 -2.126,-24.2867 0,-13.7176 0.3585,-17.8131 2.126,-24.2867 6.673,-24.4404 23.4726,-41.2389 47.9024,-47.8993 11.2479,-3.0665 36.3255,-3.0665 47.5734,0 24.4298,6.6604 41.2294,23.4589 47.9024,47.8993 1.7675,6.4736 2.126,10.5691 2.126,24.2867 0,13.7176 -0.3585,17.8131 -2.126,24.2867 -5.9054,21.6287 -20.2094,37.9174 -39.7598,45.2761 -13.6026,5.12 -33.7304,6.7447 -49.0691,3.9609 z m 27.6978,-26.1336 c 16.6298,-4.9385 25.9269,-21.932 25.9269,-47.3901 0,-30.527 -13.7548,-49 -36.4849,-49 -24.1876,0 -38.0024,20.6196 -36.1791,54 1.3138,24.0533 10.8164,39.1116 27.1791,43.0696 5.2876,1.279 13.98,0.977 19.558,-0.6795 z m 479.4728,26.5665 c -14.0601,-2.2129 -26.9486,-8.7484 -33.8417,-17.1605 -2.0193,-2.4643 -5.0189,-7.4522 -6.6657,-11.0843 -5.4378,-11.9927 -6.0234,-18.8802 -6.0234,-70.8428 l 0,-46.869 18.4488,0 18.4488,0 0.3012,50.25 c 0.3005,50.1265 0.3069,50.2626 2.6238,55.3824 2.8815,6.3676 6.4202,9.8363 12.0673,11.8287 8.88,3.1331 22.3735,1.0622 27.2863,-4.1876 7.3899,-7.8969 7.8238,-11.5749 7.8238,-66.3227 l 0,-46.9508 18.5657,0 18.5657,0 -0.4148,50.75 c -0.4489,54.9102 -0.5014,55.4853 -6.1819,67.75 -8.5506,18.4614 -24.8187,27.2203 -52.0347,28.0161 -7.15,0.209 -15.6861,-0.043 -18.9692,-0.5595 z m 543.9692,0.01 c -17.5934,-2.7475 -30.6828,-9.1152 -42.1276,-20.4941 -13.131,-13.0554 -18.8623,-27.0722 -20.0227,-48.9685 -2.2485,-42.4311 21.2829,-71.7436 62.6503,-78.0418 20.5287,-3.1255 45.6991,-0.48 64.7321,6.8035 l 5.2679,2.0159 0,14.8336 0,14.8336 -7.0836,-3.555 c -29.025,-14.5666 -60.0405,-13.657 -75.4645,2.2131 -8.9403,9.199 -13.0218,22.8113 -12.1125,40.3971 1.3033,25.2027 12.8752,40.103 34.2664,44.1221 6.6909,1.2571 22.2643,0.5955 27.1442,-1.1531 l 3.25,-1.1646 0,-14.4022 0,-14.4022 -11.5,0 -11.5,0 0,-12.5 0,-12.5 29,0 29,0 0,34.9866 0,34.9866 -3.75,1.6136 c -7.9654,3.4275 -18.1515,6.553 -27.75,8.5148 -11.436,2.3374 -34.6599,3.3197 -44,1.861 z m 212.1088,0.044 c -9.0218,-1.137 -20.2381,-3.6388 -29.8588,-6.6598 l -7.75,-2.4336 0,-15.4709 0,-15.4709 5.9548,3.006 c 16.0158,8.0847 29.5978,11.5185 45.5452,11.5148 13.0166,0 17.1731,-1.268 22.332,-6.7964 4.5697,-4.8971 3.727,-15.5375 -1.5598,-19.6961 -2.9193,-2.2964 -12.819,-5.3938 -31.6132,-9.8911 -15.5285,-3.7158 -24.4717,-7.8994 -31.2552,-14.6208 -11.3657,-11.2618 -13.6574,-32.2643 -5.3668,-49.185 4.8462,-9.8909 14.7708,-17.2655 28.094,-20.8757 14.6795,-3.9777 44.6426,-2.3568 68.119,3.6851 l 3.75,0.9651 0,14.8544 0,14.8545 -7.2978,-2.8337 c -14.6222,-5.6779 -23.1298,-7.3734 -37.2022,-7.4144 -11.3012,-0.033 -13.6172,0.2472 -17.7233,2.144 -6.3274,2.923 -9.0238,7.2414 -8.4782,13.5782 0.7652,8.8874 3.573,10.4546 29.0335,16.206 26.6571,6.0216 35.9806,10.0903 42.7722,18.6654 9.0123,11.379 10.2918,33.4108 2.8587,49.2241 -4.6431,9.8776 -15.0505,17.4478 -28.9629,21.0669 -7.6422,1.9881 -31.0714,2.8846 -41.3912,1.5839 z m 286.0001,0 c -9.0218,-1.137 -20.2381,-3.6388 -29.8588,-6.6598 l -7.75,-2.4336 0,-15.4709 0,-15.4709 5.9548,3.006 c 16.0158,8.0847 29.5978,11.5185 45.5452,11.5148 13.0166,0 17.1731,-1.268 22.332,-6.7964 4.5697,-4.8971 3.727,-15.5375 -1.5598,-19.6961 -2.9193,-2.2964 -12.819,-5.3938 -31.6132,-9.8911 -15.5285,-3.7158 -24.4717,-7.8994 -31.2552,-14.6208 -11.3657,-11.2618 -13.6574,-32.2643 -5.3668,-49.185 4.8462,-9.8909 14.7708,-17.2655 28.094,-20.8757 14.6795,-3.9777 44.6426,-2.3568 68.119,3.6851 l 3.75,0.9651 0,14.8544 0,14.8545 -7.2978,-2.8337 c -14.6222,-5.6779 -23.1298,-7.3734 -37.2022,-7.4144 -11.3012,-0.033 -13.6172,0.2472 -17.7233,2.144 -6.3274,2.923 -9.0238,7.2414 -8.4782,13.5782 0.7652,8.8874 3.573,10.4546 29.0335,16.206 26.6571,6.0216 35.9806,10.0903 42.7722,18.6654 9.0123,11.379 10.2918,33.4108 2.8587,49.2241 -4.6431,9.8776 -15.0505,17.4478 -28.9629,21.0669 -7.6422,1.9881 -31.0714,2.8846 -41.3912,1.5839 z m 610,0 c -9.0218,-1.137 -20.2381,-3.6388 -29.8588,-6.6598 l -7.75,-2.4336 0,-15.4709 0,-15.4709 5.9548,3.006 c 16.0158,8.0847 29.5978,11.5185 45.5452,11.5148 13.0166,0 17.1731,-1.268 22.332,-6.7964 4.5697,-4.8971 3.727,-15.5375 -1.5598,-19.6961 -2.9193,-2.2964 -12.819,-5.3938 -31.6132,-9.8911 -15.5285,-3.7158 -24.4717,-7.8994 -31.2552,-14.6208 -11.3657,-11.2618 -13.6574,-32.2643 -5.3668,-49.185 4.8462,-9.8909 14.7708,-17.2655 28.094,-20.8757 14.6795,-3.9777 44.6426,-2.3568 68.119,3.6851 l 3.75,0.9651 0,14.8544 0,14.8545 -7.2978,-2.8337 c -14.6222,-5.6779 -23.1298,-7.3734 -37.2022,-7.4144 -11.3012,-0.033 -13.6172,0.2472 -17.7233,2.144 -6.3274,2.923 -9.0238,7.2414 -8.4782,13.5782 0.7652,8.8874 3.573,10.4546 29.0335,16.206 26.6571,6.0216 35.9806,10.0903 42.7722,18.6654 9.0123,11.379 10.2918,33.4108 2.8587,49.2241 -4.6431,9.8776 -15.0505,17.4478 -28.9629,21.0669 -7.6422,1.9881 -31.0714,2.8846 -41.3912,1.5839 z m -2040.6089,-74.0246 0,-72.0181 23.6882,0.2681 23.6881,0.2681 14.2675,33 c 7.8471,18.15 15.1918,35.2081 16.3216,37.9069 1.1298,2.6988 2.3161,4.6449 2.6362,4.3248 0.3202,-0.3202 7.8867,-17.3783 16.8146,-37.9069 l 16.2324,-37.3248 23.6757,-0.2681 23.6757,-0.2681 0,72.0181 0,72.0181 -17.4911,0 -17.4911,0 -0.2589,-52.2063 -0.2589,-52.2063 -16.5,38.1847 -16.5,38.1846 -12,0 -12,0 -16.5,-38.1696 -16.5,-38.1697 -0.2589,52.1895 -0.2589,52.1894 -17.4911,0 -17.4911,0 0,-72.0181 z m 197,0.018 0,-72 34.869,0 c 39.7528,0 47.6076,0.8495 59.7569,6.4628 13.4982,6.2365 21.3622,17.0783 23.619,32.5626 3.1863,21.8612 -5.6221,40.0607 -23.4634,48.4789 -10.0261,4.7307 -21.2785,6.4957 -41.4125,6.4957 l -16.369,0 0,25 0,25 -18.5,0 -18.5,0 z m 66.6696,-5.147 c 5.8214,-1.4659 11.7333,-6.9925 13.2142,-12.353 3.5972,-13.0211 -1.8919,-24.2571 -13.3838,-27.3962 -2.2,-0.601 -9.7375,-1.0952 -16.75,-1.0982 l -12.75,-0.01 0,21 0,21 12.5572,0 c 6.9064,0 14.607,-0.5162 17.1124,-1.1471 z m 270.3304,19.147 0,-58 -24,0 -24,0 0,-14 0,-14 66.5,0 66.5,0 0,14 0,14 -24,0 -24,0 0,58 0,58 -18.5,0 -18.5,0 z m 104,-14 0,-72 18.5,0 18.5,0 0,72 0,72 -18.5,0 -18.5,0 z m 74,0 0,-72 20.75,0.034 20.75,0.035 26,48.9479 26,48.9479 0.2594,-48.9825 0.2594,-48.9824 17.4906,0 17.4906,0 0,72 0,72 -20.75,-0.034 -20.75,-0.035 -26,-48.9479 -26,-48.9479 -0.2594,48.9824 -0.2594,48.9825 -17.4906,0 -17.4906,0 z m 576,41.5689 0,-30.431 -10.1654,-15.319 c -5.591,-8.4254 -17.9473,-27.1314 -27.4585,-41.5689 l -17.293,-26.25 20.2758,0 20.2758,0 16.2678,25.5 c 8.9473,14.025 16.3897,25.5 16.5387,25.5 0.149,0 7.6004,-11.475 16.5588,-25.5 l 16.288,-25.5 20.3142,0 20.3142,0 -19.606,29.75 c -10.7835,16.3625 -23.1397,35.0242 -27.4583,41.4705 l -7.8521,11.7205 0,30.5295 0,30.5295 -18.5,0 -18.5,0 z m 282.0001,-27.5689 0,-58 -24,0 -24,0 0,-14 0,-14 66.5,0 66.5,0 0,14 0,14 -24,0 -24,0 0,58 0,58 -18.5,0 -18.5,0 z m 104,-14 0,-72 50.5,0 50.5,0 0,14 0,14 -32,0 -32,0 0,13.5 0,13.5 30,0 30,0 0,14 0,14 -30,0 -30,0 0,16.5 0,16.5 33,0 33,0 0,14 0,14 -51.5,0 -51.5,0 z m 135,-0.018 0,-72.0181 23.6882,0.2681 23.6881,0.2681 14.2675,33 c 7.8471,18.15 15.1918,35.2081 16.3216,37.9069 1.1298,2.6988 2.3161,4.6449 2.6362,4.3248 0.3202,-0.3202 7.8867,-17.3783 16.8146,-37.9069 l 16.2324,-37.3248 23.6757,-0.2681 23.6757,-0.2681 0,72.0181 0,72.0181 -17.4911,0 -17.4911,0 -0.2589,-52.2063 -0.2589,-52.2063 -16.5,38.1847 -16.5,38.1846 -12,0 -12,0 -16.5,-38.1696 -16.5,-38.1697 -0.2589,52.1895 -0.2589,52.1894 -17.4911,0 -17.4911,0 0,-72.0181 z m -3034.9521,-11.6249 c 0.026,-0.4714 4.1889,-2.8964 9.25,-5.3889 5.0611,-2.4926 88.852,-46.9893 186.202,-98.8816 97.35,-51.8923 200.625,-106.9413 229.5,-122.3311 28.875,-15.3898 51.91607,-27.65911 54.11901,-29.03107 3.3829,0.18286 93.2365,17.49214 95.09528,17.76423 -0.62615,4.08005 0.31101,-0.90286 -3.19939,18.51144 -1.6411,9.075 -2.9908,16.8375 -2.9993,17.25 -0.01,0.4125 -0.6595,0.75 -1.4466,0.75 -0.7871,0 -52.8746,18.4015 -115.75,40.8923 -62.8754,22.4908 -189.3511,67.7278 -281.0571,100.5268 -91.706,32.799 -167.4185,59.8956 -168.25,60.2147 -0.8315,0.3191 -1.4903,0.1945 -1.4639,-0.2768 z M 690.091,490.26464 c -15.9627,-2.4867 -28.9688,-7.3785 -40.4618,-15.2184 -6.6765,-4.5544 -17.4271,-15.4295 -22.2516,-22.5093 -17.1908,-25.2273 -21.1213,-70.0256 -9.0466,-103.1111 7.3665,-20.1846 22.5646,-37.334 41.6326,-46.9778 27.8681,-14.0946 73.357,-13.9585 101.0617,0.3023 16.902,8.7003 30.5426,22.738 38.2655,39.3794 13.1612,28.3604 13.1612,70.9949 0,99.3553 -9.8051,21.1283 -27.9401,37.0072 -51.0397,44.6898 -15.7631,5.2427 -39.8753,6.9382 -58.1601,4.0898 z m 32.4805,-35.9525 c 8.4064,-2.1895 13.4524,-5.0945 19.36,-11.1455 6.2104,-6.3611 11.384,-16.5962 13.8293,-27.3592 2.2984,-10.1163 3.0088,-27.5255 1.5656,-38.3645 -4.1111,-30.8765 -19.0226,-47.7689 -43.5753,-49.364 -25.3428,-1.6464 -42.8174,12.6534 -49.1599,40.2285 -2.5722,11.1827 -2.5722,35.8172 0,47 3.7041,16.1044 12.9265,30.0242 23.4485,35.3921 9.7999,4.9996 23.6458,6.4481 34.5318,3.6126 z m -880.3204,-62.5869 0,-96.0821 48.75,0.4637 c 31.5508,0.3001 50.6904,0.875 54.25,1.6297 30.7307,6.5151 44.076,20.4157 45.6704,47.5709 0.628,10.6965 -1.3082,21.279 -5.3576,29.2825 -4.7835,9.4544 -15.4305,18.3938 -26.5628,22.3026 -3.812,1.3384 -5.0073,2.9149 -2.2102,2.9149 2.7852,0 9.6595,4.1063 14.581,8.7097 6.8838,6.439 12.4847,15.7687 29.7409,49.5403 l 15.2012,29.75 -26.7814,0 -26.7815,0 -14.3515,-28.6386 c -20.1815,-40.2716 -23.4768,-43.3554 -46.33,-43.3554 l -9.8185,0 0,36 0,36 -25,0 -25,0 0,-96.0822 z m 87.1085,-12.582 c 7.9448,-3.6172 11.8745,-11.0244 11.8859,-22.4043 0.01,-7.4746 -2.3403,-14.9308 -5.7209,-18.1689 -5.3757,-5.149 -9.3941,-6.125 -27.0235,-6.5638 l -16.25,-0.4044 0,25.2056 0,25.2055 16.25,-0.3857 c 13.842,-0.3286 16.9329,-0.6967 20.8585,-2.484 z m 94.6941,103.9142 c 0.987,-2.6125 17.0531,-45.8125 35.7026,-96 l 33.9081,-91.25 29.5888,0 29.5888,0 35.5827,95.75 35.5827,95.75 -24.527,0.2678 c -13.4899,0.1473 -24.7276,0.067 -24.9727,-0.1779 -0.2451,-0.2451 -2.4337,-6.2156 -4.8634,-13.2678 -2.4297,-7.0522 -5.1244,-14.7346 -5.9882,-17.0721 l -1.5704,-4.25 -38.7947,0 -38.7946,0 -3.2838,9.25 c -1.806,5.0875 -4.6038,12.9625 -6.2172,17.5 l -2.9334,8.25 -24.9014,0 -24.9013,0 z m 125.1974,-66.8747 c 0,-1.3592 -25.5226,-74.3748 -25.9949,-74.3667 -0.4352,0.01 -24.9421,69.861 -25.8284,73.62 -0.2676,1.135 4.1704,1.3714 25.75,1.3714 14.3403,0 26.0733,-0.2811 26.0733,-0.6247 z m 100,-24.4481 0,-96.0728 50.75,0.3806 50.75,0.3807 9.7387,2.6317 c 30.48,8.2366 46.7613,29.0412 46.7613,59.7526 0,30.7299 -16.4144,51.6829 -46.7613,59.6907 -8.9101,2.3512 -11.9295,2.6114 -35.4887,3.0582 l -25.75,0.4883 0,32.8814 0,32.8814 -25,0 -25,0 z m 86.9671,-7.0136 c 7.3152,-1.5688 13.9245,-6.3871 16.991,-12.3869 2.1368,-4.1807 2.5419,-6.3365 2.5419,-13.5267 0,-10.8858 -2.7152,-16.9029 -9.7756,-21.6637 -6.4326,-4.3374 -12.1933,-5.3363 -30.7736,-5.3363 l -15.9508,0 0,27 0,27 15.9508,0 c 8.7729,0 18.2302,-0.4889 21.0163,-1.0864 z m 147.0329,26.0864 0,-77 -32,0 -32,0 0,-19 0,-19 89,0 89,0 0,19 0,19 -32,0 -32,0 0,77 0,77 -25,0 -25,0 z m 363,-19.0822 0,-96.0821 48.75,0.4637 c 31.5508,0.3001 50.6904,0.875 54.25,1.6297 30.7307,6.5151 44.076,20.4157 45.6704,47.5709 0.628,10.6965 -1.3082,21.279 -5.3576,29.2825 -4.7835,9.4544 -15.4305,18.3938 -26.5628,22.3026 -3.812,1.3384 -5.0073,2.9149 -2.2102,2.9149 2.7852,0 9.6595,4.1063 14.581,8.7097 6.8838,6.439 12.4847,15.7687 29.7409,49.5403 l 15.2012,29.75 -26.7814,0 -26.7815,0 -14.3515,-28.6386 c -20.1815,-40.2716 -23.4768,-43.3554 -46.33,-43.3554 l -9.8185,0 0,36 0,36 -25,0 -25,0 0,-96.0822 z m 87.1085,-12.582 c 7.9448,-3.6172 11.8745,-11.0244 11.8859,-22.4043 0.01,-7.4746 -2.3403,-14.9308 -5.7209,-18.1689 -5.3757,-5.149 -9.3941,-6.125 -27.0235,-6.5638 l -16.25,-0.4044 0,25.2056 0,25.2055 16.25,-0.3857 c 13.842,-0.3286 16.9329,-0.6967 20.8585,-2.484 z" + id="path3090" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssscccccsssssscccsscsssssssssscsssssscscscccssssscccssscssssscccssssscccccccccccssscscccscscssssscccssssssscccscccscscssssscccssssssscccscccscscssssscccsssssssccccccsssscccccccccccccccccccccccssssscccccccscccccscccccccccccccccccccccccccccccccccccccccccccccccccccsscccssscccssccccccccccccccccccccccccccccccccccccccccccccccccccccsssscccccccccccccccccccccccssccccsssscsssssssssscssssssscccscsscssscccsscccccccscsscccsscscccccscscccccsccccscsssccccssssccccccssssscccsscccccccccccccccccccscsscssscccsscccccccscsscccss" /> + </g> +</svg> diff --git a/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui_git.bbappend b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui_git.bbappend new file mode 100644 index 000000000..28f1c5a27 --- /dev/null +++ b/meta-rcs/meta-common/recipes-phosphor/webui/phosphor-webui_git.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/phosphor-webui:" +SRC_URI += "file://logo.svg" +SRC_URI += "file://favicon.ico" +SRC_URI += "file://login-logo-size.patch" + +do_compile_prepend() { + cp -r ${WORKDIR}/logo.svg ${S}/app/assets/images/ + cp -r ${WORKDIR}/favicon.ico ${S}/app/assets/images/ +} diff --git a/meta-rcs/meta-talos/conf/machine/talos.conf b/meta-rcs/meta-talos/conf/machine/talos.conf index 03713217f..709d9c0b8 100644 --- a/meta-rcs/meta-talos/conf/machine/talos.conf +++ b/meta-rcs/meta-talos/conf/machine/talos.conf @@ -38,6 +38,8 @@ MACHINE_EXTRA_RDEPENDS += "obmc-ipl-status-led-monitor obmc-hardbeep" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "talos-ipmi-inventory-map-native" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory_df-mrw = "talos-ipmi-inventory-map-native" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties = "phosphor-ipmi-fru-properties-native" +PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties_df-mrw = "phosphor-ipmi-fru-properties-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "talos-led-manager-config-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw = "talos-led-manager-config-native" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory = "talos-ipmi-fru-read-inventory-native" diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml index 1778bf2a1..7d6d8b403 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml @@ -2,7 +2,7 @@ fans: - inventory: /system/chassis/motherboard/fan0 functional_delay: 5 allowed_out_of_range_time: 30 - deviation: -500 + deviation: -300 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - name: fan0 @@ -11,7 +11,7 @@ fans: - inventory: /system/chassis/motherboard/fan1 functional_delay: 5 allowed_out_of_range_time: 30 - deviation: -500 + deviation: -300 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - name: fan1 @@ -20,7 +20,7 @@ fans: - inventory: /system/chassis/motherboard/fan2 functional_delay: 5 allowed_out_of_range_time: 30 - deviation: -500 + deviation: -300 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - name: fan2 @@ -29,7 +29,7 @@ fans: - inventory: /system/chassis/motherboard/fan3 functional_delay: 5 allowed_out_of_range_time: 30 - deviation: -500 + deviation: -300 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - name: fan3 @@ -38,7 +38,7 @@ fans: - inventory: /system/chassis/motherboard/fan4 functional_delay: 5 allowed_out_of_range_time: 30 - deviation: -500 + deviation: -300 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - name: fan4 @@ -47,7 +47,7 @@ fans: - inventory: /system/chassis/motherboard/fan5 functional_delay: 5 allowed_out_of_range_time: 30 - deviation: -500 + deviation: -300 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - name: fan5 diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch new file mode 100644 index 000000000..383310246 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch @@ -0,0 +1,13 @@ +diff --git a/monitor/tach_sensor.cpp b/monitor/tach_sensor.cpp +index 5494450..6832ffe 100644 +--- a/monitor/tach_sensor.cpp ++++ b/monitor/tach_sensor.cpp +@@ -81,7 +81,7 @@ TachSensor::TachSensor(Mode mode, + _bus(bus), + _fan(fan), + _name(FAN_SENSOR_PATH + id), +- _invName(path(fan.getName()) / id), ++ _invName(path(fan.getName()) / (id + "tach")), + _hasTarget(hasTarget), + _funcDelay(funcDelay), + _interface(interface), diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend index 36751c29a..0035eee8d 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -5,6 +5,8 @@ FAN_PACKAGES += " \ phosphor-cooling-type \ " +SRC_URI += "file://label-fan-tachs-in-inventory.patch" + PACKAGECONFIG += "cooling-type" RDEPENDS_phosphor-cooling-type += "libevdev" diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json index 56170bf48..ea20c7ccb 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json +++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json @@ -3,6 +3,8 @@ {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/ambient", "record_id": 254} ], "baseboard": [ + {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_vdd_temp", "record_id": 250} + {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_vdd_temp", "record_id": 251} {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/pcie", "record_id": 253} {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/cpu_1_ambient", "record_id": 252} ], diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml index 2c897df8f..f6a6be20f 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml +++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml @@ -1405,6 +1405,50 @@ 0xFF:
type: int64_t
+0xa1:
+ entityID: 0x03
+ entityInstance: 49
+ sensorType: 0x01
+ path: /xyz/openbmc_project/sensors/temperature/p0_vdd_temp
+ sensorReadingType: 0x01
+ multiplierM: 1
+ offsetB: -127
+ bExp: 0
+ rExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
+ scale: -3
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ sensorNamePattern: nameLeaf
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0xFF:
+ type: int64_t
+
+0xa2:
+ entityID: 0x03
+ entityInstance: 50
+ sensorType: 0x01
+ path: /xyz/openbmc_project/sensors/temperature/p1_vdd_temp
+ sensorReadingType: 0x01
+ multiplierM: 1
+ offsetB: -127
+ bExp: 0
+ rExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
+ scale: -3
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ sensorNamePattern: nameLeaf
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0xFF:
+ type: int64_t
+
0xe7:
entityID: 0x0A
entityInstance: 2
diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/talos-ipmid-whitelist.conf b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/talos-ipmid-whitelist.conf new file mode 100644 index 000000000..961214df0 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/talos-ipmid-whitelist.conf @@ -0,0 +1,48 @@ +#<NetFn>:<Command +0x00:0x00 //<Chassis>:<Chassis Capabiliti> +0x00:0x01 //<Chassis>:<Get Chassis Status> +0x00:0x02 //<Chassis>:<Chassis Control> +0x00:0x05 //<Chassis>:<Set Chassis Capabilities> +0x00:0x06 //<Chassis>:<Set Power Restore Policy> +0x00:0x08 //<Chassis>:<Set System Boot Options> +0x00:0x09 //<Chassis>:<Get System Boot Options> +0x00:0x0F //<Chassis>:<Get POH Counter Command> +0x04:0x02 //<Sensor/Event>:<Platform event> +0x04:0x2D //<Sensor/Event>:<Get Sensor Reading> +0x04:0x2F //<Sensor/Event>:<Get Sensor Type> +0x04:0x30 //<Sensor/Event>:<Set Sensor Reading and Event Status> +0x06:0x01 //<App>:<Get Device ID> +0x06:0x04 //<App>:<Get Self Test Results> +0x06:0x06 //<App>:<Set ACPI Power State> +0x06:0x07 //<App>:<Get ACPI Power State> +0x06:0x08 //<App>:<Get Device GUID> +0x06:0x22 //<App>:<Reset Watchdog Timer> +0x06:0x24 //<App>:<Set Watchdog Timer> +0x06:0x25 //<App>:<Get Watchdog Timer> +0x06:0x2E //<App>:<Set BMC Global Enables> +0x06:0x2F //<App>:<Get BMC Global Enables> +0x06:0x31 //<App>:<Get Message Flags> +0x06:0x35 //<App>:<Read Event Message Buffer> +0x06:0x36 //<App>:<Get BT Interface Capabilities> +0x06:0x37 //<App>:<Get System GUID> +0x06:0x42 //<App>:<Get Channel Info Command> +0x06:0x4E //<App>:<Get Channel Payload Support> +0x06:0x54 //<App>:<Get Channel Cipher Suites> +0x0A:0x10 //<Storage>:<Get FRU Inventory Area Info> +0x0A:0x11 //<Storage>:<Read FRU Data> +0x0A:0x20 //<Storage>:<Get SDR Repository Info> +0x0A:0x22 //<Storage>:<Reserve SDR Repository> +0x0A:0x23 //<Storage>:<Get SDR> +0x0A:0x40 //<Storage>:<Get SEL Info> +0x0A:0x42 //<Storage>:<Reserve SEL> +0x0A:0x44 //<Storage>:<Add SEL Entry> +0x0A:0x48 //<Storage>:<Get SEL Time> +0x0A:0x49 //<Storage>:<Set SEL Time> +0x0C:0x02 //<Transport>:<Get LAN Configuration Parameters> +0x2C:0x00 //<Group Extension>:<Group Extension Command> +0x2C:0x01 //<Group Extension>:<Get DCMI Capabilities> +0x2C:0x02 //<Group Extension>:<Get Power Reading> +0x2C:0x03 //<Group Extension>:<Get Power Limit> +0x2C:0x06 //<Group Extension>:<Get Asset Tag> +0x2C:0x07 //<Group Extension>:<Get Sensor Info> +0x2C:0x10 //<Group Extension>:<Get Temperature Readings> diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index e1798ad4b..788adb8a2 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -8,3 +8,9 @@ SRC_URI_append = " \ EXTRA_OECONF_append = " \ CHANNEL_YAML_GEN=${WORKDIR}/channel.yaml \ " + +# Replace the default whitelist on Talos II systems +SRC_URI_append = " file://talos-ipmid-whitelist.conf" + +WHITELIST_CONF_remove = " ${S}/host-ipmid-whitelist.conf" +WHITELIST_CONF_append = " ${WORKDIR}/talos-ipmid-whitelist.conf" diff --git a/meta-rcs/meta-talos/recipes-phosphor/network/network/ncsi-netlink.service b/meta-rcs/meta-talos/recipes-phosphor/network/network/ncsi-netlink.service new file mode 100644 index 000000000..44b34195e --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/network/network/ncsi-netlink.service @@ -0,0 +1,13 @@ +[Unit] +Description=Stop the ethernet link failover +Wants=xyz.openbmc_project.Network.service +After=xyz.openbmc_project.Network.service + +[Service] +Restart=no +ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0 +SyslogIdentifier=ncsi-netlink +Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/meta-rcs/meta-talos/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/network/phosphor-network_%.bbappend new file mode 100644 index 000000000..5137f4e00 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/network/phosphor-network_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/network:" +SRC_URI += "file://ncsi-netlink.service" +SYSTEMD_SERVICE_${PN} += "ncsi-netlink.service" + +do_install_append() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir} +} diff --git a/meta-rcs/meta-talos/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-rcs/meta-talos/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 74866b373..154931330 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-rcs/meta-talos/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1 +1,2 @@ RDEPENDS_${PN}-inventory += " openpower-occ-control phosphor-cooling-type" +RDEPENDS_${PN}-extras += " binary-block-editor procps obmc-ikvm bmcweb phosphor-webui" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf index 204de8b8b..8b0f3cbc7 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf @@ -12,5 +12,33 @@ ENABLE_fan4 = "1" ENABLE_fan5 = "1" ENABLE_fan6 = "1" +WARNLO_fan1 = "500" +WARNLO_fan2 = "500" +WARNLO_fan3 = "500" +WARNLO_fan4 = "500" +WARNLO_fan5 = "500" +WARNLO_fan6 = "500" + +CRITLO_fan1 = "300" +CRITLO_fan2 = "300" +CRITLO_fan3 = "300" +CRITLO_fan4 = "300" +CRITLO_fan5 = "300" +CRITLO_fan6 = "300" + +WARNHI_fan1 = "20000" +WARNHI_fan2 = "20000" +WARNHI_fan3 = "20000" +WARNHI_fan4 = "20000" +WARNHI_fan5 = "20000" +WARNHI_fan6 = "20000" + +CRITHI_fan1 = "30000" +CRITHI_fan2 = "30000" +CRITHI_fan3 = "30000" +CRITHI_fan4 = "30000" +CRITHI_fan5 = "30000" +CRITHI_fan6 = "30000" + # Legacy mode TARGET_MODE = "RPM" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf index 506687fcd..0f2a4dc71 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf @@ -1,3 +1,19 @@ LABEL_temp1 = "pcie" LABEL_temp2 = "cpu_1_ambient" LABEL_temp3 = "ambient" + +WARNLO_temp1 = "0" +WARNLO_temp2 = "0" +WARNLO_temp3 = "0" + +CRITLO_temp1 = "-40000" +CRITLO_temp2 = "-40000" +CRITLO_temp3 = "-40000" + +WARNHI_temp1 = "45000" +WARNHI_temp2 = "65000" +WARNHI_temp3 = "35000" + +CRITHI_temp1 = "65000" +CRITHI_temp2 = "85000" +CRITHI_temp3 = "55000"
\ No newline at end of file diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index 7752d2bbb..24c349c08 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -86,6 +86,7 @@ LABEL_temp111 = "p0_core20_temp" LABEL_temp112 = "p0_core21_temp" LABEL_temp113 = "p0_core22_temp" LABEL_temp114 = "p0_core23_temp" +LABEL_temp255 = "p0_vdd_temp" LABEL_temp27 = "dimm0_temp" LABEL_temp28 = "dimm1_temp" LABEL_temp29 = "dimm2_temp" @@ -121,3 +122,147 @@ LABEL_freq114 = "p0_core23_freq" LABEL_power2 = "p0_power" LABEL_power3 = "p0_vdd_power" LABEL_power4 = "p0_vdn_power" +WARNLO_temp27 = "0" +WARNLO_temp28 = "0" +WARNLO_temp29 = "0" +WARNLO_temp30 = "0" +WARNLO_temp31 = "0" +WARNLO_temp32 = "0" +WARNLO_temp33 = "0" +WARNLO_temp34 = "0" +WARNLO_temp91 = "0" +WARNLO_temp92 = "0" +WARNLO_temp93 = "0" +WARNLO_temp94 = "0" +WARNLO_temp95 = "0" +WARNLO_temp96 = "0" +WARNLO_temp97 = "0" +WARNLO_temp98 = "0" +WARNLO_temp99 = "0" +WARNLO_temp100 = "0" +WARNLO_temp101 = "0" +WARNLO_temp102 = "0" +WARNLO_temp103 = "0" +WARNLO_temp104 = "0" +WARNLO_temp105 = "0" +WARNLO_temp106 = "0" +WARNLO_temp107 = "0" +WARNLO_temp108 = "0" +WARNLO_temp109 = "0" +WARNLO_temp110 = "0" +WARNLO_temp111 = "0" +WARNLO_temp112 = "0" +WARNLO_temp113 = "0" +WARNLO_temp114 = "0" +WARNLO_temp255 = "0" +WARNLO_power2 = "-1000000" +WARNLO_power3 = "-1000000" +WARNLO_power4 = "-1000000" +CRITLO_temp27 = "-40000" +CRITLO_temp28 = "-40000" +CRITLO_temp29 = "-40000" +CRITLO_temp30 = "-40000" +CRITLO_temp31 = "-40000" +CRITLO_temp32 = "-40000" +CRITLO_temp33 = "-40000" +CRITLO_temp34 = "-40000" +CRITLO_temp91 = "-40000" +CRITLO_temp92 = "-40000" +CRITLO_temp93 = "-40000" +CRITLO_temp94 = "-40000" +CRITLO_temp95 = "-40000" +CRITLO_temp96 = "-40000" +CRITLO_temp97 = "-40000" +CRITLO_temp98 = "-40000" +CRITLO_temp99 = "-40000" +CRITLO_temp100 = "-40000" +CRITLO_temp101 = "-40000" +CRITLO_temp102 = "-40000" +CRITLO_temp103 = "-40000" +CRITLO_temp104 = "-40000" +CRITLO_temp105 = "-40000" +CRITLO_temp106 = "-40000" +CRITLO_temp107 = "-40000" +CRITLO_temp108 = "-40000" +CRITLO_temp109 = "-40000" +CRITLO_temp110 = "-40000" +CRITLO_temp111 = "-40000" +CRITLO_temp112 = "-40000" +CRITLO_temp113 = "-40000" +CRITLO_temp114 = "-40000" +CRITLO_temp255 = "-40000" +CRITLO_power2 = "-1000000" +CRITLO_power3 = "-1000000" +CRITLO_power4 = "-1000000" +WARNHI_temp27 = "60000" +WARNHI_temp28 = "60000" +WARNHI_temp29 = "60000" +WARNHI_temp30 = "60000" +WARNHI_temp31 = "60000" +WARNHI_temp32 = "60000" +WARNHI_temp33 = "60000" +WARNHI_temp34 = "60000" +WARNHI_temp91 = "78000" +WARNHI_temp92 = "78000" +WARNHI_temp93 = "78000" +WARNHI_temp94 = "78000" +WARNHI_temp95 = "78000" +WARNHI_temp96 = "78000" +WARNHI_temp97 = "78000" +WARNHI_temp98 = "78000" +WARNHI_temp99 = "78000" +WARNHI_temp100 = "78000" +WARNHI_temp101 = "78000" +WARNHI_temp102 = "78000" +WARNHI_temp103 = "78000" +WARNHI_temp104 = "78000" +WARNHI_temp105 = "78000" +WARNHI_temp106 = "78000" +WARNHI_temp107 = "78000" +WARNHI_temp108 = "78000" +WARNHI_temp109 = "78000" +WARNHI_temp110 = "78000" +WARNHI_temp111 = "78000" +WARNHI_temp112 = "78000" +WARNHI_temp113 = "78000" +WARNHI_temp114 = "78000" +WARNHI_temp255 = "80000" +WARNHI_power2 = "190000000" +WARNHI_power3 = "180000000" +WARNHI_power4 = "40000000" +CRITHI_temp27 = "85000" +CRITHI_temp28 = "85000" +CRITHI_temp29 = "85000" +CRITHI_temp30 = "85000" +CRITHI_temp31 = "85000" +CRITHI_temp32 = "85000" +CRITHI_temp33 = "85000" +CRITHI_temp34 = "85000" +CRITHI_temp91 = "90000" +CRITHI_temp92 = "90000" +CRITHI_temp93 = "90000" +CRITHI_temp94 = "90000" +CRITHI_temp95 = "90000" +CRITHI_temp96 = "90000" +CRITHI_temp97 = "90000" +CRITHI_temp98 = "90000" +CRITHI_temp99 = "90000" +CRITHI_temp100 = "90000" +CRITHI_temp101 = "90000" +CRITHI_temp102 = "90000" +CRITHI_temp103 = "90000" +CRITHI_temp104 = "90000" +CRITHI_temp105 = "90000" +CRITHI_temp106 = "90000" +CRITHI_temp107 = "90000" +CRITHI_temp108 = "90000" +CRITHI_temp109 = "90000" +CRITHI_temp110 = "90000" +CRITHI_temp111 = "90000" +CRITHI_temp112 = "90000" +CRITHI_temp113 = "90000" +CRITHI_temp114 = "90000" +CRITHI_temp255 = "92000" +CRITHI_power2 = "250000000" +CRITHI_power3 = "240000000" +CRITHI_power4 = "60000000" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf index d90820d8c..d41f6e978 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf @@ -86,6 +86,7 @@ LABEL_temp135 = "p1_core20_temp" LABEL_temp136 = "p1_core21_temp" LABEL_temp137 = "p1_core22_temp" LABEL_temp138 = "p1_core23_temp" +LABEL_temp255 = "p1_vdd_temp" LABEL_temp35 = "dimm8_temp" LABEL_temp36 = "dimm9_temp" LABEL_temp37 = "dimm10_temp" @@ -121,3 +122,147 @@ LABEL_freq138 = "p1_core23_freq" LABEL_power2 = "p1_power" LABEL_power3 = "p1_vdd_power" LABEL_power4 = "p1_vdn_power" +WARNLO_temp35 = "0" +WARNLO_temp36 = "0" +WARNLO_temp37 = "0" +WARNLO_temp38 = "0" +WARNLO_temp39 = "0" +WARNLO_temp40 = "0" +WARNLO_temp41 = "0" +WARNLO_temp42 = "0" +WARNLO_temp115 = "0" +WARNLO_temp116 = "0" +WARNLO_temp117 = "0" +WARNLO_temp118 = "0" +WARNLO_temp119 = "0" +WARNLO_temp120 = "0" +WARNLO_temp121 = "0" +WARNLO_temp122 = "0" +WARNLO_temp123 = "0" +WARNLO_temp124 = "0" +WARNLO_temp125 = "0" +WARNLO_temp126 = "0" +WARNLO_temp127 = "0" +WARNLO_temp128 = "0" +WARNLO_temp129 = "0" +WARNLO_temp130 = "0" +WARNLO_temp131 = "0" +WARNLO_temp132 = "0" +WARNLO_temp133 = "0" +WARNLO_temp134 = "0" +WARNLO_temp135 = "0" +WARNLO_temp136 = "0" +WARNLO_temp137 = "0" +WARNLO_temp138 = "0" +WARNLO_temp255 = "0" +WARNLO_power2 = "-1000000" +WARNLO_power3 = "-1000000" +WARNLO_power4 = "-1000000" +CRITLO_temp35 = "-40000" +CRITLO_temp36 = "-40000" +CRITLO_temp37 = "-40000" +CRITLO_temp38 = "-40000" +CRITLO_temp39 = "-40000" +CRITLO_temp40 = "-40000" +CRITLO_temp41 = "-40000" +CRITLO_temp42 = "-40000" +CRITLO_temp115 = "-40000" +CRITLO_temp116 = "-40000" +CRITLO_temp117 = "-40000" +CRITLO_temp118 = "-40000" +CRITLO_temp119 = "-40000" +CRITLO_temp120 = "-40000" +CRITLO_temp121 = "-40000" +CRITLO_temp122 = "-40000" +CRITLO_temp123 = "-40000" +CRITLO_temp124 = "-40000" +CRITLO_temp125 = "-40000" +CRITLO_temp126 = "-40000" +CRITLO_temp127 = "-40000" +CRITLO_temp128 = "-40000" +CRITLO_temp129 = "-40000" +CRITLO_temp130 = "-40000" +CRITLO_temp131 = "-40000" +CRITLO_temp132 = "-40000" +CRITLO_temp133 = "-40000" +CRITLO_temp134 = "-40000" +CRITLO_temp135 = "-40000" +CRITLO_temp136 = "-40000" +CRITLO_temp137 = "-40000" +CRITLO_temp138 = "-40000" +CRITLO_temp255 = "-40000" +CRITLO_power2 = "-1000000" +CRITLO_power3 = "-1000000" +CRITLO_power4 = "-1000000" +WARNHI_temp35 = "60000" +WARNHI_temp36 = "60000" +WARNHI_temp37 = "60000" +WARNHI_temp38 = "60000" +WARNHI_temp39 = "60000" +WARNHI_temp40 = "60000" +WARNHI_temp41 = "60000" +WARNHI_temp42 = "60000" +WARNHI_temp115 = "78000" +WARNHI_temp116 = "78000" +WARNHI_temp117 = "78000" +WARNHI_temp118 = "78000" +WARNHI_temp119 = "78000" +WARNHI_temp120 = "78000" +WARNHI_temp121 = "78000" +WARNHI_temp122 = "78000" +WARNHI_temp123 = "78000" +WARNHI_temp124 = "78000" +WARNHI_temp125 = "78000" +WARNHI_temp126 = "78000" +WARNHI_temp127 = "78000" +WARNHI_temp128 = "78000" +WARNHI_temp129 = "78000" +WARNHI_temp130 = "78000" +WARNHI_temp131 = "78000" +WARNHI_temp132 = "78000" +WARNHI_temp133 = "78000" +WARNHI_temp134 = "78000" +WARNHI_temp135 = "78000" +WARNHI_temp136 = "78000" +WARNHI_temp137 = "78000" +WARNHI_temp138 = "78000" +WARNHI_temp255 = "80000" +WARNHI_power2 = "190000000" +WARNHI_power3 = "180000000" +WARNHI_power4 = "40000000" +CRITHI_temp35 = "85000" +CRITHI_temp36 = "85000" +CRITHI_temp37 = "85000" +CRITHI_temp38 = "85000" +CRITHI_temp39 = "85000" +CRITHI_temp40 = "85000" +CRITHI_temp41 = "85000" +CRITHI_temp42 = "85000" +CRITHI_temp115 = "90000" +CRITHI_temp116 = "90000" +CRITHI_temp117 = "90000" +CRITHI_temp118 = "90000" +CRITHI_temp119 = "90000" +CRITHI_temp120 = "90000" +CRITHI_temp121 = "90000" +CRITHI_temp122 = "90000" +CRITHI_temp123 = "90000" +CRITHI_temp124 = "90000" +CRITHI_temp125 = "90000" +CRITHI_temp126 = "90000" +CRITHI_temp127 = "90000" +CRITHI_temp128 = "90000" +CRITHI_temp129 = "90000" +CRITHI_temp130 = "90000" +CRITHI_temp131 = "90000" +CRITHI_temp132 = "90000" +CRITHI_temp133 = "90000" +CRITHI_temp134 = "90000" +CRITHI_temp135 = "90000" +CRITHI_temp136 = "90000" +CRITHI_temp137 = "90000" +CRITHI_temp138 = "90000" +CRITHI_temp255 = "92000" +CRITHI_power2 = "250000000" +CRITHI_power3 = "240000000" +CRITHI_power4 = "60000000" diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/cpu-power-reporting.patch b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/cpu-power-reporting.patch new file mode 100644 index 000000000..7a45a46cb --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/cpu-power-reporting.patch @@ -0,0 +1,150 @@ +diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js +index 7643a4e..df0e7cf 100644 +--- a/app/common/services/api-utils.js ++++ b/app/common/services/api-utils.js +@@ -1488,22 +1488,42 @@ window.angular && (function(angular) { + }); + return $q.all(promises); + }, +- getPowerConsumption: function() { ++ getCPUPowerConsumption: function() { + return $http({ + method: 'GET', + url: DataService.getHost() + +- '/xyz/openbmc_project/sensors/power/total_power', ++ '/xyz/openbmc_project/sensors/power/p0_power', + withCredentials: true + }) + .then( + function(response) { + var json = JSON.stringify(response.data); + var content = JSON.parse(json); ++ var first_cpu_data = content.data; + +- return getScaledValue( +- content.data.Value, content.data.Scale) + +- ' ' + +- Constants.POWER_CONSUMPTION_TEXT[content.data.Unit]; ++ return $http({ ++ method: 'GET', ++ url: DataService.getHost() + ++ '/xyz/openbmc_project/sensors/power/p1_power', ++ withCredentials: true ++ }) ++ .then( ++ function(response) { ++ var json = JSON.stringify(response.data); ++ var content = JSON.parse(json); ++ var second_cpu_value = content.data.Value; ++ ++ return getScaledValue( ++ first_cpu_data.Value + second_cpu_value, first_cpu_data.Scale) + ++ ' ' + ++ Constants.POWER_CONSUMPTION_TEXT[first_cpu_data.Unit]; ++ }, ++ function(error) { ++ return getScaledValue( ++ first_cpu_data.Value, first_cpu_data.Scale) + ++ ' ' + ++ Constants.POWER_CONSUMPTION_TEXT[first_cpu_data.Unit]; ++ }); + }, + function(error) { + if ('Not Found' == error.statusText) { +diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html +index 629e0ab..03644c6 100644 +--- a/app/overview/controllers/system-overview-controller.html ++++ b/app/overview/controllers/system-overview-controller.html +@@ -83,8 +83,8 @@ + <ul class="overview__metadata-wrapper"> + <li class="overview__metadata-block"> + <dl> +- <dt class="content-label">Power Consumption</dt> +- <dd class="courier-bold">{{power_consumption}}</dd> ++ <dt class="content-label">CPU Power Consumption</dt> ++ <dd class="courier-bold">{{cpu_power_consumption}}</dd> + </dl> + </li> + <li class="overview__metadata-block"> +diff --git a/app/overview/controllers/system-overview-controller.js b/app/overview/controllers/system-overview-controller.js +index 0b7d2f0..b466b6a 100644 +--- a/app/overview/controllers/system-overview-controller.js ++++ b/app/overview/controllers/system-overview-controller.js +@@ -19,7 +19,7 @@ window.angular && (function(angular) { + $scope.bmc_firmware = ''; + $scope.bmc_time = ''; + $scope.server_firmware = ''; +- $scope.power_consumption = ''; ++ $scope.cpu_power_consumption = ''; + $scope.power_cap = ''; + $scope.bmc_ip_addresses = []; + $scope.loading = false; +@@ -77,9 +77,9 @@ window.angular && (function(angular) { + console.log(JSON.stringify(error)); + }); + +- var getPowerConsumptionPromise = APIUtils.getPowerConsumption().then( ++ var getCPUPowerConsumptionPromise = APIUtils.getCPUPowerConsumption().then( + function(data) { +- $scope.power_consumption = data; ++ $scope.cpu_power_consumption = data; + }, + function(error) { + console.log(JSON.stringify(error)); +@@ -114,7 +114,7 @@ window.angular && (function(angular) { + getLEDStatePromise, + getBMCTimePromise, + getServerInfoPromise, +- getPowerConsumptionPromise, ++ getCPUPowerConsumptionPromise, + getPowerCapPromise, + getNetworkInfoPromise, + ]; +diff --git a/app/server-control/controllers/power-usage-controller.html b/app/server-control/controllers/power-usage-controller.html +index 62ca3da..273cf9b 100644 +--- a/app/server-control/controllers/power-usage-controller.html ++++ b/app/server-control/controllers/power-usage-controller.html +@@ -11,8 +11,8 @@ + <fieldset> + <ul class="power-usage__metadata-wrapper"> + <li class="power-usage__metadata-block"> +- <p class="content-label">Power Consumption</p> +- <p class="courier-bold">{{power_consumption}}</p> ++ <p class="content-label">CPU Power Consumption</p> ++ <p class="courier-bold">{{cpu_power_consumption}}</p> + </li> + <li class="power-usage__metadata-block"> + <div class="toggle inline"> +diff --git a/app/server-control/controllers/power-usage-controller.js b/app/server-control/controllers/power-usage-controller.js +index 9398259..bb2bf0d 100644 +--- a/app/server-control/controllers/power-usage-controller.js ++++ b/app/server-control/controllers/power-usage-controller.js +@@ -12,7 +12,7 @@ window.angular && (function(angular) { + angular.module('app.serverControl').controller('powerUsageController', [ + '$scope', '$window', 'APIUtils', '$route', '$q', 'toastService', + function($scope, $window, APIUtils, $route, $q, toastService) { +- $scope.power_consumption = ''; ++ $scope.cpu_power_consumption = ''; + $scope.power_cap = {}; + $scope.loading = false; + loadPowerData(); +@@ -28,16 +28,16 @@ window.angular && (function(angular) { + console.log(JSON.stringify(error)); + }); + +- var getPowerConsumptionPromise = APIUtils.getPowerConsumption().then( ++ var getCPUPowerConsumptionPromise = APIUtils.getCPUPowerConsumption().then( + function(data) { +- $scope.power_consumption = data; ++ $scope.cpu_power_consumption = data; + }, + function(error) { + console.log(JSON.stringify(error)); + }); + + var promises = [ +- getPowerConsumptionPromise, ++ getCPUPowerConsumptionPromise, + getPowerCapPromise, + ]; + diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/login-page-name.patch b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/login-page-name.patch new file mode 100644 index 000000000..79ef25255 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/login-page-name.patch @@ -0,0 +1,13 @@ +diff --git a/app/login/controllers/login-controller.html b/app/login/controllers/login-controller.html +index b89c2c4..fd03283 100644 +--- a/app/login/controllers/login-controller.html ++++ b/app/login/controllers/login-controller.html +@@ -2,7 +2,7 @@ + <div class="row"> + <div class="columns large-6"> + <img src="../../assets/images/logo.svg" class="login__logo" alt="OpenBMC logo"/> +- <h1 class="login__desc">OpenBMC</h1> ++ <h3 class="login__desc">Talos™ II</h3> + </div> + <div class="columns large-6"> + <form id="login__form" name="login__form" action="" ng-class="{'submitted' : submitted}"> diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/tachometer-display.patch b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/tachometer-display.patch new file mode 100644 index 000000000..f25c799b7 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/tachometer-display.patch @@ -0,0 +1,13 @@ +diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js +index 4298884..e1881ff 100644 +--- a/app/common/services/api-utils.js ++++ b/app/common/services/api-utils.js +@@ -1472,7 +1472,7 @@ window.angular && (function(angular) { + } + + function titlelize(title) { +- title = title.replace(/([A-Z0-9]+)/g, ' $1').replace(/^\s+/, ''); ++ title = title.replace(/tach/g, ' Tachometer').replace(/([A-Z0-9]+)/g, ' $1').replace(/^\s+/, ''); + for (var i = 0; i < Constants.HARDWARE.uppercase_titles.length; + i++) { + if (title.toLowerCase().indexOf( diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend new file mode 100644 index 000000000..5fac6e13c --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/phosphor-webui:" +SRC_URI += "file://login-page-name.patch \ + file://cpu-power-reporting.patch \ + file://tachometer-display.patch \ + " diff --git a/meta-rcs/recipes-phosphor/binary-block-editor/binary-block-editor.bb b/meta-rcs/recipes-phosphor/binary-block-editor/binary-block-editor.bb new file mode 100644 index 000000000..42570a218 --- /dev/null +++ b/meta-rcs/recipes-phosphor/binary-block-editor/binary-block-editor.bb @@ -0,0 +1,29 @@ +SUMMARY = "Simple binary block editor" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" + +PE = "0" +PV = "0.2.2+git${SRCPV}" +SRCREV = "6c76ee16e1d4f1057ce37166001e95a87c5acb39" + +SRC_URI = "git://scm.raptorcs.com/scm/git/binary-block-editor;branch=master;protocol=https" +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +do_configure_prepend () { + cd ${S} + aclocal + autoconf --force + libtoolize --automake -c --force + automake -ac +} + +do_install () { + install -d ${D}${bindir} + install -m 755 ${S}/src/bbe ${D}${bindir}/bbe + + install -d ${STAGING_DIR}/bin + install -m 755 ${S}/src/bbe ${STAGING_DIR}/bin/bbe +} diff --git a/poky/meta/classes/rootfs-postcommands.bbclass b/poky/meta/classes/rootfs-postcommands.bbclass index bde58ad6c..892f5a0ad 100644 --- a/poky/meta/classes/rootfs-postcommands.bbclass +++ b/poky/meta/classes/rootfs-postcommands.bbclass @@ -95,26 +95,6 @@ read_only_rootfs_hook () { sed -i -e '/^[#[:space:]]*\/dev\/root/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}' ${IMAGE_ROOTFS}/etc/fstab fi - # If we're using openssh and the /etc/ssh directory has no pre-generated keys, - # we should configure openssh to use the configuration file /etc/ssh/sshd_config_readonly - # and the keys under /var/run/ssh. - if [ -d ${IMAGE_ROOTFS}/etc/ssh ]; then - if [ -e ${IMAGE_ROOTFS}/etc/ssh/ssh_host_rsa_key ]; then - echo "SYSCONFDIR=\${SYSCONFDIR:-/etc/ssh}" >> ${IMAGE_ROOTFS}/etc/default/ssh - echo "SSHD_OPTS=" >> ${IMAGE_ROOTFS}/etc/default/ssh - else - echo "SYSCONFDIR=\${SYSCONFDIR:-/var/run/ssh}" >> ${IMAGE_ROOTFS}/etc/default/ssh - echo "SSHD_OPTS='-f /etc/ssh/sshd_config_readonly'" >> ${IMAGE_ROOTFS}/etc/default/ssh - fi - fi - - # Also tweak the key location for dropbear in the same way. - if [ -d ${IMAGE_ROOTFS}/etc/dropbear ]; then - if [ ! -e ${IMAGE_ROOTFS}/etc/dropbear/dropbear_rsa_host_key ]; then - echo "DROPBEAR_RSAKEY_DIR=/var/lib/dropbear" >> ${IMAGE_ROOTFS}/etc/default/dropbear - fi - fi - if ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "true", "false", d)}; then # Change the value of ROOTFS_READ_ONLY in /etc/default/rcS to yes if [ -e ${IMAGE_ROOTFS}/etc/default/rcS ]; then diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2019.01.bb b/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2019.01.bb index b5ce56847..0ba983072 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2019.01.bb +++ b/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2019.01.bb @@ -20,6 +20,11 @@ do_install () { install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config + + install -d ${STAGING_DIR}/bin + install -m 755 ${S}/tools/env/fw_printenv ${STAGING_DIR}/bin/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${STAGING_DIR}/bin/fw_setenv + install -m 644 ${WORKDIR}/fw_env.config ${STAGING_DIR}/fw_env.config } do_install_class-cross () { diff --git a/poky/meta/recipes-connectivity/openssh/openssh/sshd_config b/poky/meta/recipes-connectivity/openssh/openssh/sshd_config index 15f061b57..0eee29ab8 100644 --- a/poky/meta/recipes-connectivity/openssh/openssh/sshd_config +++ b/poky/meta/recipes-connectivity/openssh/openssh/sshd_config @@ -97,7 +97,7 @@ ChallengeResponseAuthentication no Compression no ClientAliveInterval 15 ClientAliveCountMax 4 -#UseDNS no +UseDNS no #PidFile /var/run/sshd.pid #MaxStartups 10:30:100 #PermitTunnel no diff --git a/poky/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service b/poky/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service index 603c33787..dc4ba33ca 100644 --- a/poky/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service +++ b/poky/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service @@ -1,6 +1,6 @@ [Unit] Description=OpenSSH Key Generation -RequiresMountsFor=/var /run +RequiresMountsFor=/etc [Service] ExecStart=@LIBEXECDIR@/sshd_check_keys diff --git a/poky/meta/recipes-core/systemd/systemd_241.bb b/poky/meta/recipes-core/systemd/systemd_241.bb index e61e07e95..9c001db42 100644 --- a/poky/meta/recipes-core/systemd/systemd_241.bb +++ b/poky/meta/recipes-core/systemd/systemd_241.bb @@ -288,6 +288,11 @@ do_install() { # duplicate udevadm for postinst script install -d ${D}${libexecdir} ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm + + # These just waste space in a BMC environment + rm -f ${D}/lib/udev/scsi_id + rm -f ${D}/lib/udev/ata_id + rm -f ${D}/lib/udev/cdrom_id } @@ -569,14 +574,11 @@ FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/systemd/network/99-default.link \ ${rootlibexecdir}/systemd/systemd-udevd \ ${rootlibexecdir}/udev/accelerometer \ - ${rootlibexecdir}/udev/ata_id \ - ${rootlibexecdir}/udev/cdrom_id \ ${rootlibexecdir}/udev/collect \ ${rootlibexecdir}/udev/findkeyboards \ ${rootlibexecdir}/udev/keyboard-force-release.sh \ ${rootlibexecdir}/udev/keymap \ ${rootlibexecdir}/udev/mtd_probe \ - ${rootlibexecdir}/udev/scsi_id \ ${rootlibexecdir}/udev/v4l_id \ ${rootlibexecdir}/udev/keymaps \ ${rootlibexecdir}/udev/rules.d/*.rules \ diff --git a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb deleted file mode 100644 index ad7babf7a..000000000 --- a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ /dev/null @@ -1,937 +0,0 @@ -SUMMARY = "Firmware files for use with Linux kernel" -SECTION = "kernel" - -LICENSE = "\ - Firmware-Abilis \ - & Firmware-adsp_sst \ - & Firmware-agere \ - & Firmware-amdgpu \ - & Firmware-amd-ucode \ - & Firmware-atheros_firmware \ - & Firmware-atmel \ - & Firmware-broadcom_bcm43xx \ - & Firmware-ca0132 \ - & Firmware-cavium \ - & Firmware-chelsio_firmware \ - & Firmware-cw1200 \ - & Firmware-cypress \ - & Firmware-dib0700 \ - & Firmware-e100 \ - & Firmware-ene_firmware \ - & Firmware-fw_sst_0f28 \ - & Firmware-go7007 \ - & Firmware-GPLv2 \ - & Firmware-hfi1_firmware \ - & Firmware-i2400m \ - & Firmware-i915 \ - & Firmware-ibt_firmware \ - & Firmware-it913x \ - & Firmware-iwlwifi_firmware \ - & Firmware-IntcSST2 \ - & Firmware-kaweth \ - & Firmware-Marvell \ - & Firmware-moxa \ - & Firmware-myri10ge_firmware \ - & Firmware-netronome \ - & Firmware-nvidia \ - & Firmware-OLPC \ - & Firmware-ath9k-htc \ - & Firmware-phanfw \ - & Firmware-qat \ - & Firmware-qcom \ - & Firmware-qla1280 \ - & Firmware-qla2xxx \ - & Firmware-qualcommAthos_ar3k \ - & Firmware-qualcommAthos_ath10k \ - & Firmware-r8a779x_usb3 \ - & Firmware-radeon \ - & Firmware-ralink_a_mediatek_company_firmware \ - & Firmware-ralink-firmware \ - & Firmware-rtlwifi_firmware \ - & Firmware-imx-sdma_firmware \ - & Firmware-siano \ - & Firmware-tda7706-firmware \ - & Firmware-ti-connectivity \ - & Firmware-ti-keystone \ - & Firmware-ueagle-atm4-firmware \ - & Firmware-via_vt6656 \ - & Firmware-wl1251 \ - & Firmware-xc4000 \ - & Firmware-xc5000 \ - & Firmware-xc5000c \ - & WHENCE \ -" - -LIC_FILES_CHKSUM = "\ - file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ - file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ - file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ - file://LICENSE.amdgpu;md5=ab515ef6495ab5c5a3b08ab2db62df11 \ - file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \ - file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ - file://LICENSE.atmel;md5=aa74ac0c60595dee4d4e239107ea77a3 \ - file://LICENCE.broadcom_bcm43xx;md5=3160c14df7228891b868060e1951dfbc \ - file://LICENCE.ca0132;md5=209b33e66ee5be0461f13d31da392198 \ - file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0 \ - file://LICENCE.cavium;md5=c37aaffb1ebe5939b2580d073a95daea \ - file://LICENCE.chelsio_firmware;md5=819aa8c3fa453f1b258ed8d168a9d903 \ - file://LICENCE.cw1200;md5=f0f770864e7a8444a5c5aa9d12a3a7ed \ - file://LICENCE.cypress;md5=48cd9436c763bf873961f9ed7b5c147b \ - file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \ - file://LICENCE.e100;md5=ec0f84136766df159a3ae6d02acdf5a8 \ - file://LICENCE.ene_firmware;md5=ed67f0f62f8f798130c296720b7d3921 \ - file://LICENCE.fw_sst_0f28;md5=6353931c988ad52818ae733ac61cd293 \ - file://LICENCE.go7007;md5=c0bb9f6aaaba55b0529ee9b30aa66beb \ - file://GPL-2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.hfi1_firmware;md5=5e7b6e586ce7339d12689e49931ad444 \ - file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \ - file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \ - file://LICENCE.ibt_firmware;md5=fdbee1ddfe0fb7ab0b2fcd6b454a366b \ - file://LICENCE.IntcSST2;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ - file://LICENCE.it913x;md5=1fbf727bfb6a949810c4dbfa7e6ce4f8 \ - file://LICENCE.iwlwifi_firmware;md5=3fd842911ea93c29cd32679aa23e1c88 \ - file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \ - file://LICENCE.Marvell;md5=9ddea1734a4baf3c78d845151f42a37a \ - file://LICENCE.mediatek;md5=7c1976b63217d76ce47d0a11d8a79cf2 \ - file://LICENCE.moxa;md5=1086614767d8ccf744a923289d3d4261 \ - file://LICENCE.myri10ge_firmware;md5=42e32fb89f6b959ca222e25ac8df8fed \ - file://LICENCE.Netronome;md5=4add08f2577086d44447996503cddf5f \ - file://LICENCE.nvidia;md5=4428a922ed3ba2ceec95f076a488ce07 \ - file://LICENCE.OLPC;md5=5b917f9d8c061991be4f6f5f108719cd \ - file://LICENCE.open-ath9k-htc-firmware;md5=1b33c9f4d17bc4d457bdb23727046837 \ - file://LICENCE.phanfw;md5=954dcec0e051f9409812b561ea743bfa \ - file://LICENCE.qat_firmware;md5=9e7d8bea77612d7cc7d9e9b54b623062 \ - file://LICENSE.qcom;md5=164e3362a538eb11d3ac51e8e134294b \ - file://LICENCE.qla1280;md5=d6895732e622d950609093223a2c4f5d \ - file://LICENCE.qla2xxx;md5=505855e921b75f1be4a437ad9b79dff0 \ - file://LICENSE.QualcommAtheros_ar3k;md5=b5fe244fb2b532311de1472a3bc06da5 \ - file://LICENSE.QualcommAtheros_ath10k;md5=cb42b686ee5f5cb890275e4321db60a8 \ - file://LICENCE.r8a779x_usb3;md5=4c1671656153025d7076105a5da7e498 \ - file://LICENSE.radeon;md5=68ec28bacb3613200bca44f404c69b16 \ - file://LICENCE.ralink_a_mediatek_company_firmware;md5=728f1a85fd53fd67fa8d7afb080bc435 \ - file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \ - file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ - file://LICENSE.sdma_firmware;md5=51e8c19ecc2270f4b8ea30341ad63ce9 \ - file://LICENCE.siano;md5=4556c1bf830067f12ca151ad953ec2a5 \ - file://LICENCE.tda7706-firmware.txt;md5=835997cf5e3c131d0dddd695c7d9103e \ - file://LICENCE.ti-connectivity;md5=c5e02be633f1499c109d1652514d85ec \ - file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \ - file://LICENCE.ueagle-atm4-firmware;md5=4ed7ea6b507ccc583b9d594417714118 \ - file://LICENCE.via_vt6656;md5=e4159694cba42d4377a912e78a6e850f \ - file://LICENCE.wl1251;md5=ad3f81922bb9e197014bb187289d3b5b \ - file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ - file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ - file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=ef36d3383becd18f36ce32d84109386f \ -" - -# These are not common licenses, set NO_GENERIC_LICENSE for them -# so that the license files will be copied from fetched source -NO_GENERIC_LICENSE[Firmware-Abilis] = "LICENCE.Abilis" -NO_GENERIC_LICENSE[Firmware-adsp_sst] = "LICENCE.adsp_sst" -NO_GENERIC_LICENSE[Firmware-agere] = "LICENCE.agere" -NO_GENERIC_LICENSE[Firmware-amdgpu] = "LICENSE.amdgpu" -NO_GENERIC_LICENSE[Firmware-amd-ucode] = "LICENSE.amd-ucode" -NO_GENERIC_LICENSE[Firmware-atheros_firmware] = "LICENCE.atheros_firmware" -NO_GENERIC_LICENSE[Firmware-atmel] = "LICENSE.atmel" -NO_GENERIC_LICENSE[Firmware-broadcom_bcm43xx] = "LICENCE.broadcom_bcm43xx" -NO_GENERIC_LICENSE[Firmware-ca0132] = "LICENCE.ca0132" -NO_GENERIC_LICENSE[Firmware-cadence] = "LICENCE.cadence" -NO_GENERIC_LICENSE[Firmware-cavium] = "LICENCE.cavium" -NO_GENERIC_LICENSE[Firmware-chelsio_firmware] = "LICENCE.chelsio_firmware" -NO_GENERIC_LICENSE[Firmware-cw1200] = "LICENCE.cw1200" -NO_GENERIC_LICENSE[Firmware-cypress] = "LICENCE.cypress" -NO_GENERIC_LICENSE[Firmware-dib0700] = "LICENSE.dib0700" -NO_GENERIC_LICENSE[Firmware-e100] = "LICENCE.e100" -NO_GENERIC_LICENSE[Firmware-ene_firmware] = "LICENCE.ene_firmware" -NO_GENERIC_LICENSE[Firmware-fw_sst_0f28] = "LICENCE.fw_sst_0f28" -NO_GENERIC_LICENSE[Firmware-go7007] = "LICENCE.go7007" -NO_GENERIC_LICENSE[Firmware-GPLv2] = "GPL-2" -NO_GENERIC_LICENSE[Firmware-hfi1_firmware] = "LICENSE.hfi1_firmware" -NO_GENERIC_LICENSE[Firmware-i2400m] = "LICENCE.i2400m" -NO_GENERIC_LICENSE[Firmware-i915] = "LICENSE.i915" -NO_GENERIC_LICENSE[Firmware-ibt_firmware] = "LICENCE.ibt_firmware" -NO_GENERIC_LICENSE[Firmware-IntcSST2] = "LICENCE.IntcSST2" -NO_GENERIC_LICENSE[Firmware-it913x] = "LICENCE.it913x" -NO_GENERIC_LICENSE[Firmware-iwlwifi_firmware] = "LICENCE.iwlwifi_firmware" -NO_GENERIC_LICENSE[Firmware-kaweth] = "LICENCE.kaweth" -NO_GENERIC_LICENSE[Firmware-Marvell] = "LICENCE.Marvell" -NO_GENERIC_LICENSE[Firmware-mediatek] = "LICENCE.mediatek" -NO_GENERIC_LICENSE[Firmware-moxa] = "LICENCE.moxa" -NO_GENERIC_LICENSE[Firmware-myri10ge_firmware] = "LICENCE.myri10ge_firmware" -NO_GENERIC_LICENSE[Firmware-netronome] = "LICENCE.Netronome" -NO_GENERIC_LICENSE[Firmware-nvidia] = "LICENCE.nvidia" -NO_GENERIC_LICENSE[Firmware-OLPC] = "LICENCE.OLPC" -NO_GENERIC_LICENSE[Firmware-ath9k-htc] = "LICENCE.open-ath9k-htc-firmware" -NO_GENERIC_LICENSE[Firmware-phanfw] = "LICENCE.phanfw" -NO_GENERIC_LICENSE[Firmware-qat] = "LICENCE.qat_firmware" -NO_GENERIC_LICENSE[Firmware-qcom] = "LICENSE.qcom" -NO_GENERIC_LICENSE[Firmware-qla1280] = "LICENCE.qla1280" -NO_GENERIC_LICENSE[Firmware-qla2xxx] = "LICENCE.qla2xxx" -NO_GENERIC_LICENSE[Firmware-qualcommAthos_ar3k] = "LICENSE.QualcommAtheros_ar3k" -NO_GENERIC_LICENSE[Firmware-qualcommAthos_ath10k] = "LICENSE.QualcommAtheros_ath10k" -NO_GENERIC_LICENSE[Firmware-r8a779x_usb3] = "LICENCE.r8a779x_usb3" -NO_GENERIC_LICENSE[Firmware-radeon] = "LICENSE.radeon" -NO_GENERIC_LICENSE[Firmware-ralink_a_mediatek_company_firmware] = "LICENCE.ralink_a_mediatek_company_firmware" -NO_GENERIC_LICENSE[Firmware-ralink-firmware] = "LICENCE.ralink-firmware.txt" -NO_GENERIC_LICENSE[Firmware-rtlwifi_firmware] = "LICENCE.rtlwifi_firmware.txt" -NO_GENERIC_LICENSE[Firmware-siano] = "LICENCE.siano" -NO_GENERIC_LICENSE[Firmware-imx-sdma_firmware] = "LICENSE.sdma_firmware" -NO_GENERIC_LICENSE[Firmware-tda7706-firmware] = "LICENCE.tda7706-firmware.txt" -NO_GENERIC_LICENSE[Firmware-ti-connectivity] = "LICENCE.ti-connectivity" -NO_GENERIC_LICENSE[Firmware-ti-keystone] = "LICENCE.ti-keystone" -NO_GENERIC_LICENSE[Firmware-ueagle-atm4-firmware] = "LICENCE.ueagle-atm4-firmware" -NO_GENERIC_LICENSE[Firmware-via_vt6656] = "LICENCE.via_vt6656" -NO_GENERIC_LICENSE[Firmware-wl1251] = "LICENCE.wl1251" -NO_GENERIC_LICENSE[Firmware-xc4000] = "LICENCE.xc4000" -NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" -NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" -NO_GENERIC_LICENSE[WHENCE] = "WHENCE" - -SRCREV = "7bc246451318b3536d9bfd3c4e46d541a9831b33" -PE = "1" -PV = "0.0+git${SRCPV}" - -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" - -UPSTREAM_CHECK_COMMITS = "1" - -S = "${WORKDIR}/git" - -inherit allarch - -CLEANBROKEN = "1" - -do_compile() { - : -} - -do_install() { - install -d ${D}${nonarch_base_libdir}/firmware/ - cp -r * ${D}${nonarch_base_libdir}/firmware/ - - # Avoid Makefile to be deployed - rm ${D}${nonarch_base_libdir}/firmware/Makefile - - # Remove unbuild firmware which needs cmake and bash - rm ${D}${nonarch_base_libdir}/firmware/carl9170fw -rf - - # Remove pointless bash script - rm ${D}${nonarch_base_libdir}/firmware/configure - - # Remove python script used to check the WHENCE file - rm ${D}${nonarch_base_libdir}/firmware/check_whence.py - - # Libertas sd8686 - ln -sf libertas/sd8686_v9.bin ${D}${nonarch_base_libdir}/firmware/sd8686.bin - ln -sf libertas/sd8686_v9_helper.bin ${D}${nonarch_base_libdir}/firmware/sd8686_helper.bin - - # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it - ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . ) -} - - -PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ - ${PN}-mt7601u-license ${PN}-mt7601u \ - ${PN}-radeon-license ${PN}-radeon \ - ${PN}-marvell-license ${PN}-pcie8897 ${PN}-pcie8997 \ - ${PN}-sd8686 ${PN}-sd8688 ${PN}-sd8787 ${PN}-sd8797 ${PN}-sd8801 ${PN}-sd8887 ${PN}-sd8897 \ - ${PN}-usb8997 \ - ${PN}-ti-connectivity-license ${PN}-wlcommon ${PN}-wl12xx ${PN}-wl18xx \ - ${PN}-vt6656-license ${PN}-vt6656 \ - ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \ - ${PN}-rtl8168 \ - ${PN}-cypress-license \ - ${PN}-broadcom-license \ - ${PN}-bcm-0bb4-0306 \ - ${PN}-bcm43143 \ - ${PN}-bcm43236b \ - ${PN}-bcm43241b0 \ - ${PN}-bcm43241b4 \ - ${PN}-bcm43241b5 \ - ${PN}-bcm43242a \ - ${PN}-bcm4329 \ - ${PN}-bcm4329-fullmac \ - ${PN}-bcm4330 \ - ${PN}-bcm4334 \ - ${PN}-bcm43340 \ - ${PN}-bcm4335 \ - ${PN}-bcm43362 \ - ${PN}-bcm4339 \ - ${PN}-bcm43430 \ - ${PN}-bcm43430a0 \ - ${PN}-bcm43455 \ - ${PN}-bcm4350 \ - ${PN}-bcm4350c2 \ - ${PN}-bcm4354 \ - ${PN}-bcm4356 \ - ${PN}-bcm4356-pcie \ - ${PN}-bcm43569 \ - ${PN}-bcm43570 \ - ${PN}-bcm4358 \ - ${PN}-bcm43602 \ - ${PN}-bcm4366b \ - ${PN}-bcm4371 \ - ${PN}-bcm4373 \ - ${PN}-bcm43xx \ - ${PN}-bcm43xx-hdr \ - ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \ - ${PN}-gplv2-license ${PN}-carl9170 \ - ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k ${PN}-qca \ - \ - ${PN}-imx-sdma-license ${PN}-imx-sdma-imx6q ${PN}-imx-sdma-imx7d \ - \ - ${PN}-iwlwifi-license ${PN}-iwlwifi \ - ${PN}-iwlwifi-135-6 \ - ${PN}-iwlwifi-3160-7 ${PN}-iwlwifi-3160-8 ${PN}-iwlwifi-3160-9 \ - ${PN}-iwlwifi-3160-10 ${PN}-iwlwifi-3160-12 ${PN}-iwlwifi-3160-13 \ - ${PN}-iwlwifi-3160-16 ${PN}-iwlwifi-3160-17 \ - ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2a-6 \ - ${PN}-iwlwifi-6000g2b-5 ${PN}-iwlwifi-6000g2b-6 \ - ${PN}-iwlwifi-6050-4 ${PN}-iwlwifi-6050-5 \ - ${PN}-iwlwifi-7260 \ - ${PN}-iwlwifi-7265 \ - ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \ - ${PN}-iwlwifi-9000 \ - ${PN}-iwlwifi-misc \ - ${PN}-ibt-license ${PN}-ibt ${PN}-ibt-misc \ - ${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7 ${PN}-ibt-hw-37-8 \ - ${PN}-ibt-17 \ - ${PN}-i915-license ${PN}-i915 \ - ${PN}-adsp-sst-license ${PN}-adsp-sst \ - ${PN}-bnx2-mips \ - ${PN}-liquidio \ - ${PN}-netronome-license ${PN}-netronome \ - ${PN}-qat ${PN}-qat-license \ - ${PN}-qcom-license \ - ${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 \ - ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 \ - ${PN}-whence-license \ - ${PN}-license \ - " - -# For atheros -LICENSE_${PN}-ar9170 = "Firmware-atheros_firmware" -LICENSE_${PN}-ath6k = "Firmware-atheros_firmware" -LICENSE_${PN}-ath9k = "Firmware-atheros_firmware" -LICENSE_${PN}-atheros-license = "Firmware-atheros_firmware" - -FILES_${PN}-atheros-license = "${nonarch_base_libdir}/firmware/LICENCE.atheros_firmware" -FILES_${PN}-ar9170 = " \ - ${nonarch_base_libdir}/firmware/ar9170*.fw \ -" -FILES_${PN}-ath6k = " \ - ${nonarch_base_libdir}/firmware/ath6k \ -" -FILES_${PN}-ath9k = " \ - ${nonarch_base_libdir}/firmware/ar9271.fw \ - ${nonarch_base_libdir}/firmware/ar7010*.fw \ - ${nonarch_base_libdir}/firmware/htc_9271.fw \ - ${nonarch_base_libdir}/firmware/htc_7010.fw \ - ${nonarch_base_libdir}/firmware/ath9k_htc/htc_7010-1.4.0.fw \ - ${nonarch_base_libdir}/firmware/ath9k_htc/htc_9271-1.4.0.fw \ -" - -RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license" -RDEPENDS_${PN}-ath6k += "${PN}-atheros-license" -RDEPENDS_${PN}-ath9k += "${PN}-atheros-license" - -# For carl9170 -LICENSE_${PN}-carl9170 = "Firmware-GPLv2" -LICENSE_${PN}-gplv2-license = "Firmware-GPLv2" - -FILES_${PN}-gplv2-license = "${nonarch_base_libdir}/firmware/GPL-2" -FILES_${PN}-carl9170 = " \ - ${nonarch_base_libdir}/firmware/carl9170*.fw \ -" - -RDEPENDS_${PN}-carl9170 += "${PN}-gplv2-license" - -# For QualCommAthos -LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k" -LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" -LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k" -LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k" -LICENSE_${PN}-qca = "Firmware-qualcommAthos_ath10k" - -FILES_${PN}-ar3k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ar3k" -FILES_${PN}-ar3k = " \ - ${nonarch_base_libdir}/firmware/ar3k \ -" - -FILES_${PN}-ath10k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ath10k" -FILES_${PN}-ath10k = " \ - ${nonarch_base_libdir}/firmware/ath10k \ -" - -FILES_${PN}-qca = " \ - ${nonarch_base_libdir}/firmware/qca \ -" - -RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license" -RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license" -RDEPENDS_${PN}-qca += "${PN}-ath10k-license" - -# For ralink -LICENSE_${PN}-ralink = "Firmware-ralink-firmware" -LICENSE_${PN}-ralink-license = "Firmware-ralink-firmware" - -FILES_${PN}-ralink-license = "${nonarch_base_libdir}/firmware/LICENCE.ralink-firmware.txt" -FILES_${PN}-ralink = " \ - ${nonarch_base_libdir}/firmware/rt*.bin \ -" - -RDEPENDS_${PN}-ralink += "${PN}-ralink-license" - -# For mediatek MT7601U -LICENSE_${PN}-mt7601u = "Firmware-ralink_a_mediatek_company_firmware" -LICENSE_${PN}-mt7601u-license = "Firmware-ralink_a_mediatek_company_firmware" - -FILES_${PN}-mt7601u-license = "${nonarch_base_libdir}/firmware/LICENCE.ralink_a_mediatek_company_firmware" -FILES_${PN}-mt7601u = " \ - ${nonarch_base_libdir}/firmware/mt7601u.bin \ -" - -RDEPENDS_${PN}-mt7601u += "${PN}-mt7601u-license" - -# For radeon -LICENSE_${PN}-radeon = "Firmware-radeon" -LICENSE_${PN}-radeon-license = "Firmware-radeon" - -FILES_${PN}-radeon-license = "${nonarch_base_libdir}/firmware/LICENSE.radeon" -FILES_${PN}-radeon = " \ - ${nonarch_base_libdir}/firmware/radeon \ -" - -RDEPENDS_${PN}-radeon += "${PN}-radeon-license" - -# For marvell -LICENSE_${PN}-pcie8897 = "Firmware-Marvell" -LICENSE_${PN}-pcie8997 = "Firmware-Marvell" -LICENSE_${PN}-sd8686 = "Firmware-Marvell" -LICENSE_${PN}-sd8688 = "Firmware-Marvell" -LICENSE_${PN}-sd8787 = "Firmware-Marvell" -LICENSE_${PN}-sd8797 = "Firmware-Marvell" -LICENSE_${PN}-sd8801 = "Firmware-Marvell" -LICENSE_${PN}-sd8887 = "Firmware-Marvell" -LICENSE_${PN}-sd8897 = "Firmware-Marvell" -LICENSE_${PN}-usb8997 = "Firmware-Marvell" -LICENSE_${PN}-marvell-license = "Firmware-Marvell" - -FILES_${PN}-marvell-license = "${nonarch_base_libdir}/firmware/LICENCE.Marvell" -FILES_${PN}-pcie8897 = " \ - ${nonarch_base_libdir}/firmware/mrvl/pcie8897_uapsta.bin \ -" -FILES_${PN}-pcie8997 = " \ - ${nonarch_base_libdir}/firmware/mrvl/pcie8997_wlan_v4.bin \ - ${nonarch_base_libdir}/firmware/mrvl/pcieuart8997_combo_v4.bin \ - ${nonarch_base_libdir}/firmware/mrvl/pcieusb8997_combo_v4.bin \ -" -FILES_${PN}-sd8686 = " \ - ${nonarch_base_libdir}/firmware/libertas/sd8686_v9* \ - ${nonarch_base_libdir}/firmware/sd8686* \ -" -FILES_${PN}-sd8688 = " \ - ${nonarch_base_libdir}/firmware/libertas/sd8688* \ - ${nonarch_base_libdir}/firmware/mrvl/sd8688* \ -" -FILES_${PN}-sd8787 = " \ - ${nonarch_base_libdir}/firmware/mrvl/sd8787_uapsta.bin \ -" -FILES_${PN}-sd8797 = " \ - ${nonarch_base_libdir}/firmware/mrvl/sd8797_uapsta.bin \ -" -FILES_${PN}-sd8801 = " \ - ${nonarch_base_libdir}/firmware/mrvl/sd8801_uapsta.bin \ -" -FILES_${PN}-sd8887 = " \ - ${nonarch_base_libdir}/firmware/mrvl/sd8887_uapsta.bin \ -" -FILES_${PN}-sd8897 = " \ - ${nonarch_base_libdir}/firmware/mrvl/sd8897_uapsta.bin \ -" -FILES_${PN}-usb8997 = " \ - ${nonarch_base_libdir}/firmware/mrvl/usbusb8997_combo_v4.bin \ -" - -RDEPENDS_${PN}-sd8686 += "${PN}-marvell-license" -RDEPENDS_${PN}-sd8688 += "${PN}-marvell-license" -RDEPENDS_${PN}-sd8787 += "${PN}-marvell-license" -RDEPENDS_${PN}-sd8797 += "${PN}-marvell-license" -RDEPENDS_${PN}-sd8801 += "${PN}-marvell-license" -RDEPENDS_${PN}-sd8887 += "${PN}-marvell-license" -RDEPENDS_${PN}-sd8897 += "${PN}-marvell-license" -RDEPENDS_${PN}-usb8997 += "${PN}-marvell-license" - -# For netronome -LICENSE_${PN}-netronome = "Firmware-netronome" - -FILES_${PN}-netronome-license = " \ - ${nonarch_base_libdir}/firmware/LICENCE.Netronome \ -" -FILES_${PN}-netronome = " \ - ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0081*.nffw \ - ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0096*.nffw \ - ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0097*.nffw \ - ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0099*.nffw \ -" - -RDEPENDS_${PN}-netronome += "${PN}-netronome-license" - -# For rtl -LICENSE_${PN}-rtl8188 = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl8192cu = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl8192ce = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl8192su = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl8723 = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl8821 = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl-license = "Firmware-rtlwifi_firmware" -LICENSE_${PN}-rtl8168 = "WHENCE" - -FILES_${PN}-rtl-license = " \ - ${nonarch_base_libdir}/firmware/LICENCE.rtlwifi_firmware.txt \ -" -FILES_${PN}-rtl8188 = " \ - ${nonarch_base_libdir}/firmware/rtlwifi/rtl8188*.bin \ -" -FILES_${PN}-rtl8192cu = " \ - ${nonarch_base_libdir}/firmware/rtlwifi/rtl8192cufw*.bin \ -" -FILES_${PN}-rtl8192ce = " \ - ${nonarch_base_libdir}/firmware/rtlwifi/rtl8192cfw*.bin \ -" -FILES_${PN}-rtl8192su = " \ - ${nonarch_base_libdir}/firmware/rtlwifi/rtl8712u.bin \ -" -FILES_${PN}-rtl8723 = " \ - ${nonarch_base_libdir}/firmware/rtlwifi/rtl8723*.bin \ -" -FILES_${PN}-rtl8821 = " \ - ${nonarch_base_libdir}/firmware/rtlwifi/rtl8821*.bin \ -" -FILES_${PN}-rtl8168 = " \ - ${nonarch_base_libdir}/firmware/rtl_nic/rtl8168*.fw \ -" - -RDEPENDS_${PN}-rtl8188 += "${PN}-rtl-license" -RDEPENDS_${PN}-rtl8192ce += "${PN}-rtl-license" -RDEPENDS_${PN}-rtl8192cu += "${PN}-rtl-license" -RDEPENDS_${PN}-rtl8192su = "${PN}-rtl-license" -RDEPENDS_${PN}-rtl8723 += "${PN}-rtl-license" -RDEPENDS_${PN}-rtl8821 += "${PN}-rtl-license" -RDEPENDS_${PN}-rtl8168 += "${PN}-whence-license" - -# For ti-connectivity -LICENSE_${PN}-wlcommon = "Firmware-ti-connectivity" -LICENSE_${PN}-wl12xx = "Firmware-ti-connectivity" -LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity" -LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity" - -FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity" -FILES_${PN}-wlcommon = " \ - ${nonarch_base_libdir}/firmware/TI* \ - ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \ -" -FILES_${PN}-wl12xx = " \ - ${nonarch_base_libdir}/firmware/wl12* \ - ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \ -" -FILES_${PN}-wl18xx = " \ - ${nonarch_base_libdir}/firmware/wl18* \ - ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \ -" - -RDEPENDS_${PN}-wl12xx = "${PN}-ti-connectivity-license ${PN}-wlcommon" -RDEPENDS_${PN}-wl18xx = "${PN}-ti-connectivity-license ${PN}-wlcommon" - -# For vt6656 -LICENSE_${PN}-vt6656 = "Firmware-via_vt6656" -LICENSE_${PN}-vt6656-license = "Firmware-via_vt6656" - -FILES_${PN}-vt6656-license = "${nonarch_base_libdir}/firmware/LICENCE.via_vt6656" -FILES_${PN}-vt6656 = " \ - ${nonarch_base_libdir}/firmware/vntwusb.fw \ -" - -RDEPENDS_${PN}-vt6656 = "${PN}-vt6656-license" - -# For broadcom - -# for i in `grep brcm WHENCE | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo -e " \${PN}-$pkg \\"; done | sort -u - -LICENSE_${PN}-broadcom-license = "Firmware-broadcom_bcm43xx" -FILES_${PN}-broadcom-license = "${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx" - -# for i in `grep brcm WHENCE | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo "$i - $pkg"; echo -e "FILES_\${PN}-$pkg = \"\${nonarch_base_libdir}/firmware/brcm/$i\""; done | grep ^FILES - -FILES_${PN}-bcm43xx = "${nonarch_base_libdir}/firmware/brcm/bcm43xx-0.fw" -FILES_${PN}-bcm43xx-hdr = "${nonarch_base_libdir}/firmware/brcm/bcm43xx_hdr-0.fw" -FILES_${PN}-bcm4329-fullmac = "${nonarch_base_libdir}/firmware/brcm/bcm4329-fullmac-4.bin" -FILES_${PN}-bcm43236b = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43236b.bin" -FILES_${PN}-bcm4329 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4329-sdio.bin" -FILES_${PN}-bcm4330 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.bin" -FILES_${PN}-bcm4334 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4334-sdio.bin" -FILES_${PN}-bcm4335 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4335-sdio.bin" -FILES_${PN}-bcm4339 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4339-sdio.bin" -FILES_${PN}-bcm43241b0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b0-sdio.bin" -FILES_${PN}-bcm43241b4 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b4-sdio.bin" -FILES_${PN}-bcm43241b5 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b5-sdio.bin" -FILES_${PN}-bcm43242a = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43242a.bin" -FILES_${PN}-bcm43143 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43143.bin \ - ${nonarch_base_libdir}/firmware/brcm/brcmfmac43143-sdio.bin \ -" -FILES_${PN}-bcm43430a0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.bin" -FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.bin" -FILES_${PN}-bcm4350c2 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350c2-pcie.bin" -FILES_${PN}-bcm4350 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350-pcie.bin" -FILES_${PN}-bcm4356 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-sdio.bin" -FILES_${PN}-bcm43569 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43569.bin" -FILES_${PN}-bcm43570 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43570-pcie.bin" -FILES_${PN}-bcm4358 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4358-pcie.bin" -FILES_${PN}-bcm43602 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.bin \ - ${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.ap.bin \ -" -FILES_${PN}-bcm4366b = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4366b-pcie.bin" -FILES_${PN}-bcm4371 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4371-pcie.bin" - -# for i in `grep brcm WHENCE | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo -e "LICENSE_\${PN}-$pkg = \"Firmware-broadcom_bcm43xx\"\nRDEPENDS_\${PN}-$pkg += \"\${PN}-broadcom-license\""; done -# Currently 1st one and last 6 have cypress LICENSE - -LICENSE_${PN}-bcm43xx = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43xx += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43xx-hdr = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43xx-hdr += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4329-fullmac = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4329-fullmac += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43236b = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43236b += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4329 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4329 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4330 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4330 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4334 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4334 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4335 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4335 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4339 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4339 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43241b0 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43241b0 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43241b4 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43241b4 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43241b5 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43241b5 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43242a = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43242a += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43143 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43143 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43430a0 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43430a0 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43455 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43455 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4350c2 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4350c2 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4350 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4350 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4356 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4356 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43569 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43569 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43570 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43570 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4358 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4358 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm43602 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm43602 += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4366b = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4366b += "${PN}-broadcom-license" -LICENSE_${PN}-bcm4371 = "Firmware-broadcom_bcm43xx" -RDEPENDS_${PN}-bcm4371 += "${PN}-broadcom-license" - -# For broadcom cypress - -LICENSE_${PN}-cypress-license = "Firmware-cypress" -FILES_${PN}-cypress-license = "${nonarch_base_libdir}/firmware/LICENCE.cypress" - -FILES_${PN}-bcm-0bb4-0306 = "${nonarch_base_libdir}/firmware/brcm/BCM-0bb4-0306.hcd" -FILES_${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.bin" -FILES_${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.bin" -FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.bin" -FILES_${PN}-bcm4354 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4354-sdio.bin" -FILES_${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.bin" -FILES_${PN}-bcm4373 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.bin \ - ${nonarch_base_libdir}/firmware/brcm/brcmfmac4373.bin \ -" - -LICENSE_${PN}-bcm-0bb4-0306 = "Firmware-cypress" -RDEPENDS_${PN}-bcm-0bb4-0306 += "${PN}-cypress-license" -LICENSE_${PN}-bcm43340 = "Firmware-cypress" -RDEPENDS_${PN}-bcm43340 += "${PN}-cypress-license" -LICENSE_${PN}-bcm43362 = "Firmware-cypress" -RDEPENDS_${PN}-bcm43362 += "${PN}-cypress-license" -LICENSE_${PN}-bcm43430 = "Firmware-cypress" -RDEPENDS_${PN}-bcm43430 += "${PN}-cypress-license" -LICENSE_${PN}-bcm4354 = "Firmware-cypress" -RDEPENDS_${PN}-bcm4354 += "${PN}-cypress-license" -LICENSE_${PN}-bcm4356-pcie = "Firmware-cypress" -RDEPENDS_${PN}-bcm4356-pcie += "${PN}-cypress-license" -LICENSE_${PN}-bcm4373 = "Firmware-cypress" -RDEPENDS_${PN}-bcm4373 += "${PN}-cypress-license" - -# For Broadcom bnx2-mips -# -# which is a separate case to the other Broadcom firmwares since its -# license is contained in the shared WHENCE file. - -LICENSE_${PN}-bnx2-mips = "WHENCE" -LICENSE_${PN}-whence-license = "WHENCE" - -FILES_${PN}-bnx2-mips = "${nonarch_base_libdir}/firmware/bnx2/bnx2-mips-09-6.2.1b.fw" -FILES_${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE" - -RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license" - -# For imx-sdma -LICENSE_${PN}-imx-sdma-imx6q = "Firmware-imx-sdma_firmware" -LICENSE_${PN}-imx-sdma-imx7d = "Firmware-imx-sdma_firmware" -LICENSE_${PN}-imx-sdma-license = "Firmware-imx-sdma_firmware" - -FILES_${PN}-imx-sdma-imx6q = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin" - -RPROVIDES_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q" -RREPLACES_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q" -RCONFLICTS_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q" - -FILES_${PN}-imx-sdma-imx7d = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin" - -FILES_${PN}-imx-sdma-license = "${nonarch_base_libdir}/firmware/LICENSE.sdma_firmware" - -RDEPENDS_${PN}-imx-sdma-imx6q += "${PN}-imx-sdma-license" -RDEPENDS_${PN}-imx-sdma-imx7d += "${PN}-imx-sdma-license" - -# For iwlwifi -LICENSE_${PN}-iwlwifi = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-7 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-8 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-9 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-10 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-12 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-13 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-16 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-3160-17 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6000-4 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6000g2a-5 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6000g2a-6 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6000g2b-5 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6000g2b-6 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6050-4 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6050-5 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-7260 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-7265 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-7265d = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-8000c = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-8265 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-9000 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-misc = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-license = "Firmware-iwlwifi_firmware" - - -FILES_${PN}-iwlwifi-license = "${nonarch_base_libdir}/firmware/LICENCE.iwlwifi_firmware" -FILES_${PN}-iwlwifi-135-6 = "${nonarch_base_libdir}/firmware/iwlwifi-135-6.ucode" -FILES_${PN}-iwlwifi-3160-7 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-7.ucode" -FILES_${PN}-iwlwifi-3160-8 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-8.ucode" -FILES_${PN}-iwlwifi-3160-9 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-9.ucode" -FILES_${PN}-iwlwifi-3160-10 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-10.ucode" -FILES_${PN}-iwlwifi-3160-12 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-12.ucode" -FILES_${PN}-iwlwifi-3160-13 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-13.ucode" -FILES_${PN}-iwlwifi-3160-16 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-16.ucode" -FILES_${PN}-iwlwifi-3160-17 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-17.ucode" -FILES_${PN}-iwlwifi-6000-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6000-4.ucode" -FILES_${PN}-iwlwifi-6000g2a-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-5.ucode" -FILES_${PN}-iwlwifi-6000g2a-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-6.ucode" -FILES_${PN}-iwlwifi-6000g2b-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-5.ucode" -FILES_${PN}-iwlwifi-6000g2b-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-6.ucode" -FILES_${PN}-iwlwifi-6050-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-4.ucode" -FILES_${PN}-iwlwifi-6050-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-5.ucode" -FILES_${PN}-iwlwifi-7260 = "${nonarch_base_libdir}/firmware/iwlwifi-7260-*.ucode" -FILES_${PN}-iwlwifi-7265 = "${nonarch_base_libdir}/firmware/iwlwifi-7265-*.ucode" -FILES_${PN}-iwlwifi-7265d = "${nonarch_base_libdir}/firmware/iwlwifi-7265D-*.ucode" -FILES_${PN}-iwlwifi-8000c = "${nonarch_base_libdir}/firmware/iwlwifi-8000C-*.ucode" -FILES_${PN}-iwlwifi-8265 = "${nonarch_base_libdir}/firmware/iwlwifi-8265-*.ucode" -FILES_${PN}-iwlwifi-9000 = "${nonarch_base_libdir}/firmware/iwlwifi-9000-*.ucode" -FILES_${PN}-iwlwifi-misc = "${nonarch_base_libdir}/firmware/iwlwifi-*.ucode" - -RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-8 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-9 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-10 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-12 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-13 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-16 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-3160-17 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6000-4 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6000g2a-6 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6000g2b-5 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6050-4 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6050-5 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-7265d = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-8000c = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-8265 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-9000 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-misc = "${PN}-iwlwifi-license" - -# -iwlwifi-misc is a "catch all" package that includes all the iwlwifi -# firmwares that are not already included in other -iwlwifi- packages. -# -iwlwifi is a virtual package that depends upon all iwlwifi packages. -# These are distinct in order to allow the -misc firmwares to be installed -# without pulling in every other iwlwifi package. -ALLOW_EMPTY_${PN}-iwlwifi = "1" -ALLOW_EMPTY_${PN}-iwlwifi-misc = "1" - -# Handle package updating for the newly merged iwlwifi groupings -RPROVIDES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" -RREPLACES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" -RCONFLICTS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" - -RPROVIDES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" -RREPLACES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" -RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" - -# For ibt -LICENSE_${PN}-ibt-license = "Firmware-ibt_firmware" -LICENSE_${PN}-ibt-hw-37-7 = "Firmware-ibt_firmware" -LICENSE_${PN}-ibt-hw-37-8 = "Firmware-ibt_firmware" -LICENSE_${PN}-ibt-11-5 = "Firmware-ibt_firmware" -LICENSE_${PN}-ibt-12-16 = "Firmware-ibt_firmware" -LICENSE_${PN}-ibt-17 = "Firmware-ibt_firmware" -LICENSE_${PN}-ibt-misc = "Firmware-ibt_firmware" - -FILES_${PN}-ibt-license = "${nonarch_base_libdir}/firmware/LICENCE.ibt_firmware" -FILES_${PN}-ibt-hw-37-7 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.7*.bseq" -FILES_${PN}-ibt-hw-37-8 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.8*.bseq" -FILES_${PN}-ibt-11-5 = "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi ${nonarch_base_libdir}/firmware/intel/ibt-11-5.ddc" -FILES_${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi ${nonarch_base_libdir}/firmware/intel/ibt-12-16.ddc" -FILES_${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-17-*.ddc" -FILES_${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/ibt-*" - -RDEPENDS_${PN}-ibt-hw-37-7 = "${PN}-ibt-license" -RDEPENDS_${PN}-ibt-hw-37.8 = "${PN}-ibt-license" -RDEPENDS_${PN}-ibt-11-5 = "${PN}-ibt-license" -RDEPENDS_${PN}-ibt-12-16 = "${PN}-ibt-license" -RDEPENDS_${PN}-ibt-17 = "${PN}-ibt-license" -RDEPENDS_${PN}-ibt-misc = "${PN}-ibt-license" - -ALLOW_EMPTY_${PN}-ibt= "1" -ALLOW_EMPTY_${PN}-ibt-misc = "1" - -LICENSE_${PN}-i915 = "Firmware-i915" -LICENSE_${PN}-i915-license = "Firmware-i915" -FILES_${PN}-i915-license = "${nonarch_base_libdir}/firmware/LICENSE.i915" -FILES_${PN}-i915 = "${nonarch_base_libdir}/firmware/i915" -RDEPENDS_${PN}-i915 = "${PN}-i915-license" - -FILES_${PN}-adsp-sst-license = "${nonarch_base_libdir}/firmware/LICENCE.adsp_sst" -LICENSE_${PN}-adsp-sst = "Firmware-adsp_sst" -LICENSE_${PN}-adsp-sst-license = "Firmware-adsp_sst" -FILES_${PN}-adsp-sst = "${nonarch_base_libdir}/firmware/intel/dsp_fw*" -RDEPENDS_${PN}-adsp-sst = "${PN}-adsp-sst-license" - -# For QAT -LICENSE_${PN}-qat = "Firmware-qat" -LICENSE_${PN}-qat-license = "Firmware-qat" -FILES_${PN}-qat-license = "${nonarch_base_libdir}/firmware/LICENCE.qat_firmware" -FILES_${PN}-qat = "${nonarch_base_libdir}/firmware/qat*.bin" -RDEPENDS_${PN}-qat = "${PN}-qat-license" - -# For QCOM VPU/GPU -LICENSE_${PN}-qcom-license = "Firmware-qcom" -FILES_${PN}-qcom-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom ${nonarch_base_libdir}/firmware/qcom/NOTICE.txt" -FILES_${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" -FILES_${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" -FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" -FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" -RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" -RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" -RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" -RDEPENDS_${PN}-qcom-adreno-a530 = "${PN}-qcom-license" - -FILES_${PN}-liquidio = "${nonarch_base_libdir}/firmware/liquidio" - -# For other firmwares -# Maybe split out to separate packages when needed. -LICENSE_${PN} = "\ - Firmware-Abilis \ - & Firmware-agere \ - & Firmware-amdgpu \ - & Firmware-amd-ucode \ - & Firmware-atmel \ - & Firmware-ca0132 \ - & Firmware-cavium \ - & Firmware-chelsio_firmware \ - & Firmware-cw1200 \ - & Firmware-dib0700 \ - & Firmware-e100 \ - & Firmware-ene_firmware \ - & Firmware-fw_sst_0f28 \ - & Firmware-go7007 \ - & Firmware-hfi1_firmware \ - & Firmware-i2400m \ - & Firmware-ibt_firmware \ - & Firmware-it913x \ - & Firmware-IntcSST2 \ - & Firmware-kaweth \ - & Firmware-moxa \ - & Firmware-myri10ge_firmware \ - & Firmware-nvidia \ - & Firmware-OLPC \ - & Firmware-ath9k-htc \ - & Firmware-phanfw \ - & Firmware-qat \ - & Firmware-qcom \ - & Firmware-qla1280 \ - & Firmware-qla2xxx \ - & Firmware-r8a779x_usb3 \ - & Firmware-radeon \ - & Firmware-ralink_a_mediatek_company_firmware \ - & Firmware-ralink-firmware \ - & Firmware-imx-sdma_firmware \ - & Firmware-siano \ - & Firmware-tda7706-firmware \ - & Firmware-ti-connectivity \ - & Firmware-ti-keystone \ - & Firmware-ueagle-atm4-firmware \ - & Firmware-wl1251 \ - & Firmware-xc4000 \ - & Firmware-xc5000 \ - & Firmware-xc5000c \ - & WHENCE \ -" - -FILES_${PN}-license += "${nonarch_base_libdir}/firmware/LICEN*" -FILES_${PN} += "${nonarch_base_libdir}/firmware/*" -RDEPENDS_${PN} += "${PN}-license" -RDEPENDS_${PN} += "${PN}-whence-license" - -# Make linux-firmware depend on all of the split-out packages. -# Make linux-firmware-iwlwifi depend on all of the split-out iwlwifi packages. -# Make linux-firmware-ibt depend on all of the split-out ibt packages. -python populate_packages_prepend () { - firmware_pkgs = oe.utils.packages_filter_out_system(d) - d.appendVar('RRECOMMENDS_linux-firmware', ' ' + ' '.join(firmware_pkgs)) - - iwlwifi_pkgs = filter(lambda x: x.find('-iwlwifi-') != -1, firmware_pkgs) - d.appendVar('RRECOMMENDS_linux-firmware-iwlwifi', ' ' + ' '.join(iwlwifi_pkgs)) - - ibt_pkgs = filter(lambda x: x.find('-ibt-') != -1, firmware_pkgs) - d.appendVar('RRECOMMENDS_linux-firmware-ibt', ' ' + ' '.join(ibt_pkgs)) -} - -# Firmware files are generally not ran on the CPU, so they can be -# allarch despite being architecture specific -INSANE_SKIP = "arch" |