Age | Commit message (Collapse) | Author | Files | Lines |
|
The cooling-type in phosphor-fan is optional, and Romulus is a
air-cooled system and does not require cooling-type application at all.
Remove the cooling-type app and the related configuration files.
Tested: Verify the generated phosphor-fan related hpp and cpp files are
identical as before, and the system is able to power on and do
fan monitor/control without problem.
(From meta-ibm rev: 3168f5e5fb59bd37eed1600d42a8d6fc02875fea)
Change-Id: I30f47ef63f4ff5bea89f31966273930baaf070ea
Signed-off-by: Lei YU <mine260309@gmail.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
With updated from openbmc/openbmc#2911, event actions are now able to be
configured with group subsets and event timers are now included in the
available event triggers. Actions with group subsets allow a single
event's set of triggers to run actions against a given group subset
instead of the entire event groups. Also, with timers being included as
a trigger, events can be configured with or without a timer instead of a
disabled timer being created for events that previously did not require
a timer.
Tested:
Generated code is functionally equivalent to previous yaml
(From meta-ibm rev: 03eacc4ef87b3b89cf36aab977ff4eab68f8b4fc)
Change-Id: Ib7eadf5b7c2cb27440e5944348460295334b9f13
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
This allows upstream to drop some backward-incompatible changes while
the yaml in meta-ibm gets updated to the new format coming in from
upstream.
(From meta-ibm rev: 81ca4572471629b5114a52afb50a84d9e2cc92d1)
Change-Id: Ia554f14c624d236e02d7898d2f95e7a90384dadf
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
The service phosphor-cooling-type is required by multi-user.target and
thus will be started by default. In case multi-user.target is started
for multiple times, this service will be startd for multiple times as
well, and eventually get start-limit-hit failure.
This commit adds RemainAfterExit=true so the service will be treated as
started and thus will not be started for multiple times.
Resolves openbmc/openbmc#3544
Tested: Reboot Romulus BMC when the host is on, and verify the BMC gets
READY state after reboot.
(From meta-ibm rev: fdd8f7bb1cca6b505d6b92c741d04a9c6bbfafa7)
Change-Id: Ie3817296265c860d770333c59b591da9d083139c
Signed-off-by: Lei YU <mine260309@gmail.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
meta-phosphor recently enabled target class config recipes. Those are
preferable to native class config recipes because native recipes cannot
be overridden based on MACHINE, so switch to target class config
recipes.
Switching to target class recipes consists of temporarily setting
PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT to 0, overriding the phosphor
distro default of 1. After all OpenBMC BSP layers have moved to target
class config recipes PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT can be
removed from meta-phosphor and any BSP layers.
Any references to -native recipes are replaced with their target class
counterparts.
Any -native bbappends are re-worked to apply to their target class
counterparts.
Finally, use BPN instead of PN when setting FILESEXTRAPATHS, to avoid
unfortunate directory hierarchies if these bbappends are copy/pasted and
then used to bbappend a native recipe. Since this patch moves to target
class recipes, this is a noop; however, this avoids unfortunate
directory hierarchies with native bbappends such as:
meta-base/recipes-foo/bar/baz-native.bb
meta-base/recipes-foo/bar/baz/a-file
meta-append/recipes-foo/bar/baz-native.bbappend
meta-append/recipes-foo/bar/baz-native/b-file
Using "${THISDIR}/${BPN}:" enables a more sensible hierarchy:
meta-base/recipes-foo/bar/baz-native.bb
meta-base/recipes-foo/bar/baz/a-file
meta-append/recipes-foo/bar/baz-native.bbappend
meta-append/recipes-foo/bar/baz/b-file
This behavior occurs because By default FILESPATH is set in base.bbclass
(in OE-Core) to look for files in ${BP}, ${BPN} and files (and a number
of subdirectories of those based on ${FILESOVERRIDES}).
(From meta-ibm rev: 589ee00a5ec7bc97c7d5c079cf66b3dbd3ac2b4f)
Change-Id: I1a593373f1b4bc82c554a9330cdd75f04f21d1d8
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Typically it does not make any sense to append to FILESEXTRAPATHS.
FILESEXTRAPATHS is set in a bbappend when overriding something from
another layer. The typical desire will be to make bitbake search for
files in the layer with the bbappend and not some other layer earlier in
the priority list. Further, appending to FILESEXTRAPATHS will introduce
unexpected behavior when multiple layers append the same recipe - layers
with higher layer priorities that append to FILESEXTRAPATHS will find
their files overriden by files in layers with lower priorities.
(From meta-ibm rev: e11f36155c0fc8a6cc4bb6ef5abee777b8ae6b5a)
Change-Id: Idcd839211e009f260a38ae9cb6351154a8074c28
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Add overrides to variable assignments as described in "Modify Variables
to Support a Different Machine" in the yocto development tasks manual:
https://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#best-practices-to-follow-when-creating-layers
In a nutshell this allows multiple BSP layers to be included
simultaneously in bblayers.conf, which increases the potential for meta
data sharing between layers.
(From meta-ibm rev: 0ccb228f770fe8688fd926ad822244fab6926298)
Change-Id: I4f648d1c2232a6f246b63b8e46731b7ef1af13ac
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Patrick Venture (1):
build: install into bin instead of sbin
meta-ibm: phosphor-fan: grab cooling-type from bindir
The output binaries from phosphor-fan-presence are now installed into
bin instead of sbin.
Change-Id: I2d42f62b4535775ffd0d1b9473375dd8dc66bb61
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Instead of obmc-standby.target, use multi-user.target.
(From meta-ibm rev: 85cff8cc9e66049d8ac26271c13f82d894ac572f)
Change-Id: I03c3d41c031343fa584511889c70e3def92cb83d
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Drop symlink and rename bbappend for phosphor-fan.
(From meta-ibm rev: c2cff867a39ea68c246687137d1cfae2a16252a6)
Change-Id: I86496512904227954d4086a7dd43402c9870ca17
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Set the wildcard for version for phosphor-fan_%.bbappend
(From meta-ibm rev: bd2065117149b58f662babc780c329048c49c9e5)
Change-Id: I4187fd22e2c25d7d7e3058bf381a083fd4d691b1
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
The new subtree model brings the subtrees up from the openbmc-machines
layer.
Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|