| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
The configparser library has deprecated the `readfp` function since
Python 3.2. I observed that the `log.do_generate_phosphor_manifest`
had the following warning:
```
meta-phosphor/classes/image_version.bbclass:17: DeprecationWarning: This method will be removed in Python 3.12. Use 'parser.read_file()' instead.
```
The `read_file` is an identical replacement for `readfp` and has been
present since Python 3.2.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ifd2f6ca5b1ff46bb351a024186515da28f13304d
|
|
The EXTENDED_VERSION in the os-release file was an optional field.
Initialize it to a default since there will be a Redfish property for
extended version information that can be mapped to the ExtendedVersion
D-Bus property, choose the VERSION_ID value as the default since that's
what's used for the Version D-Bus property, and set it to a weak
variable so it can still be overwritten.
Need a new function to get the EXTENDED_VERSION from the os-release file
instead of just from a bitbake variable. It is still possible to
overwrite the default value in a conf or bbappend file, same as
BUILD_ID.
Note that the extended version was and still is surrounded by quotes,
since this is a free-format string that may contain spaces.
Tested:
- Verified the extended version string was the same as version in:
- os-release:
VERSION_ID=2.13.0-dev-613-g1e16157845
EXTENDED_VERSION="2.13.0-dev-613-g1e16157845"
- MANIFEST:
version=2.13.0-dev-613-g1e16157845
ExtendedVersion="2.13.0-dev-613-g1e16157845"
- D-Bus properties:
.ExtendedVersion property s "2.13.0-dev-613-g1e16157845"
.Version property s "2.13.0-dev-613-g1e16157845"
- Verified that extended version could be set from a conf file, example:
in meta-ibm/conf/machine/witherspoon.conf:
EXTENDED_VERSION = "My Extended Version"
- Verified that extended version could be set from a bbappend, example:
in meta-ibm/recipes-core/os-release/os-release.bbappend:
EXTENDED_VERSION:witherspoon = "My_Extended_Version_from_bbappend"
Change-Id: I74adf08239c9cd08768be9c5d9cd3384e703da95
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
|
|
The logic to get an os-release value was duplicated. Move this logic to
a single function to remove the duplication. This can also help to avoid
further duplication if additional values need to be parsed.
Tested: Verified the contents of the MANIFEST file were the same after
this change.
Change-Id: Iacdb2c7e644103d76b73f32b15a089d352f40001
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
|
|
Add the BUILD_ID value to the MANIFEST so that it can be used alongside
the VERSION value to generate a version id during firmware updates.
Add a function to read BUILD_ID from the os-release file instead of
reading it from a variable because the BUILD_ID value could be set via a
os_release.bbappend file instead of a .conf file.
Tested: Verified the BUILD_ID value was added to the MANIFEST by
default, and when BUILD_ID was specified in a .conf file, and on a
os-release.bbappend. Ex:
$ cat MANIFEST
purpose=xyz.openbmc_project.Software.Version.VersionPurpose.BMC
version=2.11.0-dev-566-g263df7f852
BuildId=20211025151654
ExtendedVersion=
KeyType=OpenBMC
HashType=RSA-SHA256
MachineName=p10bmc
Change-Id: I3b7beaccbbd47d8820d499180ccdf021b004cf85
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
|
|
As a follow up to 400d9dab03e25d992429f94296caa4938c281fbd, fix the
deprecated SafeConfigParser to ConfigParser across the tree.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iabf941889eed97a996b739d77c8107f1f35ce5bf
|
|
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I588025b614416c43aa2d053765ab53bacf890cb5
|
|
Any recipe inheriting image_version must have a dependency
on os-release to ensure the sysroot is populated before
attempting to get the version out of it.
Also read the version out of the target sysroot rather than the
host sysroot. os-release does not have a native variant.
Tested: Built image and verified in witherspoon qemu
Change-Id: I8d79280a75577eff48314f0f57c0015e1d6738ef
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
- When the new ubi layout is flashed onto the BMC, the volumes
were named kernel-0 and rofs-0 by default. This tends to be
misleading as we can't differentiate between two different BMC
versions.
- Now the ubi volumes will be named kernel-<versionID> and
rofs-<versionID> calculated by getting the hash(SHA-512) of
the version and taking the first 8 characters.
- The Uboot env needs to be updated to point to the correct
kernelname which has now changed from kernel-0 to
kernel-<versionID> calculated by getting the HASH(SHA-512)
of the version and taking the first 8 characters.
Resolves openbmc/openbmc#2323
Change-Id: I258d165b399d1ff59ea86f410006f6d03fe13a2e
Signed-off-by: Saqib Khan <khansa@us.ibm.com>
|
