summaryrefslogtreecommitdiff
path: root/meta-phosphor/conf
AgeCommit message (Collapse)AuthorFilesLines
2021-06-23meta-phosphor: os-release: Set weak default to DISTRO_VERSIONWilly Tu1-1/+0
Improved practice to use DISTRO_VERSION instead of the undocumented VERSION_ID. DISTRO_VERSION is documented in yocto https://www.yoctoproject.org/docs/latest/ref-manual/ref-manual.html and specified in this section about creating your own distribution. https://docs.yoctoproject.org/dev-manual/common-tasks.html#creating-your-own-distribution VERSION_ID is undocumented and will more likely be changed compared to the documented DISTRO_VERSION. The VERSION_ID is set to DISTRO_VERSION in poky/.../os-release.bb Use weak default to DISTRO_VERSION instead of overriding VERSION_ID. This allows other layers to override in *.bbappend or *.conf. Tested: ``` root@romulus:~# cat /etc/os-release ID=openbmc-openpower NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)" VERSION="2.11.0-dev" VERSION_ID=2.11.0-dev-165-g20885c497 PRETTY_NAME="Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro) 2.11.0-dev" BUILD_ID="2.11.0-dev" OPENBMC_TARGET_MACHINE="romulus" ``` Signed-off-by: Willy Tu <wltu@google.com> Change-Id: I25b5a165b764e6562fa8008c9d2a75a82fb09139
2021-06-07treewide: Remove obsolete image-mklibs classWilliam A. Kennington III1-1/+1
This is apparently not actually working anymore and is removed in the next poky update. Change-Id: Ia1c6a258d124a4a30a14fc42e8e0bba95e64faeb Signed-off-by: William A. Kennington III <wak@google.com>
2021-06-05Clean up QEMU_TARGETS variableKonstantin Aladyshev1-1/+1
Build QEMU only for relevant targets to speed up compilation process. Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com> Change-Id: I67c86d6c8fdd2b4969c35c98bec9d5d2342bbef6
2021-05-26phosphor-defaults: Enable LTO for all meson targetsWilliam A. Kennington III1-0/+3
We want to benefit from the space savings of being able to link time optimize all of our binaries built through meson. Change-Id: If36f9e76a27bfa8d00210492c2397a174e09dbd3 Signed-off-by: William A. Kennington III <wak@google.com>
2021-05-26Add RISC-V QEMU targetsKonstantin Aladyshev1-1/+1
Add new QEMU targets 'riscv32' and 'riscv64' to be able to use runqemu script on these architectures. Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com> Change-Id: Ib4019e57a0167203fb42c2214a806709a923209a
2021-04-12Enable Systemd NSS module to support DynamicUsersAnton D. Kachalov1-1/+1
DynamicUsers flag in systemd service configuration file required to create, handle and recycle temporary users. This is essential module for upcoming daemons' privilege separation work. Reference: https://github.com/openbmc/openbmc/issues/3383 Signed-off-by: Anton D. Kachalov <gmouse@google.com> Change-Id: Iabd709c4a20f754fc6ea505e640b2d361aba0be2
2021-04-06hardknott: yocto releaseAndrew Geissler1-1/+1
Latest upstream yocto has moved on to the 3.3 hardknott release Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: Ieae36798d66d21c2c642931f06407d3bb2acf163
2021-03-26ledmanager: Remove phosphor-led-manager-ledmanager packageVishwanatha Subbanna1-1/+1
phosphor-led-manager has 3 packages - phosphor-led-manager : Default - phosphor-led-manager-ledmanager : Packages phosphor-ledmanager - phosphor-ledmanager-faultmonitor : Packages phosphor-fru-fault-monitor Because of this, it was not possible to install files via Makefile and that always needed a corresponding update to FILES_{PN}-ledmanager. Removing phosphor-led-manager-ledmanager will eliminate this problem. Change-Id: I00ca4c34346a47f887872464b9050a46d8f5e8e9 Signed-off-by: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
2021-03-22openbmc: add meta-security layerAnton D. Kachalov1-0/+5
This layer provides libseccomp. Signed-off-by: Anton D. Kachalov <gmouse@google.com> Change-Id: I84513d56f2ed75fab49043196b98ef8b858e394f
2021-03-01Remove phsophor-gpio-keys as a standalone featureJoel Stanley1-3/+0
The feature was implemented as an append to the kernel (BSP) layers in meta-phsophor. This created a three way dance between machine layers, BSP and meta-phosphor, when it should have been the kernel layer providing this feature and machines could then opt in. Fixing this means we could remove the KERNEL_DANGLING_FEATURES_WARN_ONLY workaround. As the feature is simply turning on a pair of kernel options without any other impact, we can implement it by adding the options to our defconfigs. In fact, aspeed and hpe kernel configurations enable the two kernel options: $ git grep CONFIG_KEYBOARD_GPIO=y meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig:CONFIG_KEYBOARD_GPIO=y meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig:CONFIG_KEYBOARD_GPIO=y meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig:CONFIG_KEYBOARD_GPIO=y meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig:CONFIG_KEYBOARD_GPIO=y $ git grep CONFIG_INPUT_EVDEV meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig:CONFIG_INPUT_EVDEV=y meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig:CONFIG_INPUT_EVDEV=y meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig:CONFIG_INPUT_EVDEV=y meta-hpe/meta-gxp/recipes-kernel/linux/linux-obmc/defconfig:CONFIG_INPUT_EVDEV=y Other machines that wish to enable this feature should ensure it is added to their BSP's defconfig, or add it to their machine specific defconfig. Change-Id: I0726836319022f96c1d13d4a0cbd73708047302c Signed-off-by: Joel Stanley <joel@jms.id.au>
2021-02-23phosphor-tiny: remove distro settingPatrick Williams1-2/+0
This distro feature is not used anywhere. Remove it to reduce the clutter. Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I1dd4e5ae52197a377b552a8a0e7d1e6d7e7ebe7f
2021-01-28Add security flags to all phosphor buildsEd Tanous1-0/+13
Yocto has a built-in class for applying compiler security flags to builds. Some security concious projects within OpenBMC set these flags manually. We should do this project wide, given that it has a negligible performance impact, and brings us in line with modern security requirements. There are some whitepapers on the specifics of what these flags do, which is a much better documentation than I am able to write here, but the key takeaways are that this: 1. Enables position independent code. 2. Enables FORTIFY_SOURCE level 2. 3. Enables -wformat and -wformat-security 4. Enables strong stack protection. None of these flags should have any change in functional behavior. Section 4.3 of this doc goes through this file in more detail: https://www.nccgroup.com/globalassets/our-research/us/whitepapers/2018/improving-embedded-linux-security-yocto3.pdf croserver/eCMD doesn't currently compile with these flags, so it's explicitly excluded for the moment. Patchset has been merged against eCMD master to fix this, but we're so far behind, the bump doesn't build obmc-libobmc-intf has an error that I can't quite understand yet about unused results, which shouldn't have been effected by this, yet it seems to be related to enabling the security hardening, so it is also excluded from the security flags for the moment. libpldm includes an IBM OEM command that relies on undefined behavior with open() the proposed fix is here, but libpldm is excluded until that is merged and bumped. https://gerrit.openbmc-project.xyz/c/openbmc/pldm/+/3998412 Even with those three exceptions, getting a majority of the security flags enabled on a majority of the repos should be an overall win. Signed-off-by: Ed Tanous <edtanous@google.com> Change-Id: I0483b1dbe1123a7beff8c5788363685487fb9c09
2021-01-12Remove packagegroup-core-device-devel for qemuEd Tanous1-8/+0
Upstream yocto removed these parameters in this commit: d707fa30f8a24d1e50831846330757254f245791 packagegroup-core-device-devel: remove https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=d707fa30f8a24d1e50831846330757254f245791 and now builds against a qemu machine fail to build. This commit removes phosphors use of these items, as it isn't clear what they were doing for us anyway, which the aformentioned commit also asserts. (From meta-phosphor rev: 933b75141f46cefe838f298f793f7d49c9f1f2b3) Signed-off-by: Ed Tanous <edtanous@google.com> Change-Id: I2c9ab4ade1ac1926094da9102ac2c047baa147e0 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-11-10meta-phosphor: update Yocto compat for gatesgarthPatrick Williams1-1/+1
The next release of Yocto is soon and most of the upstream layers have switched support strings for it. Support layer compat for gatesgarth (current) and dunsfell (previous). (From meta-phosphor rev: 49b2a2c56bb774224b15f80deeffff096f59a2db) Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: Ie37ab65b72c2e10e0324774c56b7968db091ea5b Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-09-13meta-phosphor: fru-device: add packageBrad Bishop1-1/+0
Add a fru-device package, packagegroup, and image feature. Remove the ipmi-fru distro feature, since adding it in the first place was a mistake - no projects have conditional ipmi-fru feature flags. (From meta-phosphor rev: 4525a9d01a5f65438342a894f27c82f0dd61642c) Change-Id: I6928ac67d4acb4568359a308b45cb0734d116054 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-09-01meta-phosphor: IBM-POWER: add MACHINEOVERRIDESBrad Bishop4-0/+7
Add machine overrides for IBM processors: - ibm-power-cpu: for any IBM POWER processor - ibm-power8-cpu: for IBM POWER8 processors - ibm-power9-cpu: for IBM POWER9 processors - ibm-power10-cpu: for IBM POWER10 processors ibm-power-cpu is used when an override applies to any IBM POWER processor. ibm-power<N>-cpu can be used when a specific override exists for a specific POWER processor generation. (From meta-phosphor rev: a59b21d85e90ba5ecfc42e22e751c9dfe6aacb0e) Change-Id: Ie1eebb677204b9314942f414c10e5dc3134397a9 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-09-01meta-phosphor: distro remove unused featuresBrad Bishop1-2/+0
The ldap and libc-inet-anl DISTRO_FEATURES aren't used anywhere, so don't set them. (From meta-phosphor rev: 23140b75afb741ebcd9190efd825b7ef81576e29) Change-Id: Iba881c25d572397b69b134174336f88b936bddd9 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-08-14meta-phosphor: distro-base: add DISTROOVERRIDESBrad Bishop1-0/+2
152695448 removed our openbmc-phosphor distro override. This had minimal or no impact because distro overrides based on the DISTRO aren't being used as they should. Add a distro override so they can be used where appropriate (e.g. oe-core bbappends). (From meta-phosphor rev: 1b9a74965ae664726e82ff7941b2d046392fb0f3) Change-Id: I7ae07ac26c2ea4882d3b1b002b340f53d885c1e8 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2020-07-15obmc-bsp-common: Build default eMMC imagesAdriana Kobylak1-1/+14
OpenBMC only supported 2 layouts: static and UBI. With the introduction of eMMC, need to change the logic so that static images are only built if UBI or eMMC are not specified. Add the default eMMC image types to be built. Tested: Adding this line to a machine conf only built the wic image and emmc tarball: require conf/distro/include/phosphor-mmc.inc (From meta-phosphor rev: 2f1584b1bec3047944544cfeb5c5539e307f0ecb) Change-Id: I45569ab375221ac8b9cb7bb045ca88e71cad7286 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-07-15Create phosphor-mmc distro featureAdriana Kobylak1-0/+2
Create a distro feature for building images for a mmc chip. This distro feature would allow to add/remove packages that only apply to mmc. (From meta-phosphor rev: 3633bca4309f6aa0417aa86e74f8b39e4d750528) Change-Id: Icf5c39d7f66fd662dc02479263b67ef674b4b232 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-06-16phosphor-base.inc: add var for automatic YAML subdirsPatrick Williams1-0/+6
Some packages have directory trees of YAML files arranged based on canonical organization names. See phosphor-logging-yaml-providers.bbclass as an example. Add a variable that can be appended to by a layer to limit the number of 'bbappends' that are necessary in a layer to add their layer-specific organizations to all the YAML processing recipes. (From meta-phosphor rev: 2f31e7a7a37f841c1b2586e92258a7759b36306f) Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: Ie4754ba96a4542ce813869a1384b44ab88000be0 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-06-16phosphor-base.inc: remove old pygobject PREFERRED_VERSIONPatrick Williams1-3/+0
We do not use pygobject any more and the PREFERRED_VERSION does not even exist (python2-based). (From meta-phosphor rev: 6d6e2b31f98363c39b9b94cd1bdfb518e7669382) Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I8856b0900a1cdb6140b741c3a9639099f1154102 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-05-27meta-phosphor: add ipv4/ipv6 DISTRO_FEATURESPatrick Williams1-3/+4
DISTRO_FEATURES_LIBC was removed from upstream poky in 2.7 (see ref-manual/migration.xml), and we use to get ipv4 and ipv6 picked up as DISTRO_FEATURES as a side-effect of this variable. It was reported that ipv6 tools were missing from the image, so add this back directly as a DISTRO_FEATURE. Also, sort DISTRO_FEATURES_DEFAULT and remove any reference to the now-deprecated DISTRO_FEATURES_LIBC. (From meta-phosphor rev: 4877428408c6b2937c6e75d1cdb32f12ad975acf) Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: Ic0d75deccf57147734849c3800b8b316a60971d0 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-05-14meta-phosphor: remove some old skeleton-based default virtualsPatrick Williams1-5/+0
(From meta-phosphor rev: 26202e3e79ec092a6af7311b962d81b0576da926) Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: Ib4fcc31b4d43807cb3b24cf131deca6744ed63d7 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-04-27distro: do not override DISTRO in base incAndrew Geissler1-1/+0
This file originally was not written to be included. Once it was moved to an include, should have removed the DISTRO override. The gsj system recently moved to a custom distro that includes this file. Need to ensure DISTRO is not overridden. (From meta-phosphor rev: 15269544861c755661981d99711c120fce5410cd) Change-Id: Iab75967dcaddf0d86b47d4339d82cce43197e73a Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-04-14dunfell: add support for new layerAndrew Geissler1-1/+1
(From meta-phosphor rev: de7df6ae69414c3168d968dccca08d10d10418b7) Change-Id: Ie1c39397ef6729ef96c4378029646a6d2dac9532 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-03-28meta-phosphor: distro: add ipmi-fru distro featureBrad Bishop1-0/+1
Add an ipmi-fru distro feature. The ipmi-fru distro feature selects support for the IPMI FRU format. Initially this will be used by the entity-manager recipe to select the fru-device meson option provided by that project for building the fru-device application - an ipmi fru format parsing application with dbus support. (From meta-phosphor rev: 5a1fc9e6c9701eebd98c1ac94032206b3879aca1) Change-Id: I86b8c5d2625b8ea856946e5e4de055bb14f8ffa7 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-03-27meta-phosphor: distro: remove obmc-settings-mgmtBrad Bishop2-6/+0
Remove VIRTUAL-RUNTIME_obmc-settings-mgmt. phosphor-settings-manager is the de-facto standard for settings management in OpenBMC. This is a minor improvement to ease of consumption and comprehensibility. If a popular alternative to phosphor-settings-manager emerges, revisit the need for this abstraction then. For un-popular alternatives, bitbake still provides the means for doing this entirely in downstream layers. (From meta-phosphor rev: a71cf481ef2f836c839542818e03eda058bc5ef9) Change-Id: Id563e252c14627e5842c9353e0631901be876326 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-03-27meta-phosphor: distro: drop meta-virtBrad Bishop1-6/+0
meta-virtualization was dropped from Phosphor OpenBMC awhile back. There isn't any reason to continue setting this variable. (From meta-phosphor rev: 5388be3ff1475f9214ff4372acbe6a2f1831bb4d) Change-Id: I62dc934e07983623e924b657d7373714b42c9fa4 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-03-27meta-phosphor: distro: remove loggingBrad Bishop1-1/+0
There isn't any recipe metadata with any conditional logic around this distro feature. Remove, for a small improvement to comprehensibility. (From meta-phosphor rev: b670a101cd22746227ca3fd7ef8615f04aa97fd4) Change-Id: Ie893015545db146512ef4cb216d94e80e8ac5050 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-03-27meta-phosphor: distro: remove user-mgmtBrad Bishop1-1/+0
Remove the obmc-phosphor-user-mgmt distro feature. It doesn't have any references in any upstream metadata. (From meta-phosphor rev: 123e391db9b2e23082dc087ae524b2624c6b13c1) Change-Id: I37fad05647629af78236cd9fea0d1fd4b2faa7dc Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
2020-01-20phosphor: re-enable uninative support optionally.Patrick Williams1-0/+1
Uninative support was completely removed with commit 70e685ef45a926064d27a2937d6274832c7608b4 but this is a useful feature on systems that support it (specifically x86_64) because it enables sstate sharing across various distribution types. Add in the minimal support for uninative but do not enable it. This allows someone to optionally enable it by adding the following to a conf/local.conf: INHERIT += "uninative" (From meta-phosphor rev: ea487839ed8566a43e8f9087fba850b1702f9534) Change-Id: Ifb5ef4aee5886da676f0748c72646a1e8b775658 Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-11-18Use debug-tweaks, allow-root-login to allow root.Richard Marian Thomaiyar1-1/+1
root user account is enabled with proper privilege and group, only if debug-tweaks or allow-root-login FEATURES is defined. Note: This will not remove root user getting managed from phosphor-user-manager, instead it will make sure, the privilege and groups are empty for the root user. Tested: 1. Verified the default build, which has debug-tweaks, allowing root user to be with priv-admin, and enabled for all groups. 2. Verified by removing debug-tweaks from the local.conf, and root user privilege & groups are empty. (From meta-phosphor rev: b1b8251f4e5f19189057cdeb998cf119be1c27b8) Change-Id: Iec2a0b1a9f84c27dd4947125903ce43f3a9c3c2c Signed-off-by: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-10-29stop overriding DISTRO_FEATURES in phosphor-baseAndrew Geissler1-1/+1
Other include files may set DISTRO_FEATURES prior to including this file. Need to honor those features. (From meta-phosphor rev: 17801b40a7143c6b80dd4318c94143e47ef1ead3) Change-Id: I42593e07d67416d2dbb06f3958861ed4ebe762ff Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-25obmc-bsp-common: Use xz instead of lzma for initrdWilliam A. Kennington III1-1/+1
This is more confusing than anything, our squashfs is compressed with xz (lzma2) and our kernel supports decompressing xz and lzma types of initrds. Just use the same type of compression for all images. (From meta-phosphor rev: 282c6e7254ddc4e79d3545b841c091a671d476ce) Change-Id: I4ecd7e4d72f4a3b3839402934dad959d90d1cec8 Signed-off-by: William A. Kennington III <wak@google.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-25nuvoton: Apply image overrides to all image typesWilliam A. Kennington III1-0/+1
Right now, nuvoton overrides needed for generating and applying the bootblock are not applied to images other than obmc-phosphor-image. This means that core-image-minimal is unbootable on nuvoton platforms. This change makes the nuvoton overrides apply globally to all images. (From meta-phosphor rev: 9819cb9533f430797d47dadff558cf4462670976) Change-Id: If4bef5f8106278fa6ebeb2198bc43fdd2b70a641 Signed-off-by: William A. Kennington III <wak@google.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-25phosphor-base: Remove hwdb and mime info from all imagesWilliam A. Kennington III1-2/+2
All of our images should remove these features as they are unnecessary and impractical to run on any of our boards. Leaving these enabled for core-image-minimal made booting take ~60s in userspace and it filled up the rwfs on my machines. There doesn't seem to be any benefit to providing these with any of our images currently. (From meta-phosphor rev: 563b83bf8de93017e16ca46d3013333ee840818c) Change-Id: Id2d29d27ffba3659b15ce73714b308362d862ec3 Signed-off-by: William A. Kennington III <wak@google.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-23meta-phosphor: layer.conf: add zeus compatibilityBrad Bishop1-1/+1
OE-core master will be dropping warrior soon; zeus is the next release. (From meta-phosphor rev: 4a7eb91c9da7ce95d114b3bd435565debbc9b58a) Change-Id: I7eb11fcf9ed431afb3b8ad5f81fcc60c8d2ec299 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-23phosphor-base: All images should use dbus-brokerWilliam A. Kennington III1-0/+2
All of our images use systemd for booting, so we should deploy dbus-broker everywhere. (From meta-phosphor rev: f8196005aefa15dd249ff72036f717b629c8bd4e) Change-Id: I3010e367a79d782db31050979f5f1bdd30944a11 Signed-off-by: William A. Kennington III <wak@google.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-09-20meta-phosphor: Remove references to PHOSPHORBASEBrad Bishop1-3/+0
PHOSPHORBASE is only used for pointing at licenses...point at the licenses in oe-core in meta/files/common-licenses instead. to match the defacto convention used in other oe layers like meta-openembedded. (From meta-phosphor rev: a1cee09419cb1467c3d2b7bf996b40089f0d06f4) Change-Id: If136d24638a8022671988cf0a01620e7fffc545f Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-08-14phosphor: obmc-bsp-common: use stronger assigmentsBrad Bishop1-3/+3
Make stronger assertions about the initramfs images and initramfs image types to use. Upstream BSP layers may set defaults for these variables using ?= resulting in the variable settings here being ignored. (From meta-phosphor rev: 2f24647373e7ecee0afafdbf9e84b6e883422bfe) Change-Id: I27c316341690ffc3b85f19978aa811ebf84293cf Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-07-14u-boot-aspeed: Add distro feature for mac2 supportJohn Wang1-0/+2
Add a distro feature to enable aspeed nic driver to enable MAC1 and MAC2. The aspeednic patch is copied from meta-ingrasys/meta-zaius, it is also required by fp5280g2. To avoid duplication, this distro feature has been added. Both meta-fp5280g2 and meta-zaius will be updated to use the distro feature. Tested: tested on fp5280g2, and both Ethernet ports worked (From meta-phosphor rev: 5a8e7c5a6efea492b82d710c465125fc9d0afdb9) Signed-off-by: John Wang <wangzqbj@inspur.com> Change-Id: Ia754595c5e3762f69397c03021ffe29ea5b9afcc Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-06-19meta-phosphor: ipmi: improve entity YAML selectionBrad Bishop1-7/+0
The existing scheme for selecting an entity configuration YAML for building ipmid consists of a virtual (phosphor-ipmi-entity-config) with the preferred provider set to a default recipe (phosphor-ipmi-entity-inventory-native) in the Phosphor distro configuration. Instead, provide a reasonable default directly in the ipmid metadata. This is a small step towards enabling ipmid to build without any distro configuration and should lower the effort required (slightly) to comprehend where the the entity YAML file is coming from. There aren't any known clients overriding the entity YAML in the first place, but a client could still override with an ipmid bbappend and setting EXTRA_OECONF appropriately. (From meta-phosphor rev: fe88ee4211c93f4ca4acba5ecec502aef17944ce) Change-Id: Ie152c413ee6674735b6bf3192b01ec0bc5a39a29 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-22meta-phosphor: fans: remove native supportBrad Bishop2-6/+4
All OpenBMC BSP layers have moved to target class config recipes. As such, support for native class config recipes can be removed. (From meta-phosphor rev: f3b437c327b94df6f22c7d821f25d76f1d1c2180) Change-Id: I7729f7e34529a220af36b88017cb48a3ee887acb Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-21meta-phosphor: fans: enable non-native recipesBrad Bishop2-14/+15
There exists a number native class recipes throughout meta-phosphor that simply provide a data (often YAML) file as input to building another application. Having these data file recipes implemented as native class recipes prevents the use of machine overrides because bitbake (rightfully so) discards machine qualifiers from native recipes. Further, data files aren't really any different than library header files and those are consumed by recipes as target class recipes that are DEPENDed on. Do the same thing for data file recipes. A number of steps (patches) are required to ensure backward compatibility while other BSP layers make the transition to target class recipes. This patch is the first step in the sequence. Each native class recipe is duplicated with (approximately) the following transformation applied: 1 - remove "inherit native" 2 - add "inherit allarch" 3 - Add appropriate files to FILES_${PN} Also fixed a couple idiosyncrasies like SRC_URI += and LIC_FILES_CHKSUM that are not required. Finally, add a temporary layer of indirection around STAGING_DIR_NATIVE and STAGING_DIR_HOST to the fan metadata until other BSP layers have fully transitioned to target class config recipes. (From meta-phosphor rev: 19ee51f5cdce2ff2f076a3ca9263dabc79072ba9) Change-Id: I9671cc5343ed29a7ccfcee4cc00ebaaa9327e359 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-21meta-phosphor: Improve kernel version stringLei YU1-0/+2
The kernel version string by yocto by default is <tag>-<revision>, e.g. 5.0.7-b1b37a25644213428f4bab4c427581dd923e35da Where the revision is the version specified by SRCREV, no matter if there are additional pathces applied or not. This commit improves it by * If there are no yocto patches, keep the current version but use a shorter revision, e.g. 5.0.7-b1b37a2 * If there are yocto patches, append -dirty-<new-short-revision> to the version string, e.g. 5.0.7-b1b37a2-dirty-84fa553 Resolves openbmc/openbmc#1289 Tested: Verify the kernel version string is changed as above depending on if there are yocto patches. (From meta-phosphor rev: fcfd10d7380309bc274c4f5a8355ecaeb60ce439) Change-Id: I4210227a981721a6b322d640984ea58c57802cb1 Signed-off-by: Lei YU <mine260309@gmail.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-15meta-phosphor: allow overriding default virtual/obmc-system-mgmtPatrick Venture1-1/+1
Allow another distro building from OpenBMC to specify their own default virtual/obmc-system-mgmt to allow the meta-ingrasys/meta-openpower distro-feature virtual/obmc-system-mgmt to set within a system providing a different default. (From meta-phosphor rev: 9af5e6419f1cbd9d6ea130812dccb347e4e76e53) Tested: Zaius image built with correct openpower overrides. Other platforms built with expected value. Signed-off-by: Patrick Venture <venture@google.com> Change-Id: Ieee9d0b3cab9831bfe7201635bb1d79873f79e1c Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-05-09meta-phosphor: layer.conf: change BBFILE_PATTERNBrad Bishop1-1/+1
Use the immmediate expansion operator when setting BBFILE_PATTERN. This makes meta-phosphor consistent with all the layers in meta-openembedded. (From meta-phosphor rev: 8640c4a464677f2e446a13e67686bf1be336fbef) Change-Id: I23f7fbbcc637e6c6e0a11956a703c0439f53ad4a Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-04-05meta-phosphor: layer.conf: Add warrior compatibilityBrad Bishop1-1/+1
oe-core branched in preparation for the upcoming 2.7 Yocto release and as of 13e45ff requires core layer compatibility to "warrior" instead of "thud". We'll retain compatibility for both until we do our own branch or stop testing thud. (From meta-phosphor rev: 696da8f0734b47c07e0e5179562c24393df9a26d) Change-Id: I18eb95b6ae926925c1ac48f5ba0d03b3b88e52b2 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2019-03-29meta-phosphor: Drop recipe for phosphor-restBrad Bishop1-1/+0
This application doesn't have any in-tree users. As such, drop the recipe and its dependencies. (From meta-phosphor rev: 296cc521f5a1c8c87c63a5b475b23c876241bf22) Change-Id: Ie0ce809f84a133c023f96b4727550690583cb9df Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>