summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2016-06-15 10:11:06 -0500
committerGitHub <noreply@github.com>2016-06-15 10:11:06 -0500
commite3dfc63caa621c6c0507b9a0cd07260e914dcda7 (patch)
tree0e613a3159eb574b359f6287d0971ddd4d64d895
parent9f1d336d6708a63c7c59f8938bc0d4f365d4671a (diff)
parent87207981885f32e778e2752f917db69e76de539b (diff)
downloadtalos-openbmc-e3dfc63caa621c6c0507b9a0cd07260e914dcda7.tar.gz
talos-openbmc-e3dfc63caa621c6c0507b9a0cd07260e914dcda7.zip
Merge pull request #368 from bradbishop/upload-state
Remove openpower inventory upload systemd startup
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb1
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/inventory-upload.service10
2 files changed, 0 insertions, 11 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb
index 2dfcf583f..90425f409 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload.bb
@@ -6,7 +6,6 @@ LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
inherit allarch
-inherit obmc-phosphor-systemd
inherit setuptools
RDEPENDS_${PN} += " \
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/inventory-upload.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/inventory-upload.service
deleted file mode 100644
index 18d1f4bb8..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/inventory-upload/inventory-upload/inventory-upload.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=BMC Inventory Upload
-Requires=skeleton.service
-After=skeleton.service
-
-[Service]
-ExecStart=/usr/sbin/inventory_upload.py
-
-[Install]
-WantedBy=multi-user.target
OpenPOWER on IntegriCloud