diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-06-29 01:59:45 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-06-30 20:41:15 +0300 |
commit | e2501211f94d8666b7b8411f7c9b2056b2536541 (patch) | |
tree | a95c45c29efbaa5312bc8c7a7bd4c280f4ce6e7b /meta-phosphor/common/recipes-phosphor/skeleton | |
parent | 5f9be075e0739c7d0abbb78ae9c189a0766eab3a (diff) | |
download | openbmc-e2501211f94d8666b7b8411f7c9b2056b2536541.tar.xz |
Switch to per-application skeleton recipes
This patch switches the build to use the per-application
skeleton recipes added previously.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/skeleton')
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb | 61 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/skeleton/skeleton/skeleton.service | 12 |
2 files changed, 25 insertions, 48 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb index 77a298052..f5c5fbf5e 100644 --- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb +++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb @@ -3,47 +3,36 @@ DESCRIPTION = "Temp placeholder for skeleton repository" HOMEPAGE = "http://github.com/openbmc/skeleton" PR = "r1" +inherit packagegroup inherit obmc-phosphor-license -inherit obmc-phosphor-systemd + 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 -inherit pythonnative -inherit python-dir - -VIRTUAL-RUNTIME_skeleton_workbook ?= "" - -DEPENDS += "glib-2.0 systemd python" -RDEPENDS_${PN} += "python-json python-subprocess python-compression libsystemd ${VIRTUAL-RUNTIME_skeleton_workbook}" -SRC_URI += "git://github.com/openbmc/skeleton" - -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/*" - -# RDEPEND on pflash if the openpower-pflash machine feature is set. -PACKAGECONFIG ??= "${@bb.utils.contains('MACHINE_FEATURES', 'openpower-pflash', 'openpower-pflash', '', d)}" -PACKAGECONFIG[openpower-pflash] = ",,,pflash" - -SRCREV = "fa8f6166a05410472e8a3ef6a2f2e3b9b5f8d8e4" - -S = "${WORKDIR}" - -# needed to invoke setuptools -export STAGING_INCDIR -export STAGING_LIBDIR -export BUILD_SYS -export HOST_SYS -export PYTHON_SITEPACKAGES_DIR - -do_compile() { - oe_runmake -C git PYTHON=${PYTHON} -} -do_install() { - oe_runmake -C git install \ - PYTHON=${PYTHON} \ - DESTDIR=${D} \ - PREFIX=/usr -} +RDEPENDS_${PN} += " \ + obmc-button-power \ + obmc-button-reset \ + obmc-control-chassis \ + obmc-hostcheckstop \ + obmc-mgr-inventory \ + obmc-op-control-power \ + obmc-pcie-detect \ + obmc-watchdog \ + obmc-pydevtools \ + obmc-control-fan \ + obmc-flash-bios \ + obmc-flash-bmc \ + obmc-mgr-download \ + obmc-op-flasher \ + obmc-op-control-host \ + obmc-control-led \ + obmc-hwmon \ + obmc-mgr-sensor \ + obmc-control-bmc \ + obmc-mgr-state \ + obmc-mgr-system \ + " diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton/skeleton.service b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton/skeleton.service deleted file mode 100644 index 3a8e52ee2..000000000 --- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton/skeleton.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Temp placeholder for skeleton function -Requires=obmc-mapper.service -After=obmc-mapper.service - -[Service] -Restart=always -ExecStart=/usr/sbin/system_manager.py -Environment="PYTHONUNBUFFERED=1" - -[Install] -WantedBy=multi-user.target |