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 --- .../recipes-phosphor/skeleton/skeleton.bbappend | 2 -- .../recipes-phosphor/skeleton/skeleton/skeleton.patch | 12 ------------ .../recipes-phosphor/workbook/barreleye-config.bb | 8 ++++++++ 3 files changed, 8 insertions(+), 14 deletions(-) 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 (limited to 'meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye') 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 -- cgit v1.2.1