diff options
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor')
15 files changed, 0 insertions, 243 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/bmcweb/bmcweb.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/bmcweb/bmcweb.bbappend deleted file mode 100644 index e3f627f53..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/bmcweb/bmcweb.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Modifications to support Nginx" - -# Behind NGINX so disable SSL in bmcweb -EXTRA_OECMAKE += "-DBMCWEB_INSECURE_DISABLE_SSL=ON" - -# Only need redfish support -EXTRA_OECMAKE += "-DBMCWEB_ENABLE_KVM=OFF -DBMCWEB_ENABLE_DBUS_REST=OFF" - -# override service and socket file to use nginx -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.service b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.service deleted file mode 100644 index 832eb0491..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=BMC Redfish Server (bmcweb) -After=network.target -After=obmc-webserver-pre.target - -[Service] -Restart=always -ExecStart=/usr/bin/env bmcweb -SyslogIdentifier=bmcweb diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.socket b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.socket deleted file mode 100644 index 40e68975c..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Phosphor redfish socket (bmcweb) - -[Socket] -ListenStream=127.0.0.1:8082 - -[Install] -WantedBy=sockets.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb deleted file mode 100644 index 8347b9eec..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY="Add /com/ibm namespace to phosphor-mapper" -DESCRIPTION="Add the /com/ibm path namespace and \ -com.ibm interface prefix to the mapper watch list." - -inherit phosphor-mapper -inherit native -inherit obmc-phosphor-license - -PHOSPHOR_MAPPER_NAMESPACE_append = " /com/ibm" -PHOSPHOR_MAPPER_INTERFACE_append = " com.ibm" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces.bb deleted file mode 100644 index 947f5d7db..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "IBM DBus Interfaces" -DESCRIPTION = "Generated bindings, using sdbus++, for the IBM YAML" -PR = "r1" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig -inherit obmc-phosphor-license -inherit pythonnative -inherit phosphor-dbus-yaml - -DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbus++-native" - -SRC_URI += "git://github.com/openbmc/ibm-dbus-interfaces" -SRCREV = "62c7bff037587fe0fbfdffbe622058d86c7d7b7b" - -DEPENDS_remove_class-native = "sdbus++-native" -DEPENDS_remove_class-nativesdk = "sdbus++-native" - -PACKAGECONFIG ??= "libibm_dbus" -PACKAGECONFIG[libibm_dbus] = " \ - --enable-libibm_dbus, \ - --disable-libibm_dbus, \ - systemd sdbusplus, \ - libsystemd sdbusplus \ - " - -PACKAGECONFIG_remove_class-native = "libibm_dbus" -PACKAGECONFIG_remove_class-nativesdk = "libibm_dbus" - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend deleted file mode 100644 index d94a55490..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -PHOSPHOR_MAPPER_CONFIGS_append = " ibm-dbus-interfaces-mapper-config-native" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector.bbappend deleted file mode 100644 index 402e4fa09..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector.bbappend +++ /dev/null @@ -1,21 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://plugins.d/ibm_elogall" - -install_ibm_plugins() { - - install -m 0755 ${WORKDIR}/plugins.d/ibm_elogall ${D}${dreport_plugin_dir} - -} - -#Link in the plugins so dreport run them at the appropriate time -python link_ibm_plugins() { - - workdir = d.getVar('WORKDIR', True) - script = os.path.join(workdir, 'plugins.d', 'ibm_elogall') - install_dreport_user_script(script, d) - -} - -do_install[postfuncs] += "install_ibm_plugins" -do_install[postfuncs] += "link_ibm_plugins" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/ibm_elogall b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/ibm_elogall deleted file mode 100644 index 3054f237c..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/ibm_elogall +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# -# config: 2 20 -# @brief: Get the IBM specific elog objects -# - -. $DREPORT_INCLUDE/functions - -desc="IBM elog" - -entries=$(busctl --list --no-pager tree \ - com.ibm.Logging | grep \ - '/xyz/openbmc_project/logging/entry/') - -#check for elog entries. -if [ -z "$entries" ]; then - log_info "No $desc entries" - exit 0 -fi - -command="busctl call --verbose --no-pager \ - com.ibm.Logging \ - /xyz/openbmc_project/logging \ - org.freedesktop.DBus.ObjectManager \ - GetManagedObjects" - -file_name="ibm_elogall.log" - -add_cmd_output "$command" "$file_name" "$desc" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/logging/ibm-logging.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/logging/ibm-logging.bb deleted file mode 100644 index e32678708..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/logging/ibm-logging.bb +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY = "IBM enhanced error logging" -DESCRIPTION = "Adds additional error logging functionality for IBM systems" -PR = "r1" -HOMEPAGE = "https://github.com/openbmc/ibm-logging" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI += "git://github.com/openbmc/ibm-logging" -SRCREV = "34af47ff623ce077670d270693f36e4c51adfa10" - -inherit autotools -inherit pkgconfig -inherit pythonnative -inherit obmc-phosphor-dbus-service -inherit obmc-phosphor-systemd -inherit phosphor-dbus-yaml - -DEPENDS += " \ - ibm-dbus-interfaces \ - phosphor-logging \ - nlohmann-json \ - autoconf-archive-native \ - sdbusplus \ - " - -RDEPENDS_${PN} += " \ - phosphor-logging \ - phosphor-dbus-interfaces \ - sdbusplus \ - " - -S = "${WORKDIR}/git" - -SRC_URI += "file://policyTable.json" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[policy-interface] = "--enable-policy-interface, --disable-policy-interface,," - -SERVICE = "com.ibm.Logging.service" -DBUS_SERVICE_${PN} += "${SERVICE}" - -#The link is so that this service will restart if phosphor-logging restarts. -#The BindsTo in the service will not do the restart, it will only do the -#original start and a stop. -LOG_FMT = "../${SERVICE}:xyz.openbmc_project.Logging.service.wants/${SERVICE}" -SYSTEMD_LINK_${PN} += "${LOG_FMT}" - -do_install_append(){ - - install -d ${D}${datadir}/ibm-logging - - ${S}/condense_policy.py \ - -p ${WORKDIR}/policyTable.json \ - -c ${D}/${datadir}/ibm-logging/policy.json -} - -#An optional task to generate a report on all of the errors -#created by OpenBMC, and compare these errors to what is -#in the error policy table -do_report(){ - - ${S}/create_error_reports.py \ - -p ${D}/${datadir}/ibm-logging/policy.json \ - -y ${STAGING_DIR_NATIVE}${yaml_dir} \ - -e ${WORKDIR}/build/all_errors.json \ - -x ${WORKDIR}/build/policy_crosscheck.txt - -} - -addtask report - -#Collect all of the error YAML files into our recipe-sysroot-native dir. -do_report[depends] = " \ - ibm-logging:do_install \ - phosphor-logging-error-logs-native:do_populate_sysroot \ - phosphor-dbus-interfaces-native:do_populate_sysroot \ - openpower-dbus-interfaces-native:do_populate_sysroot \ - openpower-occ-control-native:do_populate_sysroot \ - openpower-debug-collector-native:do_populate_sysroot \ - " diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/logging/ibm-logging/com.ibm.Logging.service b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/logging/ibm-logging/com.ibm.Logging.service deleted file mode 100644 index 57ebc9973..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/logging/ibm-logging/com.ibm.Logging.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=IBM Log Manager -After=xyz.openbmc_project.Logging.service -BindsTo=xyz.openbmc_project.Logging.service - -[Service] -ExecStart=/usr/bin/env ibm-log-manager -SyslogIdentifier=ibm-log-manager -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy=xyz.openbmc_project.Logging.service diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/logging/ibm-logging/policyTable.json b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/logging/ibm-logging/policyTable.json deleted file mode 100644 index 677c02437..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/logging/ibm-logging/policyTable.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "_comment": "This file should be overridden with one from the machine layer.", - "events": { - } -} diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend deleted file mode 100644 index 0b0a9c9f2..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -RDEPENDS_${PN}-logging += "ibm-logging" -RDEPENDS_${PN}-extras += "nginx bmcweb" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent.bbappend deleted file mode 100644 index 6dd263b79..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -SUMMARY = "Modifications to support Nginx" - -# override service and socket file to use nginx -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.service b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.service deleted file mode 100644 index 6b4e77ffe..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Phosphor REST Server -After=network.target -After=obmc-webserver-pre.target - -[Service] -Restart=always -ExecStart=/usr/bin/env phosphor-gevent $APPLICATION --no-ssl -SyslogIdentifier=phosphor-gevent -Environment="PYTHONUNBUFFERED=1" -EnvironmentFile={envfiledir}/obmc/wsgi_app diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.socket b/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.socket deleted file mode 100644 index f7fde31be..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/recipes-phosphor/phosphor-gevent/phosphor-gevent/phosphor-gevent.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Phosphor Webserver socket - -[Socket] -ListenStream=127.0.0.1:8081 - -[Install] -WantedBy=sockets.target |