Move meta-intel to meta-intel-openbmc

meta-intel conflicts with the upstream yocto meta layer of the same
name.  This commit renames meta-intel to meta-intel-openbmc and updates
all the relevant bblayers files with the new name.

This is to pave the way for allowing the yocto meta-intel in the tree,
which would allow the use of generic-x86 machine type, which would allow
building and running tests natively.

Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Ia19a7a4a10245c1c2f85f6da216997cb6a836daa

26 files changed, 0 insertions, 453 deletions

diff --git a/meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb b/meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
deleted file mode 100644
index 6b24c522c..000000000
--- a/meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53"
-inherit cmake systemd
-
-SRC_URI = "git://github.com/openbmc/host-error-monitor"
-
-DEPENDS = "boost sdbusplus libgpiod libpeci"
-
-PV = "0.1+git${SRCPV}"
-SRCREV = "c90570ab1ad57ac824edf7b5d0f8a89afbcf0c09"
-
-S = "${WORKDIR}/git"
-
-SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.HostErrorMonitor.service"
-
-EXTRA_OECMAKE = "-DYOCTO=1"
diff --git a/meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb b/meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb
deleted file mode 100644
index bc046e5a2..000000000
--- a/meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "PECI Library"
-DESCRIPTION = "PECI Library"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53"
-inherit cmake
-
-SRC_URI = "git://github.com/openbmc/libpeci"
-
-PV = "0.1+git${SRCPV}"
-SRCREV = "c965e72c6765e054531c1ab91e7fa13f04651f21"
-
-S = "${WORKDIR}/git"
diff --git a/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend b/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend
deleted file mode 100644
index 090b40e40..000000000
--- a/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-# Remove these files since they are provided by obmc-intel-targets
-SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-start@.target"
-SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-stop@.target"
-SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-reboot@.target"
-SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-startmin@.target"
-SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-poweron@.target"
-SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-poweroff@.target"
-SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-hard-poweroff@.target"
-SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-powerreset@.target"
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service
deleted file mode 100644
index 8f3a2bc31..000000000
--- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Rotate the event logs
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/rotate-event-logs.sh
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh
deleted file mode 100644
index 5a8c5cc10..000000000
--- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-while true; do
-    sleep 60
-    /usr/sbin/logrotate /etc/logrotate.d/logrotate.rsyslog
-    ec=$?
-    if [ $ec -ne 0 ] ; then
-        echo "logrotate failed ($ec)"
-    fi
-done
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf
deleted file mode 100644
index 14bcc0781..000000000
--- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-ExecReload=/bin/kill -HUP $MAINPID
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf
deleted file mode 100644
index 46a287eef..000000000
--- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-# if you experience problems, check
-# http://www.rsyslog.com/troubleshoot for assistance
-
-# rsyslog v3: load input modules
-# If you do not load inputs, nothing happens!
-# You may need to set the module load path if modules are not found.
-#
-# Ported from debian's sysklogd.conf
-
-# Journal-style logging
-# Limit to no more than 2000 entries in one minute and enable the
-# journal workaround to avoid duplicate entries
-module(load="imjournal" StateFile="/var/log/state"
-                        RateLimit.Interval="60"
-                        RateLimit.Burst="2000")
-
-# Template for IPMI SEL messages
-# "<timestamp> <ID>,<Type>,<EventData>,[<Generator ID>,<Path>,<Direction>]"
-template(name="IPMISELTemplate" type="list") {
-    property(name="timereported" dateFormat="rfc3339")
-    constant(value=" ")
-    property(name="$!IPMI_SEL_RECORD_ID")
-    constant(value=",")
-    property(name="$!IPMI_SEL_RECORD_TYPE")
-    constant(value=",")
-    property(name="$!IPMI_SEL_DATA")
-    constant(value=",")
-    property(name="$!IPMI_SEL_GENERATOR_ID")
-    constant(value=",")
-    property(name="$!IPMI_SEL_SENSOR_PATH")
-    constant(value=",")
-    property(name="$!IPMI_SEL_EVENT_DIR")
-    constant(value="\n")
-}
-
-# Template for Redfish messages
-# "<timestamp> <MessageId>,<MessageArgs>"
-template(name="RedfishTemplate" type="list") {
-    property(name="timereported" dateFormat="rfc3339")
-    constant(value=" ")
-    property(name="$!REDFISH_MESSAGE_ID")
-    constant(value=",")
-    property(name="$!REDFISH_MESSAGE_ARGS")
-    constant(value="\n")
-}
-
-# Template for Application Crashes
-# "<timestamp> <MessageId>,<MessageArgs>"
-template(name="CrashTemplate" type="list") {
-    property(name="timereported" dateFormat="rfc3339")
-    constant(value=" ")
-    constant(value="OpenBMC.0.1.ServiceFailure")
-    constant(value=",")
-    property(name="$!UNIT")
-    constant(value="\n")
-}
-
-
-# If the journal entry has the IPMI SEL MESSAGE_ID, save as IPMI SEL
-# The MESSAGE_ID string is generated using journalctl and must match the
-# MESSAGE_ID used in IPMI to correctly find the SEL entries.
-if ($!MESSAGE_ID == "b370836ccf2f4850ac5bee185b77893a") then {
-   action(type="omfile" file="/var/log/ipmi_sel" template="IPMISELTemplate")
-}
-
-# If the journal entry has a Redfish MessageId, save as a Redfish event
-if ($!REDFISH_MESSAGE_ID != "") then {
-   action(type="omfile" file="/var/log/redfish" template="RedfishTemplate")
-}
-
-# If the journal entry has a Exit Code, save as a Redfish event
-if ($!EXIT_STATUS != "" and $!EXIT_STATUS != "0") then {
-   action(type="omfile" file="/var/log/redfish" template="CrashTemplate")
-}
-
-#
-# Include all config files in /etc/rsyslog.d/
-#
-$IncludeConfig /etc/rsyslog.d/*.conf
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
deleted file mode 100644
index a6ba28d86..000000000
--- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
+++ /dev/null
@@ -1,22 +0,0 @@
-# /etc/logrotate.d/rsyslog - Ported from Debian
-
-# Keep up to four 64k files for ipmi_sel (256k total)
-/var/log/ipmi_sel
-{
-    rotate 3
-    size 64k
-    missingok
-    postrotate
-        systemctl reload rsyslog 2> /dev/null || true
-    endscript
-}
-# Keep up to four 64k files for redfish (256k total)
-/var/log/redfish
-{
-    rotate 3
-    size 64k
-    missingok
-    postrotate
-        systemctl reload rsyslog 2> /dev/null || true
-    endscript
-}
diff --git a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
deleted file mode 100644
index c42693787..000000000
--- a/meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
+++ /dev/null
@@ -1,24 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://rsyslog.conf \
-           file://rsyslog.logrotate \
-           file://rotate-event-logs.service \
-           file://rotate-event-logs.sh \
-           file://rsyslog-override.conf \
-"
-
-FILES_${PN} += "${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf"
-
-PACKAGECONFIG_append = " imjournal"
-
-do_install_append() {
-        install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir}
-        install -d ${D}${systemd_system_unitdir}/rsyslog.service.d
-        install -m 0644 ${WORKDIR}/rsyslog-override.conf \
-                        ${D}${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf
-        install -d ${D}${bindir}
-        install -m 0755 ${WORKDIR}/rotate-event-logs.sh ${D}/${bindir}/rotate-event-logs.sh
-        rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf
-}
-
-SYSTEMD_SERVICE_${PN} += " rotate-event-logs.service"
diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
deleted file mode 100755
index 20bd1bd36..000000000
--- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "Intel OEM IPMI commands"
-DESCRIPTION = "Intel OEM IPMI commands"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b"
-
-SRC_URI = "git://github.com/openbmc/intel-ipmi-oem"
-SRCREV = "6d6dc7ad721268a66adecca423716ce9fcf3838b"
-
-S = "${WORKDIR}/git"
-PV = "0.1+git${SRCPV}"
-
-DEPENDS = "boost phosphor-ipmi-host phosphor-logging systemd intel-dbus-interfaces libgpiod"
-
-inherit cmake obmc-phosphor-ipmiprovider-symlink
-
-EXTRA_OECMAKE="-DENABLE_TEST=0 -DYOCTO=1"
-
-LIBRARY_NAMES = "libzinteloemcmds.so"
-
-HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}"
-NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}"
-
-FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}"
-FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}"
-
-do_install_append(){
-   install -d ${D}${includedir}/intel-ipmi-oem
-   install -m 0644 -D ${S}/include/*.hpp ${D}${includedir}/intel-ipmi-oem
-}
diff --git a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
deleted file mode 100644
index 8c0dfbf1c..000000000
--- a/meta-intel/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-SUMMARY = "OpenBMC for Intel - Applications"
-PR = "r1"
-
-inherit packagegroup
-
-PROVIDES = "${PACKAGES}"
-PACKAGES = " \
-        ${PN}-chassis \
-        ${PN}-fans \
-        ${PN}-flash \
-        ${PN}-system \
-        "
-
-PROVIDES += "virtual/obmc-chassis-mgmt"
-PROVIDES += "virtual/obmc-fan-mgmt"
-PROVIDES += "virtual/obmc-flash-mgmt"
-PROVIDES += "virtual/obmc-system-mgmt"
-
-RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt"
-RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt"
-RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
-RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt"
-
-SUMMARY_${PN}-chassis = "Intel Chassis"
-RDEPENDS_${PN}-chassis = " \
-        x86-power-control \
-        obmc-host-failure-reboots \
-        "
-
-SUMMARY_${PN}-fans = "Intel Fans"
-RDEPENDS_${PN}-fans = " \
-        phosphor-pid-control \
-        "
-
-SUMMARY_${PN}-flash = "Intel Flash"
-RDEPENDS_${PN}-flash = " \
-        obmc-control-bmc \
-        "
-
-SUMMARY_${PN}-system = "Intel System"
-RDEPENDS_${PN}-system = " \
-        bmcweb \
-        entity-manager \
-        intel-ipmi-oem \
-        dbus-sensors \
-        phosphor-webui \
-        "
diff --git a/meta-intel/meta-common/recipes-intel/pfr/pfr-manager_git.bb b/meta-intel/meta-common/recipes-intel/pfr/pfr-manager_git.bb
deleted file mode 100644
index 0399ad6c9..000000000
--- a/meta-intel/meta-common/recipes-intel/pfr/pfr-manager_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "PFR Manager Service"
-DESCRIPTION = "Daemon to handle all PFR functionalities"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53"
-inherit cmake systemd
-
-SRC_URI = "git://github.com/openbmc/pfr-manager"
-
-PV = "0.1+git${SRCPV}"
-SRCREV = "0884191b6478bdd787852ab9d290caaeb7816454"
-
-S = "${WORKDIR}/git"
-
-SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.PFR.Manager.service"
-
-DEPENDS += " \
-    sdbusplus \
-    phosphor-logging \
-    boost \
-    i2c-tools \
-    libgpiod \
-    "
diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb b/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb
deleted file mode 100644
index 0d1d016fe..000000000
--- a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SUMMARY="Add /com/intel namespace to phosphor-mapper"
-DESCRIPTION="Add the /com/intel path namespace and \
-com.intel interface prefix to the mapper watch list."
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-inherit phosphor-mapper
-inherit native
-
-PHOSPHOR_MAPPER_SERVICE_append = " com.intel"
-PHOSPHOR_MAPPER_INTERFACE_append = " com.intel"
diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb b/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb
deleted file mode 100644
index cdb88bbfe..000000000
--- a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "Intel DBus Interfaces"
-DESCRIPTION = "Generated bindings, using sdbus++, for the Intel YAML"
-PR = "r1"
-PV = "1.0+git${SRCPV}"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig
-inherit python3native
-inherit phosphor-dbus-yaml
-
-DEPENDS += "autoconf-archive-native"
-DEPENDS += "${PYTHON_PN}-sdbus++-native"
-
-SRC_URI = "git://github.com/openbmc/intel-dbus-interfaces"
-SRCREV = "b5f2dd444c5d3808d005452417e4ae2ea28624ff"
-
-PACKAGECONFIG ??= "libintel_dbus"
-PACKAGECONFIG[libintel_dbus] = " \
-        --enable-libintel_dbus, \
-        --disable-libintel_dbus, \
-        systemd sdbusplus, \
-        libsystemd \
-        "
-
-PACKAGECONFIG_remove_class-native = "libintel_dbus"
-PACKAGECONFIG_remove_class-nativesdk = "libintel_dbus"
-
-BBCLASSEXTEND += "native nativesdk"
diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
deleted file mode 100644
index ef991a58b..000000000
--- a/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PHOSPHOR_MAPPER_CONFIGS_append_intel = " intel-dbus-interfaces-mapper-config-native"
diff --git a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service b/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service
deleted file mode 100644
index 99494717f..000000000
--- a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control/phosphor-pid-control.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Phosphor-Pid-Control Margin-based Fan Control Daemon
-
-[Service]
-Restart=always
-ExecStart={bindir}/swampd
-RestartSec=5
-StartLimitInterval=0
-Type=simple
-
-[Install]
-WantedBy=basic.target
diff --git a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
deleted file mode 100644
index 4521fe8f8..000000000
--- a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend_intel := "${THISDIR}/${PN}:"
-
-inherit obmc-phosphor-systemd
-SYSTEMD_SERVICE_${PN}_intel = "phosphor-pid-control.service"
-EXTRA_OECONF_intel = "--enable-configure-dbus=yes"
diff --git a/meta-intel/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-intel/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
deleted file mode 100644
index 4e24bab9e..000000000
--- a/meta-intel/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRA_OEMESON += "-Dredfish-cpu-log=enabled \
-                  -Dredfish-raw-peci=enabled \
-                  -Dredfish-bmc-journal=enabled \
-                  -Drest=disabled"
-
diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
deleted file mode 100644
index 876567f9a..000000000
--- a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-do_install_append_intel(){
-  install -d ${D}${includedir}/phosphor-ipmi-host
-  install -m 0644 -D ${S}/sensorhandler.hpp ${D}${includedir}/phosphor-ipmi-host
-  install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host
-}
diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json b/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json
deleted file mode 100644
index cf5a28303..000000000
--- a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "channels": [
-    {
-      "type": "me",
-      "slave-path": "/dev/ipmb-5",
-      "bmc-addr": 32,
-      "remote-addr": 44
-    },
-    {
-      "type": "ipmb",
-      "slave-path": "/dev/ipmb-13",
-      "bmc-addr": 32,
-      "remote-addr": 56
-    }
-  ]
-}
diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
deleted file mode 100644
index e8cbbe928..000000000
--- a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI_append = " file://ipmb-channels.json"
-
-do_install_append(){
-    install -m 0644 -D ${WORKDIR}/ipmb-channels.json \
-                   ${D}/usr/share/ipmbbridge
-}
diff --git a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb b/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
deleted file mode 100644
index 20df1185b..000000000
--- a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Phosphor LED Group Management for Intel"
-PR = "r1"
-
-inherit native
-inherit obmc-phosphor-utils
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-PROVIDES += "virtual/phosphor-led-manager-config-native"
-
-SRC_URI += "file://led.yaml"
-S = "${WORKDIR}"
-
-do_install() {
-    SRC=${S}
-    DEST=${D}${datadir}/phosphor-led-manager
-    install -D ${SRC}/led.yaml ${DEST}/led.yaml
-}
diff --git a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml b/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml
deleted file mode 100755
index 813ffbfd4..000000000
--- a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config/led.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-bmc_booted:
-
-power_on:
-
-status_ok:
-    status_green:
-        Action: 'On'
-    status_amber:
-        Action: 'Off'
-
-status_degraded:
-    status_green:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-    status_amber:
-        Action: 'Off'
-
-status_non_critical:
-    status_green:
-        Action: 'Off'
-    status_amber:
-        Action: 'Blink'
-        DutyOn: 50
-        Period: 1000
-
-status_critical:
-    status_green:
-        Action: 'Off'
-    status_amber:
-        Action: 'On'
-
-enclosure_identify:
-    identify:
-        Action: 'On'
-
diff --git a/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
deleted file mode 100644
index 3e769e174..000000000
--- a/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# Enable threshold monitoring
-EXTRA_OECMAKE_intel += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON"
diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json
deleted file mode 100644
index 1543a6249..000000000
--- a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "customKeyEnable": true,
-  "keyType" : "VT100+",
-  "customConsoleDisplaySize": {
-    "width": 100,
-    "height": 32
-  }
-}
diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
deleted file mode 100644
index 590e9e629..000000000
--- a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend_intel := "${THISDIR}/${PN}:"
-
-SRC_URI_append_intel = " file://config.json"
-
-do_compile_prepend_intel() {
-        cp -r ${WORKDIR}/config.json ${S}/
-}
-