-
Notifications
You must be signed in to change notification settings - Fork 882
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #324 from bradbishop/dir-structure
Add virtual workbook / config-in-skeleton classes
- Loading branch information
Showing
17 changed files
with
89 additions
and
60 deletions.
There are no files selected for viewing
4 changes: 1 addition & 3 deletions
4
...enbmc-machines/meta-openpower/common/recipes-phosphor/images/obmc-phosphor-image.bbappend
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1 @@ | ||
IMAGE_INSTALL += " \ | ||
inventory-upload \ | ||
" | ||
OBMC_IMAGE_EXTRA_INSTALL_append = " inventory-upload" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
...chines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton.bbappend
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" | ||
SRC_URI += "file://firestone.patch" | ||
SRC_URI += "file://poweron.patch" | ||
SRC_URI += "file://occ-path.patch" |
11 changes: 0 additions & 11 deletions
11
...meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/skeleton/skeleton/firestone.patch
This file was deleted.
Oops, something went wrong.
8 changes: 8 additions & 0 deletions
8
...ines/meta-openpower/meta-ibm/meta-firestone/recipes-phosphor/workbook/firestone-config.bb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
1 change: 0 additions & 1 deletion
1
...achines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton.bbappend
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" | ||
SRC_URI += "file://garrison.patch" | ||
SRC_URI += "file://poweron.patch" | ||
SRC_URI += "file://occ-path.patch" |
11 changes: 0 additions & 11 deletions
11
...s/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/skeleton/skeleton/garrison.patch
This file was deleted.
Oops, something went wrong.
8 changes: 8 additions & 0 deletions
8
...chines/meta-openpower/meta-ibm/meta-garrison/recipes-phosphor/workbook/garrison-config.bb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
8 changes: 8 additions & 0 deletions
8
...chines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/workbook/palmetto-config.bb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
2 changes: 0 additions & 2 deletions
2
.../meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton.bbappend
This file was deleted.
Oops, something went wrong.
12 changes: 0 additions & 12 deletions
12
...openpower/meta-rackspace/meta-barreleye/recipes-phosphor/skeleton/skeleton/skeleton.patch
This file was deleted.
Oops, something went wrong.
8 changes: 8 additions & 0 deletions
8
...eta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/workbook/barreleye-config.bb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 <<EOF > ${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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters