diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-06-14 21:33:22 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-06-15 10:59:47 -0400 |
commit | a9a69fa5572d95eb2a9041e8fd2bcbdf024a332d (patch) | |
tree | 8ee7887837a71b3be2bcd9655c0a1eb8207cc6af /meta-phosphor/common/recipes-phosphor | |
parent | adb60e8a6bcfb4f651d9fa88ef776ae109acabd8 (diff) | |
download | talos-openbmc-a9a69fa5572d95eb2a9041e8fd2bcbdf024a332d.tar.gz talos-openbmc-a9a69fa5572d95eb2a9041e8fd2bcbdf024a332d.zip |
Bump skeleton version
This bump picks up a refactored version of skeleton with a new
directory layout, and a couple of hwmon regression fixes for
the Barreleye system.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor')
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb index 1d45d161b..eb45a406c 100644 --- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb +++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb @@ -11,34 +11,37 @@ 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 DEPENDS += "glib-2.0 systemd" RDEPENDS_${PN} += "python-subprocess python-compression libsystemd" 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 = "b2f3fd7a29ddf16ea6171b4b4649d9a0ea8be58d" +SRCREV = "40187443840d0e419c13391b2091fda29d63dea4" S = "${WORKDIR}" -do_compile() { - oe_runmake -C git +# needed to invoke setuptools +export STAGING_INCDIR +export STAGING_LIBDIR +export BUILD_SYS +export HOST_SYS +export PYTHON_SITEPACKAGES_DIR - # Remove deprecated files. - rm ${S}/git/bin/pflash +do_compile() { + oe_runmake -C git PYTHON=${PYTHON} } do_install() { - source=${S}/git - - install -d ${D}/${sbindir} ${D}${libdir} - for i in ${source}/bin/*; do - install $i ${D}/${sbindir} - done - for i in ${source}/lib/*; do - install $i ${D}/${libdir} - done + oe_runmake -C git install \ + PYTHON=${PYTHON} \ + DESTDIR=${D} \ + PREFIX=/usr } |