summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2016-10-20 14:30:03 -0500
committerPatrick Williams <patrick@stwcx.xyz>2016-10-21 02:32:19 +0000
commitd64485f2aaefcbf511d2c94f1bc63d078f2bedac (patch)
treec6f258cd8f519567223891397f13bc21cdae9df5
parentbf18e18d4d8ba9cdf608438641de7cbe69f3490a (diff)
downloadtalos-openbmc-d64485f2aaefcbf511d2c94f1bc63d078f2bedac.tar.gz
talos-openbmc-d64485f2aaefcbf511d2c94f1bc63d078f2bedac.zip
obmc-mgr-system: remove startup-hacks
Change-Id: I2aa0b53ea87841312d20095888d0b7bb215b3cf4 Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
-rw-r--r--meta-phosphor/classes/skeleton-rev.bbclass2
-rw-r--r--meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb9
-rw-r--r--meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/startup-hacks.service10
3 files changed, 1 insertions, 20 deletions
diff --git a/meta-phosphor/classes/skeleton-rev.bbclass b/meta-phosphor/classes/skeleton-rev.bbclass
index 9d400c887..37ec8772a 100644
--- a/meta-phosphor/classes/skeleton-rev.bbclass
+++ b/meta-phosphor/classes/skeleton-rev.bbclass
@@ -1,2 +1,2 @@
-SRCREV ?= "2c77baa0578bc7c7690f802549200e81c2cc918a"
+SRCREV ?= "25a2243e0862ee35f53dc48f471ae61f048ef00e"
SKELETON_URI ?= "git://github.com/openbmc/skeleton"
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb
index 8b97e62bf..97567e6e5 100644
--- a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb
+++ b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb
@@ -18,13 +18,4 @@ RDEPENDS_${PN} += "\
SKELETON_DIR = "pysystemmgr"
-do_compile_append() {
- oe_runmake -C ../hacks
-}
-
-do_install_append() {
- oe_runmake -C ../hacks install DESTDIR=${D}
-}
-
DBUS_SERVICE_${PN} += "org.openbmc.managers.System.service"
-SYSTEMD_SERVICE_${PN} += "startup-hacks.service"
diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/startup-hacks.service b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/startup-hacks.service
deleted file mode 100644
index 2fca98649..000000000
--- a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/startup-hacks.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Startup Hacks
-
-[Service]
-Restart=no
-Type=oneshot
-ExecStart={sbindir}/startup_hacks.sh
-
-[Install]
-WantedBy={SYSTEMD_DEFAULT_TARGET}
OpenPOWER on IntegriCloud