Move RCS specific layers to correct location for latest OpenBMC

8 files changed, 2 insertions, 95 deletions

diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb b/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb
index d96a2ef4b..95b2015c3 100644
--- a/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb
+++ b/meta-phosphor/aspeed-layer/recipes-kernel/cf-fsi-firmware/cf-fsi-firmware_git.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 SRCREV = "bae32e353a3641b5164211f6bf06c5620f6e384d"
-SRC_URI = "git://github.com/ozbenh/cf-fsi.git"
+SRC_URI = "git://scm.raptorcs.com/scm/git/cf-fsi;protocol=https"
 
 PR = "r1"
 PV = "1.0+git${SRCPV}"
diff --git a/meta-phosphor/classes/mrw-rev.bbclass b/meta-phosphor/classes/mrw-rev.bbclass
index 9ad00fa9e..77a1b9402 100644
--- a/meta-phosphor/classes/mrw-rev.bbclass
+++ b/meta-phosphor/classes/mrw-rev.bbclass
@@ -1,4 +1,4 @@
-MRW_API_SRC_URI ?= "git://scm.raptorcs.com/scm/git/serverwiz;protocol=https;subpath=scripts"
+MRW_API_SRC_URI ?= "git://scm.raptorcs.com/scm/git/serverwiz;protocol=https"
 MRW_API_SRCREV ?= "60c8e10cbb11768cd1ba394b35cb1d6627efec42"
 
 MRW_TOOLS_SRC_URI ?= "git://scm.raptorcs.com/scm/git/phosphor-mrw-tools;protocol=https"
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-hardbeep.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-hardbeep.bb
deleted file mode 100644
index 8066752e2..000000000
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-hardbeep.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SUMMARY = "OpenBMC hardware PWM beep"
-DESCRIPTION = "A sample implementation for hardware beep on a PWM."
-PR = "r1"
-
-inherit skeleton-gdbus
-inherit pkgconfig
-
-LICENSE = "GPLv3"
-SKELETON_DIR = "hardbeep"
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-softbeep.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-softbeep.bb
deleted file mode 100644
index 034d5c4c4..000000000
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-softbeep.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SUMMARY = "OpenBMC software beep"
-DESCRIPTION = "A sample implementation for software beep on a GPIO."
-PR = "r1"
-
-inherit skeleton-gdbus
-inherit pkgconfig
-
-LICENSE = "GPLv3"
-SKELETON_DIR = "softbeep"
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor.bb
deleted file mode 100644
index cf4520368..000000000
--- a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "OpenBMC IPL status LED monitor"
-DESCRIPTION = "OpenBMC IPL status LED monitor."
-PR = "r1"
-
-inherit skeleton-python
-inherit obmc-phosphor-dbus-service
-
-VIRTUAL-RUNTIME_skeleton_workbook ?= ""
-
-RDEPENDS_${PN} += "\
-        python-dbus \
-        python-json \
-        python-subprocess \
-        python-pygobject \
-        pyphosphor \
-        pyphosphor-dbus \
-        ${VIRTUAL-RUNTIME_skeleton_workbook} \
-        obmc-ipl-status-observer \
-        "
-
-SKELETON_DIR = "pyiplledmonitor"
-
-DBUS_SERVICE_${PN} += "org.openbmc.status.IPLLED.service"
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor/org.openbmc.status.IPLLED.service b/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor/org.openbmc.status.IPLLED.service
deleted file mode 100644
index c1daa0469..000000000
--- a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-led-monitor/org.openbmc.status.IPLLED.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Phoshpor IPL Status LED Monitor
-Wants=org.openbmc.status.IPL.service
-After=org.openbmc.status.IPL.service
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env ipl_status_led_monitor.py
-SyslogIdentifier=ipl_status_led_monitor.py
-Type=simple
-Environment="PYTHONUNBUFFERED=1"
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer.bb
deleted file mode 100644
index 95d358e3d..000000000
--- a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "OpenBMC IPL status observer"
-DESCRIPTION = "OpenBMC IPL status observer."
-PR = "r1"
-
-inherit skeleton-python
-inherit obmc-phosphor-dbus-service
-
-VIRTUAL-RUNTIME_skeleton_workbook ?= ""
-
-RDEPENDS_${PN} += "\
-        python-dbus \
-        python-json \
-        python-subprocess \
-        python-pygobject \
-        pyphosphor \
-        pyphosphor-dbus \
-        ${VIRTUAL-RUNTIME_skeleton_workbook} \
-        pdbg \
-        "
-
-SKELETON_DIR = "pyiplobserver"
-
-DBUS_SERVICE_${PN} += "org.openbmc.status.IPL.service"
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer/org.openbmc.status.IPL.service b/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer/org.openbmc.status.IPL.service
deleted file mode 100644
index a92b2f146..000000000
--- a/meta-phosphor/common/recipes-phosphor/system/obmc-ipl-status-observer/org.openbmc.status.IPL.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Phoshpor IPL Status Observer
-Wants=xyz.openbmc_project.State.Host.service
-After=xyz.openbmc_project.State.Host.service
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/env ipl_status_observer.py
-SyslogIdentifier=ipl_status_observer.py
-Type=dbus
-BusName={BUSNAME}
-Environment="PYTHONUNBUFFERED=1"
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}