diff options
Diffstat (limited to 'meta-phosphor')
9 files changed, 0 insertions, 64 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index f1714cac5..8d0ee9f95 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -7,7 +7,6 @@ # - obmc-phosphor-sensor-mgmt - Phosphor OpenBMC sensor management # - obmc-phosphor-flash-mgmt - Phosphor OpenBMC flash management # - obmc-phosphor-event-mgmt - Phosphor OpenBMC event management -# - obmc-phosphor-policy-mgmt - Phosphor OpenBMC policy management # - obmc-phosphor-user-mgmt - Phosphor OpenBMC user management # - obmc-phosphor-system-mgmt - Phosphor OpenBMC system management @@ -19,7 +18,6 @@ FEATURE_PACKAGES_obmc-phosphor-chassis-mgmt ?= "packagegroup-obmc-phosphor-apps- FEATURE_PACKAGES_obmc-phosphor-sensor-mgmt ?= "packagegroup-obmc-phosphor-apps-sensor-mgmt" FEATURE_PACKAGES_obmc-phosphor-flash-mgmt ?= "packagegroup-obmc-phosphor-apps-flash-mgmt" FEATURE_PACKAGES_obmc-phosphor-event-mgmt ?= "packagegroup-obmc-phosphor-apps-event-mgmt" -FEATURE_PACKAGES_obmc-phosphor-policy-mgmt ?= "packagegroup-obmc-phosphor-apps-policy-mgmt" FEATURE_PACKAGES_obmc-phosphor-user-mgmt ?= "packagegroup-obmc-phosphor-apps-user-mgmt" FEATURE_PACKAGES_obmc-phosphor-system-mgmt ?= "packagegroup-obmc-phosphor-apps-system-mgmt" @@ -30,7 +28,6 @@ IMAGE_FEATURES += " \ obmc-phosphor-sensor-mgmt \ obmc-phosphor-flash-mgmt \ obmc-phosphor-event-mgmt \ - obmc-phosphor-policy-mgmt \ obmc-phosphor-user-mgmt \ obmc-phosphor-system-mgmt \ ssh-server-dropbear \ diff --git a/meta-phosphor/classes/obmc-phosphor-policy-mgmt.bbclass b/meta-phosphor/classes/obmc-phosphor-policy-mgmt.bbclass deleted file mode 100644 index 35397b849..000000000 --- a/meta-phosphor/classes/obmc-phosphor-policy-mgmt.bbclass +++ /dev/null @@ -1,4 +0,0 @@ -# Common code for recipes that implement Phosphor OpenBMC policy management. - -RPROVIDES_${PN} += "virtual/obmc-phosphor-policy-mgmt" -PROVIDES += "virtual/obmc-phosphor-policy-mgmt" diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb index 533065212..8cb078484 100644 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb +++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-apps.bb @@ -19,7 +19,6 @@ PACKAGES = " \ ${@mf_enabled("obmc-phosphor-sensor-mgmt", "packagegroup-obmc-phosphor-apps-sensor-mgmt", d)} \ ${@mf_enabled("obmc-phosphor-flash-mgmt", "packagegroup-obmc-phosphor-apps-flash-mgmt", d)} \ ${@df_enabled("obmc-phosphor-event-mgmt", "packagegroup-obmc-phosphor-apps-event-mgmt", d)} \ - ${@df_enabled("obmc-phosphor-policy-mgmt", "packagegroup-obmc-phosphor-apps-policy-mgmt", d)} \ ${@df_enabled("obmc-phosphor-user-mgmt", "packagegroup-obmc-phosphor-apps-user-mgmt", d)} \ ${@df_enabled("obmc-phosphor-system-mgmt", "packagegroup-obmc-phosphor-apps-system-mgmt", d)} \ " @@ -69,12 +68,6 @@ RDEPENDS_packagegroup-obmc-phosphor-apps-event-mgmt = " \ virtual/obmc-phosphor-event-mgmt \ ", d)}" -SUMMARY_packagegroup-obmc-phosphor-apps-policy-mgmt = "Policy management support" -RDEPENDS_packagegroup-obmc-phosphor-apps-policy-mgmt = " \ - ${@df_enabled("obmc-phosphor-policy-mgmt", " \ - virtual/obmc-phosphor-policy-mgmt \ - ", d)}" - SUMMARY_packagegroup-obmc-phosphor-apps-user-mgmt = "User management support" RDEPENDS_packagegroup-obmc-phosphor-apps-user-mgmt = " \ ${@df_enabled("obmc-phosphor-user-mgmt", " \ diff --git a/meta-phosphor/common/recipes-phosphor/policy/files/obmc-phosphor-policyd.py b/meta-phosphor/common/recipes-phosphor/policy/files/obmc-phosphor-policyd.py deleted file mode 100644 index 48f19d46c..000000000 --- a/meta-phosphor/common/recipes-phosphor/policy/files/obmc-phosphor-policyd.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# Contributors Listed Below - COPYRIGHT 2015 -# [+] International Business Machines Corp. -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. See the License for the specific language governing -# permissions and limitations under the License. - -import time -import sys -import dbus -import dbus.service -import dbus.mainloop.glib - -if __name__ == '__main__': - print "obmc-phosphor-policyd starting..." - - while 1: - time.sleep(5) diff --git a/meta-phosphor/common/recipes-phosphor/policy/files/obmc-phosphor-policyd.service b/meta-phosphor/common/recipes-phosphor/policy/files/obmc-phosphor-policyd.service deleted file mode 100644 index 3c2b13833..000000000 --- a/meta-phosphor/common/recipes-phosphor/policy/files/obmc-phosphor-policyd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Phosphor OpenBMC policy management daemon - -[Service] -Restart=always -ExecStart=/usr/sbin/obmc-phosphor-policyd - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/common/recipes-phosphor/policy/obmc-phosphor-policyd.bb b/meta-phosphor/common/recipes-phosphor/policy/obmc-phosphor-policyd.bb deleted file mode 100644 index 05471d52f..000000000 --- a/meta-phosphor/common/recipes-phosphor/policy/obmc-phosphor-policyd.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Phosphor OpenBMC Policy Management" -DESCRIPTION = "Phosphor OpenBMC policy management reference implementation." -PR = "r1" - -inherit obmc-phosphor-policy-mgmt -inherit obmc-phosphor-pydbus-service - -S = "${WORKDIR}" -SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb index f5c5fbf5e..8131417ae 100644 --- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb +++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb @@ -9,7 +9,6 @@ inherit obmc-phosphor-license inherit obmc-phosphor-chassis-mgmt inherit obmc-phosphor-fan-mgmt inherit obmc-phosphor-flash-mgmt -inherit obmc-phosphor-policy-mgmt inherit obmc-phosphor-sensor-mgmt inherit obmc-phosphor-system-mgmt diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index a942f7149..0c432b60a 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -25,7 +25,6 @@ DISTRO_FEATURES = "\ obmc-phosphor-sensor-mgmt \ obmc-phosphor-flash-mgmt \ obmc-phosphor-event-mgmt \ - obmc-phosphor-policy-mgmt \ obmc-phosphor-user-mgmt \ obmc-phosphor-system-mgmt \ ${DISTRO_FEATURES_LIBC} \ diff --git a/meta-phosphor/conf/machine/include/sample.inc b/meta-phosphor/conf/machine/include/sample.inc index e4d70d1ef..c10e81bb5 100644 --- a/meta-phosphor/conf/machine/include/sample.inc +++ b/meta-phosphor/conf/machine/include/sample.inc @@ -27,7 +27,6 @@ PREFERRED_PROVIDER_virtual/obmc-phosphor-chassis-mgmt = "obmc-phosphor-chassisd" PREFERRED_PROVIDER_virtual/obmc-phosphor-event-mgmt = "obmc-phosphor-event" PREFERRED_PROVIDER_virtual/obmc-phosphor-fan-mgmt = "obmc-phosphor-fand" PREFERRED_PROVIDER_virtual/obmc-phosphor-flash-mgmt = "obmc-phosphor-flashd" -PREFERRED_PROVIDER_virtual/obmc-phosphor-policy-mgmt = "obmc-phosphor-policyd" PREFERRED_PROVIDER_virtual/obmc-phosphor-sensor-mgmt = "obmc-phosphor-sensord" PREFERRED_PROVIDER_virtual/obmc-phosphor-system-mgmt = "obmc-phosphor-sysd" PREFERRED_PROVIDER_virtual/obmc-phosphor-user-mgmt = "obmc-phosphor-user" |
