From 0f66db40306e31c3adf152f47d2537109720ead5 Mon Sep 17 00:00:00 2001 From: Andrei Kartashev Date: Tue, 17 Aug 2021 21:47:15 +0300 Subject: meta-yadro: Yocto override syntax change Convert with convert-overrides.py Sync local.conf.sample with: - poky/meta-poky/conf/local.conf.sample - meta-facebook/meta-tiogapass/conf/local.conf.sample Additional manual changes (not found by convert-overrides.py) in - meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed_%.bbappend - meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend - meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend Tested: image compiles. Signed-off-by: Andrei Kartashev Change-Id: I959669bad43ce09c0817b2a002e6db546fb98f7f --- meta-yadro/conf/layer.conf | 2 +- meta-yadro/meta-nicole/conf/layer.conf | 2 +- meta-yadro/meta-nicole/conf/local.conf.sample | 97 ++++++++++++++++------ meta-yadro/meta-nicole/conf/machine/nicole.conf | 2 +- .../recipes-bsp/u-boot/u-boot-aspeed_%.bbappend | 4 +- .../recipes-core/dropbear/dropbear_%.bbappend | 2 +- .../recipes-core/systemd/systemd-conf_%.bbappend | 8 +- .../recipes-kernel/linux/linux-aspeed_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +- .../recipes-phosphor/cli/obmc-yadro-cli_%.bbappend | 2 +- .../configuration/nicole-yaml-config.bb | 4 +- .../console/obmc-console_%.bbappend | 2 +- .../flash/openpower-software-manager_%.bbappend | 2 +- .../flash/phosphor-software-manager_%.bbappend | 2 +- .../host/op-proc-control_%.bbappend | 2 +- .../recipes-phosphor/host/p9-host-start.bbappend | 2 +- .../images/obmc-phosphor-image.bbappend | 4 +- .../recipes-phosphor/interfaces/bmcweb_%.bbappend | 2 +- .../ipmi/openpower-ipmi-oem_%.bbappend | 2 +- .../ipmi/phosphor-ipmi-config.bbappend | 12 +-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 2 +- .../ipmi/phosphor-ipmi-host_%.bbappend | 2 +- .../network/phosphor-network_%.bbappend | 10 +-- .../occ/nicole-occ-control-config-native.bb | 2 +- .../packagegroups/packagegroup-obmc-apps.bbappend | 6 +- .../sensors/phosphor-hwmon_%.bbappend | 8 +- .../settings/phosphor-settings-manager_%.bbappend | 4 +- .../skeleton/obmc-libobmc-intf_%.bbappend | 2 +- .../state/phosphor-state-manager_%.bbappend | 4 +- .../recipes-phosphor/users/admin-account.bb | 6 +- .../recipes-core/os-release/os-release.bbappend | 10 +-- .../recipes-phosphor/cli/obmc-yadro-cli_git.bb | 4 +- .../cli/obmc-yadro-fwupdate_git.bb | 2 +- .../dbus/phosphor-dbus-interfaces_%.bbappend | 4 +- .../ipmi/phosphor-ipmi-config.bbappend | 2 +- .../ipmi/phosphor-ipmi-host_%.bbappend | 2 +- 36 files changed, 136 insertions(+), 93 deletions(-) (limited to 'meta-yadro') diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf index 69a297db8..8d6466ffb 100644 --- a/meta-yadro/conf/layer.conf +++ b/meta-yadro/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "yadro-layer" BBFILE_PATTERN_yadro-layer = "^${LAYERDIR}/" BBFILE_PATTERN_IGNORE_EMPTY_yadro-layer = "1" -LAYERSERIES_COMPAT_yadro-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_yadro-layer = "gatesgarth hardknott honister" diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf index 5159fc942..fc18b8c59 100644 --- a/meta-yadro/meta-nicole/conf/layer.conf +++ b/meta-yadro/meta-nicole/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "nicole-layer" BBFILE_PATTERN_nicole-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_nicole-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_nicole-layer = "gatesgarth hardknott honister" diff --git a/meta-yadro/meta-nicole/conf/local.conf.sample b/meta-yadro/meta-nicole/conf/local.conf.sample index d31ed4b27..041114d79 100644 --- a/meta-yadro/meta-nicole/conf/local.conf.sample +++ b/meta-yadro/meta-nicole/conf/local.conf.sample @@ -2,7 +2,9 @@ # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user # to the system might want to change but pretty much any configuration option can -# be set in this file. +# be set in this file. More adventurous users can look at local.conf.extended +# which contains other examples of configuration which can be placed in this file +# but new users likely won't need any of them initially. # # Lines starting with the '#' character are commented out and in some cases the # default values are provided as comments to show people example syntax. Enabling @@ -65,7 +67,7 @@ MACHINE ??= "nicole" # DISTRO ?= "openbmc-openpower" # As an example of a subclass there is a "bleeding" edge policy configuration -# where many versions are set to the absolute latest code from the upstream +# where many versions are set to the absolute latest code from the upstream # source control systems. This is just mentioned here as an example, its not # useful to most new users. # DISTRO ?= "poky-bleeding" @@ -85,15 +87,15 @@ DISTRO ?= "openbmc-openpower" PACKAGE_CLASSES ?= "package_rpm" # -# SDK/ADT target architecture +# SDK target architecture # -# This variable specifies the architecture to build SDK/ADT items for and means +# This variable specifies the architecture to build SDK items for and means # you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 +# Supported values are i686, x86_64, aarch64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " *" +SANITY_TESTED_DISTROS:append ?= " *" # # Extra image configuration defaults @@ -103,6 +105,8 @@ SANITY_TESTED_DISTROS_append ?= " *" # variable can contain the following options: # "dbg-pkgs" - add -dbg packages for all installed packages # (adds symbol information for debugging/profiling) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) # "dev-pkgs" - add -dev packages for all installed packages # (useful if you want to develop against libs in the image) # "ptest-pkgs" - add -ptest packages for all ptest-enabled packages @@ -110,14 +114,14 @@ SANITY_TESTED_DISTROS_append ?= " *" # "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) # "tools-debug" - add debugging tools (gdb, strace) # "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) +# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) # "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) # "debug-tweaks" - make an image suitable for development # e.g. ssh root access has a blank password # There are other application targets that can be used here too, see # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. # We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # # Additional image features @@ -126,20 +130,18 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics -# - 'image-prelink' in order to prelink the filesystem image -# - 'image-swab' to perform host system intrusion detection -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-prelink" +USER_CLASSES ?= "buildstats" # # Runtime testing of images # # The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" +# after any root filesystems are created and run tests against those images. It can also +# run tests against any SDK that are built. To enable this uncomment these lines. +# See classes/test{image,sdk}.bbclass for further details. +#IMAGE_CLASSES += "testimage testsdk" +#TESTIMAGE_AUTO_qemuall = "1" + # # Interactive shell configuration # @@ -164,12 +166,12 @@ PATCHRESOLVE = "noop" # # Monitor the disk space during the build. If there is less that 1GB of space or less # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort # of the build. The reason for this is that running completely out of space can corrupt # files and damages the build in ways which may not be easily recoverable. # It's necessary to monitor /tmp, if there is no space left the build will fail # with very exotic errors. -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -182,7 +184,7 @@ BB_DISKMON_DIRS = "\ # # Shared-state files from other locations # -# As mentioned above, shared state files are prebuilt cache data objects which can +# As mentioned above, shared state files are prebuilt cache data objects which can be # used to accelerate build time. This variable can be used to configure the system # to search other mirror locations for these objects before it builds the data itself. # @@ -197,19 +199,60 @@ BB_DISKMON_DIRS = "\ #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ #file://.* file:///some/local/dir/sstate/PATH" +# +# Yocto Project SState Mirror +# +# The Yocto Project has prebuilt artefacts available for its releases, you can enable +# use of these by uncommenting the following line. This will mean the build uses +# the network to check for artefacts at the start of builds, which does slow it down +# equally, it will also speed up the builds by not having to build things if they are +# present in the cache. It assumes you can download something faster than you can build it +# which will depend on your network. +# +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" # # Qemu configuration # -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. This assumes there is a -# libsdl library available on your build system. -#PACKAGECONFIG_append_pn-qemu-native = " sdl" -#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" +# By default native qemu will build with a builtin VNC server where graphical output can be +# seen. The line below enables the SDL UI frontend too. +PACKAGECONFIG:append:pn-qemu-system-native = " sdl" +# By default libsdl2-native will be built, if you want to use your host's libSDL instead of +# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. +#ASSUME_PROVIDED += "libsdl2-native" + +# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds +# a handy set of menus for controlling the emulator. +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" + +# +# Hash Equivalence +# +# Enable support for automatically running a local hash equivalence server and +# instruct bitbake to use a hash equivalence aware signature generator. Hash +# equivalence improves reuse of sstate by detecting when a given sstate +# artifact can be reused as equivalent, even if the current task hash doesn't +# match the one that generated the artifact. +# +# A shared hash equivalent server can be set with ":" format +# +#BB_HASHSERVE = "auto" +#BB_SIGNATURE_HANDLER = "OEEquivHash" +# +# Memory Resident Bitbake +# +# Bitbake's server component can stay in memory after the UI for the current command +# has completed. This means subsequent commands can run faster since there is no need +# for bitbake to reload cache files and so on. Number is in seconds, after which the +# server will shut down. +# +#BB_SERVER_TIMEOUT = "60" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. -CONF_VERSION = "1" +CONF_VERSION = "2" + +# Set the root password to '0penBmc' +# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc diff --git a/meta-yadro/meta-nicole/conf/machine/nicole.conf b/meta-yadro/meta-nicole/conf/machine/nicole.conf index d815ef330..495e3bd24 100644 --- a/meta-yadro/meta-nicole/conf/machine/nicole.conf +++ b/meta-yadro/meta-nicole/conf/machine/nicole.conf @@ -8,7 +8,7 @@ require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc require conf/machine/include/p9.inc -IMAGE_FEATURES_remove = " obmc-fan-control obmc-fan-mgmt" +IMAGE_FEATURES:remove = " obmc-fan-control obmc-fan-mgmt" PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "nicole-openpower-fru-vpd-layout-native" PREFERRED_PROVIDER_virtual/openpower-fru-inventory = "nicole-openpower-fru-inventory-native" diff --git a/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend index 1390922e1..58e6d0c79 100644 --- a/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_append := "${THISDIR}/files:" +FILESEXTRAPATHS:append := "${THISDIR}/files:" -SRC_URI_append = " \ +SRC_URI:append = " \ file://0001-Add-system-reset-status-support.patch \ file://0002-config-ast-common-set-fieldmode-to-true.patch \ file://0003-aspeed-add-gpio-support.patch \ diff --git a/meta-yadro/meta-nicole/recipes-core/dropbear/dropbear_%.bbappend b/meta-yadro/meta-nicole/recipes-core/dropbear/dropbear_%.bbappend index 72d991c7e..4fc41d058 100644 --- a/meta-yadro/meta-nicole/recipes-core/dropbear/dropbear_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-core/dropbear/dropbear_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf_%.bbappend b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf_%.bbappend index 48d4a4a4c..03f7db659 100644 --- a/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-core/systemd/systemd-conf_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append = " \ +SRC_URI:append = " \ file://00-bmc-eth0.4004.0.network \ file://00-bmc-eth0.4004.1.network \ file://00-bmc-eth0.0.network \ @@ -8,7 +8,7 @@ SRC_URI_append = " \ file://eth0.4004.netdev \ " -do_install_append() { +do_install:append() { install -m 0644 \ ${WORKDIR}/00-bmc-eth0.4004.0.network \ ${WORKDIR}/00-bmc-eth0.4004.1.network \ @@ -18,7 +18,7 @@ do_install_append() { -D -t ${D}${sysconfdir}/systemd/network } -FILES_${PN}_append = " \ +FILES:${PN}:append = " \ ${sysconfdir}/systemd/network/00-bmc-eth0.4004.0.network \ ${sysconfdir}/systemd/network/00-bmc-eth0.4004.1.network \ ${sysconfdir}/systemd/network/00-bmc-eth0.0.network \ diff --git a/meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed_%.bbappend index c34909d04..853f164d1 100644 --- a/meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend_nicole := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:nicole := "${THISDIR}/${PN}:" SRC_URI += "file://nicole.cfg \ file://0001-Add-NCSI-channel-selector.patch \ " diff --git a/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb b/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb index 1865e61e8..3e376e12b 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "i2c-tools" +RDEPENDS:${PN} += "i2c-tools" S = "${WORKDIR}" SRC_URI += "file://avsbus-control.sh" @@ -21,5 +21,5 @@ INSTFMT= "avsbus-control@{0}.service" TGTFMT = "obmc-chassis-poweron@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${TMPL}" +SYSTEMD_SERVICE:${PN} += "${TMPL}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend index 6708a6a9f..6617917ba 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend @@ -1,4 +1,4 @@ -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ obmc-yadro-backup \ obmc-yadro-lsinventory \ op-proc-control \ diff --git a/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb b/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb index 26cad61da..05feba369 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb @@ -25,11 +25,11 @@ do_install() { ${D}${datadir}/${BPN}/ipmi-sensors.yaml } -FILES_${PN}-dev = " \ +FILES:${PN}-dev = " \ ${datadir}/${BPN}/ipmi-extra-properties.yaml \ ${datadir}/${BPN}/ipmi-fru-read.yaml \ ${datadir}/${BPN}/ipmi-inventory-sensors.yaml \ ${datadir}/${BPN}/ipmi-sensors.yaml \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/console/obmc-console_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/console/obmc-console_%.bbappend index 72d991c7e..4fc41d058 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/console/obmc-console_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/flash/openpower-software-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/flash/openpower-software-manager_%.bbappend index a2df9cf70..356925a55 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/flash/openpower-software-manager_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/flash/openpower-software-manager_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " verify_pnor_signature" +PACKAGECONFIG:append = " verify_pnor_signature" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index c92b1a89c..0d9c1a269 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " verify_signature" +PACKAGECONFIG:append = " verify_signature" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/host/op-proc-control_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/host/op-proc-control_%.bbappend index ed1cec767..e0ecbab0d 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/host/op-proc-control_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/host/op-proc-control_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-Stop-and-send-SRESET-for-one-thread-only.patch" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/host/p9-host-start.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/host/p9-host-start.bbappend index d26a4d696..32077037e 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/host/p9-host-start.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}_append = " avsbus-control" +RDEPENDS:${PN}:append = " avsbus-control" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend index 75dc1399a..a18048d7f 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,8 +1,8 @@ -OBMC_IMAGE_EXTRA_INSTALL_append = " \ +OBMC_IMAGE_EXTRA_INSTALL:append = " \ admin-account \ first-boot-set-hostname \ mboxd \ obmc-yadro-cli \ openpower-fru-vpd \ " -IMAGE_FEATURES_remove_nicole = "obmc-user-mgmt-ldap" +IMAGE_FEATURES:remove:nicole = "obmc-user-mgmt-ldap" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/interfaces/bmcweb_%.bbappend index 0f663ddc0..d08408063 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,3 +1,3 @@ -EXTRA_OECMAKE_append = " \ +EXTRA_OECMAKE:append = " \ -DBMCWEB_ENABLE_MUTUAL_TLS_AUTHENTICATION=OFF \ " diff --git a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend index 775119b54..91ef9ac79 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend @@ -1,4 +1,4 @@ -DEPENDS_append = " nicole-yaml-config" +DEPENDS:append = " nicole-yaml-config" EXTRA_OECONF = " \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-inventory-sensors.yaml \ diff --git a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 466f42f0b..d2ea14c79 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1,21 +1,21 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" inherit systemd -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils}" -SYSTEMD_SERVICE_${PN} = "${BPN}.service" -SRC_URI_append = " \ +RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils}" +SYSTEMD_SERVICE:${PN} = "${BPN}.service" +SRC_URI:append = " \ file://${BPN}-set-device-id.sh \ file://${BPN}.service \ " S = "${WORKDIR}" -do_install_append() { +do_install:append() { install -d ${D}${bindir} ${D}${systemd_system_unitdir} install ${BPN}-set-device-id.sh ${D}${bindir}/ install -m 0644 ${BPN}.service ${D}${systemd_system_unitdir}/ } -FILES_${PN}_append = " \ +FILES:${PN}:append = " \ ${bindir}/${BPN}-set-device-id.sh \ " diff --git a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 16d815ade..18f32c0cc 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,4 +1,4 @@ -DEPENDS_append = " nicole-yaml-config" +DEPENDS:append = " nicole-yaml-config" EXTRA_OECONF = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-fru-read.yaml \ diff --git a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 7983e94bb..aa0ae9942 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,4 +1,4 @@ -DEPENDS_append = " nicole-yaml-config" +DEPENDS:append = " nicole-yaml-config" EXTRA_OECONF = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-sensors.yaml \ diff --git a/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend index 5be003a75..ae025bbc6 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -PACKAGECONFIG_append = " sync-mac" -SRC_URI_append = " file://config.json " -FILES_${PN} += "${datadir}/network/*.json" +PACKAGECONFIG:append = " sync-mac" +SRC_URI:append = " file://config.json " +FILES:${PN} += "${datadir}/network/*.json" -do_install_append() { +do_install:append() { install -d ${D}${datadir}/network/ install -m 0644 ${WORKDIR}/config.json ${D}${datadir}/network/ } diff --git a/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb b/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb index 31cd0450e..f5f78cdaa 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb @@ -8,7 +8,7 @@ inherit native PROVIDES += "virtual/openpower-occ-control-config-native" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://occ_sensor.yaml" S = "${WORKDIR}" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 61bf12e06..455eb1e42 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,7 +1,7 @@ -RDEPENDS_${PN}-inventory_append = " openpower-occ-control" -RDEPENDS_${PN}-extras_append = " \ +RDEPENDS:${PN}-inventory:append = " openpower-occ-control" +RDEPENDS:${PN}-extras:append = " \ phosphor-hostlogger \ " -RDEPENDS_${PN}-software_append = " \ +RDEPENDS:${PN}-software:append = " \ obmc-yadro-fwupdate \ " diff --git a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index e06afb48a..8988ff1af 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append = " -Dnegative-errno-on-fail=true" +EXTRA_OEMESON:append = " -Dnegative-errno-on-fail=true" ITEMS = "iio-hwmon-battery.conf" @@ -13,5 +13,5 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 848bf4e5b..8190ab430 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend_nicole := "${THISDIR}/${PN}:" -SRC_URI_append_nicole = " \ +FILESEXTRAPATHS:prepend:nicole := "${THISDIR}/${PN}:" +SRC_URI:append:nicole = " \ file://bootmailbox.override.yml \ file://time-sync-method.override.yml \ " diff --git a/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 72d991c7e..4fc41d058 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend index dcf8cac00..cdd6bf0e7 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" DEPS_CFG = "resetreason.conf" DEPS_TGT = "phosphor-discover-system-state@.service" -SYSTEMD_OVERRIDE_${PN}-discover_append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" +SYSTEMD_OVERRIDE_${PN}-discover:append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb b/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb index c6be7e067..dbdabb8c9 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb @@ -23,14 +23,14 @@ GROUP_IPMI = "ipmi" ADMIN_LOGIN = "admin" ADMIN_PASSW = "\$1\$Fze0kFe8\$sylEANC01t.osF8OewyB/1" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--groups ${GROUP_ADMIN},${GROUP_IPMI} \ +USERADD_PARAM:${PN} = "--groups ${GROUP_ADMIN},${GROUP_IPMI} \ --password '${ADMIN_PASSW}' \ ${ADMIN_LOGIN}" # We don't have package body -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" # Workaround for meta-phosphor/classes/phosphor-rootfs-postcommands.bbclass. # The bb-script cannot add root to non-empty groups (invalid sed command). -GROUPMEMS_PARAM_${PN} = "-a root -g ${GROUP_ADMIN}; \ +GROUPMEMS_PARAM:${PN} = "-a root -g ${GROUP_ADMIN}; \ -a root -g ${GROUP_IPMI}" diff --git a/meta-yadro/recipes-core/os-release/os-release.bbappend b/meta-yadro/recipes-core/os-release/os-release.bbappend index de4f879e4..7cd842a18 100644 --- a/meta-yadro/recipes-core/os-release/os-release.bbappend +++ b/meta-yadro/recipes-core/os-release/os-release.bbappend @@ -13,7 +13,7 @@ # as well as any non-release branches produce 'Unofficial' builds. # So do the release branches with -rc or -dev suffix in the latest tag. -python do_compile_prepend() { +python do_compile:prepend() { print ("Preparing YADRO-specific version information") version_id = d.getVar('VERSION_ID') @@ -115,16 +115,16 @@ python do_compile_prepend() { print ('%s PATCH_LEVEL = %s' % (u_product, patch_level)) } -python do_compile_append () { +python do_compile:append () { with open(d.expand('${B}/issue'), 'w') as f: f.write('%s %s @ \\l\n' % (name % u_product, release)) } -do_install_append () { +do_install:append () { install -m 0644 issue ${D}${sysconfdir}/issue install -m 0644 issue ${D}${sysconfdir}/issue.net } -CONFFILES_${PN} += " ${sysconfdir}/issue ${sysconfdir}/issue.net" -OS_RELEASE_FIELDS_append = " RELEASE PATCH_LEVEL" +CONFFILES:${PN} += " ${sysconfdir}/issue ${sysconfdir}/issue.net" +OS_RELEASE_FIELDS:append = " RELEASE PATCH_LEVEL" BB_DONT_CACHE = "1" diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb index 5cdf3164d..2564ce38e 100644 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb +++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" # Dependencies DEPENDS = "phosphor-user-manager" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ ${VIRTUAL-RUNTIME_base-utils} \ bash \ obmc-yadro-fwupdate \ @@ -26,7 +26,7 @@ RDEPENDS_${PN} = " \ # They should be appended by bbappend file in their layers # Directory with command handlers -FILES_${PN} += "${datadir}/cli" +FILES:${PN} += "${datadir}/cli" MACHINE_NAME ?= "${MACHINE}" # Custom installation procedure diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb index dd7f39716..95eef8fc0 100644 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb +++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb @@ -19,7 +19,7 @@ PACKAGECONFIG[reboot-guard-support] = "-Dreboot-guard-support=true,-Dreboot-guar PACKAGECONFIG[openpower-support] = "-Dopenpower-support=true,-Dopenpower-support=false" PACKAGECONFIG ??= " obmc-phosphor-image reboot-guard-support " -PACKAGECONFIG_append_df-openpower = "openpower-support" +PACKAGECONFIG:append_df-openpower = "openpower-support" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-fwupdate" SRCREV = "0e3c0714f344a2f7f289c851434955360e6f075b" diff --git a/meta-yadro/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-yadro/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend index 8a5b4c363..c2d267912 100644 --- a/meta-yadro/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend +++ b/meta-yadro/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append = "\ +SRC_URI:append = "\ file://0001-Add-boot-initiator-mailbox-interface.patch \ " diff --git a/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 72d991c7e..4fc41d058 100644 --- a/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index b4b1a2f1e..faa3f579e 100644 --- a/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://0001-Add-support-for-persistent-only-settings.patch \ -- cgit v1.2.3