| commit | 39a4eff06b0f14afca49dd81d7d3247ce4032d6e | [log] [tgz] |
|---|---|---|
| author | Patrick Williams <patrick@stwcx.xyz> | Wed Jun 15 10:45:52 2016 -0500 |
| committer | GitHub <noreply@github.com> | Wed Jun 15 10:45:52 2016 -0500 |
| tree | 778919b9c3bf87bea683659c958a126b512d4923 | |
| parent | 56a170022d4ed6a860d846ca9181123d80ed8a25 [diff] | |
| parent | 65b40a80454bc22d0e4e1f4fafcd43d33a7167b8 [diff] |
Merge pull request #324 from bradbishop/dir-structure Add virtual workbook / config-in-skeleton classes
diff --git a/.gitignore b/.gitignore index ccd8f51..48652c2 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,3 +1,3 @@ -build/* +build*/* customrc *.sw?
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 2dfcf58..90425f4 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 @@ 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 18d1f4b..0000000 --- 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