From adb60e8a6bcfb4f651d9fa88ef776ae109acabd8 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 14 Jun 2016 15:24:22 -0400 Subject: Add OBMC_IMAGE_EXTRA_INSTALL variable Prior to this patch packagegroup-core-boot was not being pulled in. core-boot is what brings in the init_manager (systemd) but somehow systemd was added as a dependency by OE for the skeleton package so the missing core-boot packagegroup went unnoticed. core-boot was not being pulled in because of an assignment to IMAGE_INSTALL in the global configuration. Yocto core provides a mechanism to do the same thing safely - CORE_IMAGE_EXTRA_INSTALL; use this and also adopt a similar approach for adding extra packages to image recipes using obmc-phosphor-image. Signed-off-by: Brad Bishop --- .../common/recipes-phosphor/images/obmc-phosphor-image.bbappend | 4 +--- meta-phosphor/classes/obmc-phosphor-image.bbclass | 6 ++++-- meta-phosphor/conf/machine/include/obmc-bsp-common.inc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/images/obmc-phosphor-image.bbappend index 7b8aa6f87..cf4f29da0 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,3 +1 @@ -IMAGE_INSTALL += " \ - inventory-upload \ -" +OBMC_IMAGE_EXTRA_INSTALL_append = " inventory-upload" diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index ce54777bc..c715dedbf 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -36,15 +36,17 @@ IMAGE_FEATURES += " \ ssh-server-dropbear \ " -IMAGE_INSTALL += " \ - bash \ +CORE_IMAGE_EXTRA_INSTALL_append = " bash \ packagegroup-obmc-phosphor-apps-extras \ i2c-tools \ screen \ inarp \ obmc-console \ + ${OBMC_IMAGE_EXTRA_INSTALL} \ " +OBMC_IMAGE_EXTRA_INSTALL ?= "" + def build_overlay(d): if bb.utils.contains("IMAGE_FSTYPES", "overlay", "overlay", "0", d) != "0": return "image-overlay" diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc index 260cc90a3..8d1fd7ef5 100644 --- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc +++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc @@ -15,7 +15,7 @@ MACHINEOVERRIDES =. "openbmc:" IMAGE_FSTYPES += "overlay" IMAGE_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot" -IMAGE_INSTALL += "u-boot-fw-utils" +OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils" IMAGE_CLASSES += "obmc-phosphor-image_types_uboot" -- cgit v1.2.1 From a9a69fa5572d95eb2a9041e8fd2bcbdf024a332d Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 14 Jun 2016 21:33:22 -0400 Subject: 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 --- .../common/recipes-phosphor/skeleton/skeleton.bb | 31 ++++++++++++---------- 1 file 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 } -- cgit v1.2.1 From 65b40a80454bc22d0e4e1f4fafcd43d33a7167b8 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 9 Jun 2016 22:22:46 -0400 Subject: Add virtual workbook / config-in-skeleton classes This patch introduces a new abstraction 'skeleton-workbook' for representing a system configuration. At present it is pulled in by the skeleton recipe so the requirement on what is implemented by a package providing obmc-phosphor-workbook is something compatible with the existing System.py python modules in skeleton. Additionally this patch adds a new recipe for each system using a configuration file from skeleton today, and a class for common configuration. This enables a couple of things: - No need to patch skeleton.service for each system. - New systems don't have to put their configuration in the skeleton repository. Signed-off-by: Brad Bishop --- .../conf/machine/include/openpower.inc | 2 ++ .../recipes-phosphor/skeleton/skeleton.bbappend | 1 - .../skeleton/skeleton/firestone.patch | 11 --------- .../recipes-phosphor/workbook/firestone-config.bb | 8 +++++++ .../recipes-phosphor/skeleton/skeleton.bbappend | 1 - .../skeleton/skeleton/garrison.patch | 11 --------- .../recipes-phosphor/workbook/garrison-config.bb | 8 +++++++ .../recipes-phosphor/workbook/palmetto-config.bb | 8 +++++++ .../recipes-phosphor/skeleton/skeleton.bbappend | 2 -- .../skeleton/skeleton/skeleton.patch | 12 ---------- .../recipes-phosphor/workbook/barreleye-config.bb | 8 +++++++ meta-phosphor/classes/config-in-skeleton.bbclass | 28 ++++++++++++++++++++++ .../common/recipes-phosphor/skeleton/skeleton.bb | 10 ++++---- .../skeleton/skeleton/skeleton.service | 2 +- 14 files changed, 69 insertions(+), 43 deletions(-) delete mode 100644 meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/firestone.patch create mode 100644 meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/workbook/firestone-config.bb delete mode 100644 meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/garrison.patch create mode 100644 meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/workbook/garrison-config.bb create mode 100644 meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb delete mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton.bbappend delete mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton/skeleton.patch create mode 100644 meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/workbook/barreleye-config.bb create mode 100644 meta-phosphor/classes/config-in-skeleton.bbclass diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc index 6660a56a4..2ef42ed47 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc @@ -23,6 +23,8 @@ VIRTUAL-RUNTIME_obmc-phosphor-ipmi-parsers = " \ host-ipmid-oem \ host-ipmid-fru \ " +VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" + PREFERRED_PROVIDER_virtual/obmc-phosphor-host-ipmi-hw = "btbridged" PREFERRED_PROVIDER_virtual/obmc-phosphor-chassis-mgmt = "skeleton" PREFERRED_PROVIDER_virtual/obmc-phosphor-event-mgmt = "obmc-phosphor-event" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton.bbappend index 1edbf31b5..6c14b2210 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton.bbappend @@ -1,4 +1,3 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" -SRC_URI += "file://firestone.patch" SRC_URI += "file://poweron.patch" SRC_URI += "file://occ-path.patch" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/firestone.patch b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/firestone.patch deleted file mode 100644 index 2cb6ab455..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/firestone.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/skeleton.service 2015-10-28 07:47:55.337712001 -0500 -+++ b/skeleton.service 2015-10-28 07:34:05.277712001 -0500 -@@ -2,7 +2,7 @@ - Description=Temp placeholder for skeleton function - - [Service] --ExecStart=/usr/sbin/system_manager.py Palmetto -+ExecStart=/usr/sbin/system_manager.py Firestone - - [Install] - WantedBy=multi-user.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/workbook/firestone-config.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/workbook/firestone-config.bb new file mode 100644 index 000000000..0f4de06f5 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/workbook/firestone-config.bb @@ -0,0 +1,8 @@ +SUMMARY = "Firestone board wiring" +DESCRIPTION = "Board wiring information for the Firestone system." +HOMEPAGE = "http://github.com/openbmc/skeleton" +PR = "r1" + +SRCREV = "5213a991a5a3bd107636f1b2cc3bbca560843462" +inherit config-in-skeleton +inherit obmc-phosphor-license diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton.bbappend index f7f16dae4..6c14b2210 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton.bbappend +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton.bbappend @@ -1,4 +1,3 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" -SRC_URI += "file://garrison.patch" SRC_URI += "file://poweron.patch" SRC_URI += "file://occ-path.patch" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/garrison.patch b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/garrison.patch deleted file mode 100644 index 23aabc5d1..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/garrison.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/skeleton.service 2015-10-28 07:47:55.337712001 -0500 -+++ b/skeleton.service 2015-10-28 07:34:05.277712001 -0500 -@@ -2,7 +2,7 @@ - Description=Temp placeholder for skeleton function - - [Service] --ExecStart=/usr/sbin/system_manager.py Palmetto -+ExecStart=/usr/sbin/system_manager.py Garrison - - [Install] - WantedBy=multi-user.target diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/workbook/garrison-config.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/workbook/garrison-config.bb new file mode 100644 index 000000000..00bc2ec58 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/workbook/garrison-config.bb @@ -0,0 +1,8 @@ +SUMMARY = "Garrison board wiring" +DESCRIPTION = "Board wiring information for the Garrison system." +HOMEPAGE = "http://github.com/openbmc/skeleton" +PR = "r1" + +SRCREV = "5213a991a5a3bd107636f1b2cc3bbca560843462" +inherit config-in-skeleton +inherit obmc-phosphor-license diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb new file mode 100644 index 000000000..730ba1aa4 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb @@ -0,0 +1,8 @@ +SUMMARY = "Palmetto board wiring" +DESCRIPTION = "Board wiring information for the Palmetto system." +HOMEPAGE = "http://github.com/openbmc/skeleton" +PR = "r1" + +SRCREV = "5213a991a5a3bd107636f1b2cc3bbca560843462" +inherit config-in-skeleton +inherit obmc-phosphor-license diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton.bbappend deleted file mode 100644 index c3aad866f..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" -SRC_URI += "file://skeleton.patch" diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton/skeleton.patch b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton/skeleton.patch deleted file mode 100644 index 288e68a15..000000000 --- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton/skeleton.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/skeleton.service 2015-10-28 07:47:55.337712001 -0500 -+++ b/skeleton.service 2015-10-28 07:34:05.277712001 -0500 -@@ -2,8 +2,8 @@ - Description=Temp placeholder for skeleton function - - [Service] - Restart=always --ExecStart=/usr/sbin/system_manager.py Palmetto -+ExecStart=/usr/sbin/system_manager.py Barreleye - - [Install] - WantedBy=multi-user.target diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/workbook/barreleye-config.bb b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/workbook/barreleye-config.bb new file mode 100644 index 000000000..a8c9bb70f --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/workbook/barreleye-config.bb @@ -0,0 +1,8 @@ +SUMMARY = "Barreleye board wiring" +DESCRIPTION = "Board wiring information for the Barreleye system." +HOMEPAGE = "http://github.com/openbmc/skeleton" +PR = "r1" + +SRCREV = "5213a991a5a3bd107636f1b2cc3bbca560843462" +inherit config-in-skeleton +inherit obmc-phosphor-license diff --git a/meta-phosphor/classes/config-in-skeleton.bbclass b/meta-phosphor/classes/config-in-skeleton.bbclass new file mode 100644 index 000000000..33266be69 --- /dev/null +++ b/meta-phosphor/classes/config-in-skeleton.bbclass @@ -0,0 +1,28 @@ +# In general this class should only be used by board layers +# that keep their machine-readable-workbook in the skeleton repository. + +inherit allarch +inherit setuptools + +SRC_URI += "git://github.com/openbmc/skeleton;subpath=configs" +S = "${WORKDIR}/configs" + +python() { + machine = d.getVar('MACHINE', True).capitalize() + '.py' + d.setVar('_config_in_skeleton', machine) +} + +do_make_setup() { + cp ${S}/${_config_in_skeleton} \ + ${S}/obmc_system_config.py + cat < ${S}/setup.py +from distutils.core import setup + +setup(name='${BPN}', + version='${PR}', + py_modules=['obmc_system_config'], + ) +EOF +} + +addtask make_setup after do_patch before do_configure diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb index eb45a406c..97627925e 100644 --- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb +++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb @@ -14,8 +14,10 @@ inherit obmc-phosphor-system-mgmt inherit pythonnative inherit python-dir +VIRTUAL-RUNTIME_skeleton_workbook ?= "" + DEPENDS += "glib-2.0 systemd" -RDEPENDS_${PN} += "python-subprocess python-compression libsystemd" +RDEPENDS_${PN} += "python-subprocess python-compression libsystemd ${VIRTUAL-RUNTIME_skeleton_workbook}" SRC_URI += "git://github.com/openbmc/skeleton" FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/*" @@ -41,7 +43,7 @@ do_compile() { do_install() { oe_runmake -C git install \ - PYTHON=${PYTHON} \ - DESTDIR=${D} \ - PREFIX=/usr + PYTHON=${PYTHON} \ + DESTDIR=${D} \ + PREFIX=/usr } diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton/skeleton.service b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton/skeleton.service index b001abf3f..35b6e6c56 100755 --- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton/skeleton.service +++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton/skeleton.service @@ -3,7 +3,7 @@ Description=Temp placeholder for skeleton function [Service] Restart=always -ExecStart=/usr/sbin/system_manager.py Palmetto +ExecStart=/usr/sbin/system_manager.py [Install] WantedBy=multi-user.target -- cgit v1.2.1