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 From 7d637776938c77d69752a72a09edc90ebde93164 Mon Sep 17 00:00:00 2001 From: Andrei Kartashev Date: Tue, 17 Aug 2021 22:04:52 +0300 Subject: meta-yadro: move Yadro CLI recipes to own directory Yadro have set of CLI utilities for user interaction. This recipes actually not a part of phosphor so should be moved to own category. Signed-off-by: Andrei Kartashev Change-Id: I0abbbf147d069b630af76ba93d792689b87261e8 --- .../recipes-phosphor/cli/obmc-yadro-backup_git.bb | 16 -------- .../recipes-phosphor/cli/obmc-yadro-cli_git.bb | 45 ---------------------- .../cli/obmc-yadro-fwupdate_git.bb | 26 ------------- .../cli/obmc-yadro-lsinventory_git.bb | 22 ----------- .../cli/obmc-yadro-lssensors_git.bb | 16 -------- .../cli/obmc-yadro-netconfig_git.bb | 19 --------- .../recipes-yadro/cli/obmc-yadro-backup_git.bb | 16 ++++++++ meta-yadro/recipes-yadro/cli/obmc-yadro-cli_git.bb | 45 ++++++++++++++++++++++ .../recipes-yadro/cli/obmc-yadro-fwupdate_git.bb | 26 +++++++++++++ .../cli/obmc-yadro-lsinventory_git.bb | 22 +++++++++++ .../recipes-yadro/cli/obmc-yadro-lssensors_git.bb | 16 ++++++++ .../recipes-yadro/cli/obmc-yadro-netconfig_git.bb | 19 +++++++++ 12 files changed, 144 insertions(+), 144 deletions(-) delete mode 100644 meta-yadro/recipes-phosphor/cli/obmc-yadro-backup_git.bb delete mode 100644 meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb delete mode 100644 meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb delete mode 100644 meta-yadro/recipes-phosphor/cli/obmc-yadro-lsinventory_git.bb delete mode 100644 meta-yadro/recipes-phosphor/cli/obmc-yadro-lssensors_git.bb delete mode 100644 meta-yadro/recipes-phosphor/cli/obmc-yadro-netconfig_git.bb create mode 100644 meta-yadro/recipes-yadro/cli/obmc-yadro-backup_git.bb create mode 100644 meta-yadro/recipes-yadro/cli/obmc-yadro-cli_git.bb create mode 100644 meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb create mode 100644 meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb create mode 100644 meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb create mode 100644 meta-yadro/recipes-yadro/cli/obmc-yadro-netconfig_git.bb (limited to 'meta-yadro') diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-backup_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-backup_git.bb deleted file mode 100644 index ae167e3bf..000000000 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-backup_git.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Command line tool for backup configuration" -DESCRIPTION = "YADRO OpenBMC command line tool for backup and restore configuration" -HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-backup" -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit meson - -# License info -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -# Source code repository -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-backup.git" -SRCREV = "1cb990bb16708ad488980d907387bd3e4d37eb3a" diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb deleted file mode 100644 index 2564ce38e..000000000 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Command-line interface" -DESCRIPTION = "YADRO OpenBMC Command Line Interface for end users" -HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-cli" -PR = "r1" -PV = "1.0+git${SRCPV}" - -# License info -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -# Dependencies -DEPENDS = "phosphor-user-manager" -RDEPENDS:${PN} = " \ - ${VIRTUAL-RUNTIME_base-utils} \ - bash \ - obmc-yadro-fwupdate \ - obmc-yadro-lssensors \ - obmc-yadro-netconfig \ - phosphor-debug-collector-dreport \ - phosphor-debug-collector-scripts \ - sudo \ - systemd \ -" -# Some platforms also require some additional packages like -# ipmitool, obmc-yadro-lsinventory, obmc-yadro-backup ... -# They should be appended by bbappend file in their layers - -# Directory with command handlers -FILES:${PN} += "${datadir}/cli" - -MACHINE_NAME ?= "${MACHINE}" -# Custom installation procedure -do_install() { - ${B}/install.sh \ - --dir ${D} \ - --machine ${@'${MACHINE_NAME}'.split('-')[0]} \ - --admin priv-admin \ - --operator priv-operator \ - --user priv-user -} - -# Source code repository -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-cli" -SRCREV = "76743c3706516bae6b2bb8749706b4ea673e9358" diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb deleted file mode 100644 index 95eef8fc0..000000000 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "YADRO Firmware update tool" -DESCRIPTION = "Command line tool for update firmware" -HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-fwupdate" -PR = "r1" -PV = "1.0+git${SRCPV}" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit meson - -DEPENDS += " \ - sdbusplus \ - openssl \ -" - -PACKAGECONFIG[obmc-phosphor-image] = "-Dbmc-image-type=obmc-phosphor-image,,,,,intel-platforms" -PACKAGECONFIG[intel-platforms] = "-Dbmc-image-type=intel-platforms,,,,,obmc-phosphor-image" -PACKAGECONFIG[reboot-guard-support] = "-Dreboot-guard-support=true,-Dreboot-guard-support=false" -PACKAGECONFIG[openpower-support] = "-Dopenpower-support=true,-Dopenpower-support=false" - -PACKAGECONFIG ??= " obmc-phosphor-image reboot-guard-support " -PACKAGECONFIG:append_df-openpower = "openpower-support" - -SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-fwupdate" -SRCREV = "0e3c0714f344a2f7f289c851434955360e6f075b" -S = "${WORKDIR}/git" diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-lsinventory_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-lsinventory_git.bb deleted file mode 100644 index 89ceb1ee1..000000000 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-lsinventory_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Command line tool for printing inventory" -DESCRIPTION = "YADRO OpenBMC command line tool for printing inventory list" -HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-lsinventory" -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit meson - -# License info -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -# Dependencies -DEPENDS += " \ - json-c \ - sdbusplus \ - " - -# Source code repository -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-lsinventory.git" -SRCREV = "d0bdf0ddd192b9d41c5c5d4af9385122b08c7608" diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-lssensors_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-lssensors_git.bb deleted file mode 100644 index 5a08c7a3e..000000000 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-lssensors_git.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "OpenBMC YADRO list sensors tool" -DESCRIPTION = "The command line tool to show detailed information about \ - all available sensors" -HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-lssensors" -PR = "r1" -PV = "1.0+git${SRCPV}" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit meson - -DEPENDS += "sdbusplus" - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-lssensors.git" -SRCREV = "39c37655bb777f1876cdddc4b624b38d75105b8e" diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-netconfig_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-netconfig_git.bb deleted file mode 100644 index 7ec34edfa..000000000 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-netconfig_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Command line tool for configuring network" -DESCRIPTION = "YADRO OpenBMC command line tool for configuring network" -HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-netconfig" -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit meson - -# License info -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -# Dependencies -DEPENDS = "sdbusplus" - -# Source code repository -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-netconfig.git" -SRCREV = "1d991868023b80a9361a7a46c6e6b8058b482f01" diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-backup_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-backup_git.bb new file mode 100644 index 000000000..ae167e3bf --- /dev/null +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-backup_git.bb @@ -0,0 +1,16 @@ +SUMMARY = "Command line tool for backup configuration" +DESCRIPTION = "YADRO OpenBMC command line tool for backup and restore configuration" +HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-backup" +PR = "r1" +PV = "1.0+git${SRCPV}" + +inherit meson + +# License info +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +# Source code repository +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-backup.git" +SRCREV = "1cb990bb16708ad488980d907387bd3e4d37eb3a" diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-cli_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-cli_git.bb new file mode 100644 index 000000000..2564ce38e --- /dev/null +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-cli_git.bb @@ -0,0 +1,45 @@ +SUMMARY = "Command-line interface" +DESCRIPTION = "YADRO OpenBMC Command Line Interface for end users" +HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-cli" +PR = "r1" +PV = "1.0+git${SRCPV}" + +# License info +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +# Dependencies +DEPENDS = "phosphor-user-manager" +RDEPENDS:${PN} = " \ + ${VIRTUAL-RUNTIME_base-utils} \ + bash \ + obmc-yadro-fwupdate \ + obmc-yadro-lssensors \ + obmc-yadro-netconfig \ + phosphor-debug-collector-dreport \ + phosphor-debug-collector-scripts \ + sudo \ + systemd \ +" +# Some platforms also require some additional packages like +# ipmitool, obmc-yadro-lsinventory, obmc-yadro-backup ... +# They should be appended by bbappend file in their layers + +# Directory with command handlers +FILES:${PN} += "${datadir}/cli" + +MACHINE_NAME ?= "${MACHINE}" +# Custom installation procedure +do_install() { + ${B}/install.sh \ + --dir ${D} \ + --machine ${@'${MACHINE_NAME}'.split('-')[0]} \ + --admin priv-admin \ + --operator priv-operator \ + --user priv-user +} + +# Source code repository +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-cli" +SRCREV = "76743c3706516bae6b2bb8749706b4ea673e9358" diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb new file mode 100644 index 000000000..95eef8fc0 --- /dev/null +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-fwupdate_git.bb @@ -0,0 +1,26 @@ +SUMMARY = "YADRO Firmware update tool" +DESCRIPTION = "Command line tool for update firmware" +HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-fwupdate" +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +inherit meson + +DEPENDS += " \ + sdbusplus \ + openssl \ +" + +PACKAGECONFIG[obmc-phosphor-image] = "-Dbmc-image-type=obmc-phosphor-image,,,,,intel-platforms" +PACKAGECONFIG[intel-platforms] = "-Dbmc-image-type=intel-platforms,,,,,obmc-phosphor-image" +PACKAGECONFIG[reboot-guard-support] = "-Dreboot-guard-support=true,-Dreboot-guard-support=false" +PACKAGECONFIG[openpower-support] = "-Dopenpower-support=true,-Dopenpower-support=false" + +PACKAGECONFIG ??= " obmc-phosphor-image reboot-guard-support " +PACKAGECONFIG:append_df-openpower = "openpower-support" + +SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-fwupdate" +SRCREV = "0e3c0714f344a2f7f289c851434955360e6f075b" +S = "${WORKDIR}/git" diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb new file mode 100644 index 000000000..89ceb1ee1 --- /dev/null +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-lsinventory_git.bb @@ -0,0 +1,22 @@ +SUMMARY = "Command line tool for printing inventory" +DESCRIPTION = "YADRO OpenBMC command line tool for printing inventory list" +HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-lsinventory" +PR = "r1" +PV = "1.0+git${SRCPV}" + +inherit meson + +# License info +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +# Dependencies +DEPENDS += " \ + json-c \ + sdbusplus \ + " + +# Source code repository +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-lsinventory.git" +SRCREV = "d0bdf0ddd192b9d41c5c5d4af9385122b08c7608" diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb new file mode 100644 index 000000000..5a08c7a3e --- /dev/null +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-lssensors_git.bb @@ -0,0 +1,16 @@ +SUMMARY = "OpenBMC YADRO list sensors tool" +DESCRIPTION = "The command line tool to show detailed information about \ + all available sensors" +HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-lssensors" +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +inherit meson + +DEPENDS += "sdbusplus" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-lssensors.git" +SRCREV = "39c37655bb777f1876cdddc4b624b38d75105b8e" diff --git a/meta-yadro/recipes-yadro/cli/obmc-yadro-netconfig_git.bb b/meta-yadro/recipes-yadro/cli/obmc-yadro-netconfig_git.bb new file mode 100644 index 000000000..7ec34edfa --- /dev/null +++ b/meta-yadro/recipes-yadro/cli/obmc-yadro-netconfig_git.bb @@ -0,0 +1,19 @@ +SUMMARY = "Command line tool for configuring network" +DESCRIPTION = "YADRO OpenBMC command line tool for configuring network" +HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-netconfig" +PR = "r1" +PV = "1.0+git${SRCPV}" + +inherit meson + +# License info +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +# Dependencies +DEPENDS = "sdbusplus" + +# Source code repository +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-netconfig.git" +SRCREV = "1d991868023b80a9361a7a46c6e6b8058b482f01" -- cgit v1.2.3 From ce1426257525128c9c8f17e91afc6a60d1cb6244 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Mon, 23 Aug 2021 16:26:20 -0500 Subject: treewide: remove gategarth from layer-support We've typically kept these LAYERSERIES_COMPAT to 2 releases: the current and the upcoming. Remove 'gatesgarth' is it is now 2 releases back. Signed-off-by: Patrick Williams Change-Id: I5e812a94fed1738898af75c0fdee81996a5bbf20 --- meta-alibaba/conf/layer.conf | 2 +- meta-alibaba/meta-thor/conf/layer.conf | 2 +- meta-amd/conf/layer.conf | 2 +- meta-amd/meta-ethanolx/conf/layer.conf | 2 +- meta-ampere/conf/layer.conf | 2 +- meta-ampere/meta-jade/conf/layer.conf | 2 +- meta-arm/conf/layer.conf | 2 +- meta-aspeed/conf/layer.conf | 2 +- meta-asrock/conf/layer.conf | 2 +- meta-asrock/meta-e3c246d4i/conf/layer.conf | 2 +- meta-bytedance/conf/layer.conf | 2 +- meta-bytedance/meta-g220a/conf/layer.conf | 2 +- meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf | 2 +- meta-evb/meta-evb-enclustra/conf/layer.conf | 2 +- meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf | 2 +- meta-evb/meta-evb-nuvoton/conf/layer.conf | 2 +- meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf | 2 +- meta-facebook/conf/layer.conf | 2 +- meta-facebook/meta-bletchley/conf/layer.conf | 2 +- meta-facebook/meta-tiogapass/conf/layer.conf | 2 +- meta-facebook/meta-yosemitev2/conf/layer.conf | 2 +- meta-google/conf/layer.conf | 2 +- meta-hpe/conf/layer.conf | 2 +- meta-hpe/meta-dl360poc/conf/layer.conf | 2 +- meta-hpe/meta-gxp/conf/layer.conf | 2 +- meta-hxt/conf/layer.conf | 2 +- meta-ibm/conf/layer.conf | 2 +- meta-ibm/meta-palmetto/conf/layer.conf | 2 +- meta-ibm/meta-romulus/conf/layer.conf | 2 +- meta-ingrasys/conf/layer.conf | 2 +- meta-ingrasys/meta-zaius/conf/layer.conf | 2 +- meta-inspur/conf/layer.conf | 2 +- meta-inspur/meta-fp5280g2/conf/layer.conf | 2 +- meta-inspur/meta-on5263m5/conf/layer.conf | 2 +- meta-intel-openbmc/conf/layer.conf | 2 +- meta-intel-openbmc/meta-s2600wf/conf/layer.conf | 2 +- meta-inventec/conf/layer.conf | 2 +- meta-lenovo/conf/layer.conf | 2 +- meta-lenovo/meta-hr630/conf/layer.conf | 2 +- meta-lenovo/meta-hr855xg2/conf/layer.conf | 2 +- meta-microsoft/conf/layer.conf | 2 +- meta-microsoft/meta-olympus/conf/layer.conf | 2 +- meta-nuvoton/conf/layer.conf | 2 +- meta-openpower/conf/layer.conf | 2 +- meta-phosphor/conf/layer.conf | 2 +- meta-portwell/meta-neptune/conf/layer.conf | 2 +- meta-qualcomm/conf/layer.conf | 2 +- meta-quanta/conf/layer.conf | 2 +- meta-quanta/meta-f0b/conf/layer.conf | 2 +- meta-quanta/meta-gbs/conf/layer.conf | 2 +- meta-quanta/meta-gsj/conf/layer.conf | 2 +- meta-quanta/meta-olympus-nuvoton/conf/layer.conf | 2 +- meta-quanta/meta-q71l/conf/layer.conf | 2 +- meta-supermicro/conf/layer.conf | 2 +- meta-supermicro/meta-x11spi/conf/layer.conf | 2 +- meta-x86/conf/layer.conf | 2 +- meta-yadro/conf/layer.conf | 2 +- meta-yadro/meta-nicole/conf/layer.conf | 2 +- 58 files changed, 58 insertions(+), 58 deletions(-) (limited to 'meta-yadro') diff --git a/meta-alibaba/conf/layer.conf b/meta-alibaba/conf/layer.conf index 435d1ddec..715ba5142 100644 --- a/meta-alibaba/conf/layer.conf +++ b/meta-alibaba/conf/layer.conf @@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "alibaba-layer" BBFILE_PATTERN_alibaba-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_alibaba-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_alibaba-layer = "hardknott" diff --git a/meta-alibaba/meta-thor/conf/layer.conf b/meta-alibaba/meta-thor/conf/layer.conf index 89eca706a..6ae627170 100644 --- a/meta-alibaba/meta-thor/conf/layer.conf +++ b/meta-alibaba/meta-thor/conf/layer.conf @@ -6,4 +6,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "" BBFILE_PATTERN := "^${LAYERDIR}/" -LAYERSERIES_COMPAT = "gatesgarth hardknott" +LAYERSERIES_COMPAT = "hardknott" diff --git a/meta-amd/conf/layer.conf b/meta-amd/conf/layer.conf index 8caa32493..7fc59b9ac 100644 --- a/meta-amd/conf/layer.conf +++ b/meta-amd/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "amd-layer" BBFILE_PATTERN_amd-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_amd-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_amd-layer = "hardknott" diff --git a/meta-amd/meta-ethanolx/conf/layer.conf b/meta-amd/meta-ethanolx/conf/layer.conf index 818ab7df1..0564fe424 100644 --- a/meta-amd/meta-ethanolx/conf/layer.conf +++ b/meta-amd/meta-ethanolx/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "ethanolx-layer" BBFILE_PATTERN_ethanolx-layer = "^${LAYERDIR}/" BBFILE_PRIORITY_ethanolx-layer = "6" -LAYERSERIES_COMPAT_ethanolx-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_ethanolx-layer = "hardknott" diff --git a/meta-ampere/conf/layer.conf b/meta-ampere/conf/layer.conf index e1d7fe118..321e2b24f 100644 --- a/meta-ampere/conf/layer.conf +++ b/meta-ampere/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "ampere-layer" BBFILE_PATTERN_ampere-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ampere-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_ampere-layer = "hardknott honister" diff --git a/meta-ampere/meta-jade/conf/layer.conf b/meta-ampere/meta-jade/conf/layer.conf index 7b5a07f3d..f979db1c7 100644 --- a/meta-ampere/meta-jade/conf/layer.conf +++ b/meta-ampere/meta-jade/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "jade-layer" BBFILE_PATTERN_jade-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_jade-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_jade-layer = "hardknott honister" diff --git a/meta-arm/conf/layer.conf b/meta-arm/conf/layer.conf index d111b24b8..102a0ccd9 100644 --- a/meta-arm/conf/layer.conf +++ b/meta-arm/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "arm" BBFILE_PATTERN_arm = "^${LAYERDIR}/" LAYERVERSION_arm = "1" -LAYERSERIES_COMPAT_arm = "gatesgarth hardknott" +LAYERSERIES_COMPAT_arm = "hardknott" diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf index 21b96413b..9dd3b72aa 100644 --- a/meta-aspeed/conf/layer.conf +++ b/meta-aspeed/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "aspeed-layer" BBFILE_PATTERN_aspeed-layer := "^${LAYERDIR}/" LAYERVERSION_aspeed-layer = "1" -LAYERSERIES_COMPAT_aspeed-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_aspeed-layer = "hardknott honister" diff --git a/meta-asrock/conf/layer.conf b/meta-asrock/conf/layer.conf index 37e452cec..4c06d8774 100644 --- a/meta-asrock/conf/layer.conf +++ b/meta-asrock/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "asrock-layer" BBFILE_PATTERN_asrock-layer = "^${LAYERDIR}/" LAYERVERSION_asrock-layer = "1" -LAYERSERIES_COMPAT_asrock-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_asrock-layer = "hardknott" diff --git a/meta-asrock/meta-e3c246d4i/conf/layer.conf b/meta-asrock/meta-e3c246d4i/conf/layer.conf index aff53c469..6b8e77192 100644 --- a/meta-asrock/meta-e3c246d4i/conf/layer.conf +++ b/meta-asrock/meta-e3c246d4i/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "e3c246d4i-layer" BBFILE_PATTERN_e3c246d4i-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_e3c246d4i-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_e3c246d4i-layer = "hardknott" diff --git a/meta-bytedance/conf/layer.conf b/meta-bytedance/conf/layer.conf index 241bc6d45..9ece82f09 100644 --- a/meta-bytedance/conf/layer.conf +++ b/meta-bytedance/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "bytedance-layer" BBFILE_PATTERN_bytedance-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_bytedance-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_bytedance-layer = "hardknott honister" diff --git a/meta-bytedance/meta-g220a/conf/layer.conf b/meta-bytedance/meta-g220a/conf/layer.conf index 4e4f0092a..e5a5f96dc 100644 --- a/meta-bytedance/meta-g220a/conf/layer.conf +++ b/meta-bytedance/meta-g220a/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "g220a-layer" BBFILE_PATTERN_g220a-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_g220a-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_g220a-layer = "hardknott honister" diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf index b3ef55cba..277e712aa 100644 --- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf +++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "meta-evb-ast2600" BBFILE_PATTERN_meta-evb-ast2600 = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_meta-evb-ast2600 = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_meta-evb-ast2600 = "hardknott honister" diff --git a/meta-evb/meta-evb-enclustra/conf/layer.conf b/meta-evb/meta-evb-enclustra/conf/layer.conf index e83298fae..278b6b5f1 100644 --- a/meta-evb/meta-evb-enclustra/conf/layer.conf +++ b/meta-evb/meta-evb-enclustra/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "evb-enclustra" BBFILE_PATTERN_evb-enclustra = "" -LAYERSERIES_COMPAT_evb-enclustra = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_evb-enclustra = "hardknott honister" diff --git a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf index ea08f5a56..d9944132d 100644 --- a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf +++ b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "evb-zx3-pm3" BBFILE_PATTERN_evb-zx3-pm3 = "" -LAYERSERIES_COMPAT_evb-zx3-pm3 = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_evb-zx3-pm3 = "hardknott honister" diff --git a/meta-evb/meta-evb-nuvoton/conf/layer.conf b/meta-evb/meta-evb-nuvoton/conf/layer.conf index fe07f91ea..5c4dfedf7 100644 --- a/meta-evb/meta-evb-nuvoton/conf/layer.conf +++ b/meta-evb/meta-evb-nuvoton/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "evb-nuvoton" BBFILE_PATTERN_evb-nuvoton = "" -LAYERSERIES_COMPAT_evb-nuvoton = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_evb-nuvoton = "hardknott honister" diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf index 8d64d158e..543f6a6e9 100644 --- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf +++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "evb-npcm750" BBFILE_PATTERN_evb-npcm750 = "" -LAYERSERIES_COMPAT_evb-npcm750 = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_evb-npcm750 = "hardknott honister" diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf index 895d48fc1..9e4cf5521 100644 --- a/meta-facebook/conf/layer.conf +++ b/meta-facebook/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "facebook-layer" BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_facebook-layer := "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_facebook-layer := "hardknott honister" diff --git a/meta-facebook/meta-bletchley/conf/layer.conf b/meta-facebook/meta-bletchley/conf/layer.conf index 8e2770903..14d320079 100644 --- a/meta-facebook/meta-bletchley/conf/layer.conf +++ b/meta-facebook/meta-bletchley/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "bletchley-layer" BBFILE_PATTERN_bletchley-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_bletchley-layer := "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_bletchley-layer := "hardknott honister" diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf index bb8ecee76..af34387cf 100644 --- a/meta-facebook/meta-tiogapass/conf/layer.conf +++ b/meta-facebook/meta-tiogapass/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "tiogapass-layer" BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_tiogapass-layer := "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_tiogapass-layer := "hardknott honister" diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf index 091cdc369..654ffabba 100644 --- a/meta-facebook/meta-yosemitev2/conf/layer.conf +++ b/meta-facebook/meta-yosemitev2/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "yosemitev2-layer" BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_yosemitev2-layer := "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_yosemitev2-layer := "hardknott honister" diff --git a/meta-google/conf/layer.conf b/meta-google/conf/layer.conf index 346946b99..47379e427 100644 --- a/meta-google/conf/layer.conf +++ b/meta-google/conf/layer.conf @@ -14,4 +14,4 @@ BBFILES_DYNAMIC += " \ BBFILE_COLLECTIONS += "google-layer" BBFILE_PATTERN_google-layer := "^${LAYERDIR}/" LAYERVERSION_google-layer = "1" -LAYERSERIES_COMPAT_google-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_google-layer = "hardknott honister" diff --git a/meta-hpe/conf/layer.conf b/meta-hpe/conf/layer.conf index 6ff79df8f..2b8f43b06 100644 --- a/meta-hpe/conf/layer.conf +++ b/meta-hpe/conf/layer.conf @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "hpe-layer" BBFILE_PATTERN_hpe-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_hpe-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_hpe-layer = "hardknott" # Provide a variable that points the base of the hpe layer. HPEBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-hpe/meta-dl360poc/conf/layer.conf b/meta-hpe/meta-dl360poc/conf/layer.conf index 5f85f7c1c..6e3d5c4f9 100644 --- a/meta-hpe/meta-dl360poc/conf/layer.conf +++ b/meta-hpe/meta-dl360poc/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "dl360poc-layer" BBFILE_PATTERN_dl360poc-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_dl360poc-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_dl360poc-layer = "hardknott" diff --git a/meta-hpe/meta-gxp/conf/layer.conf b/meta-hpe/meta-gxp/conf/layer.conf index 28f2ddc87..4612c22b0 100644 --- a/meta-hpe/meta-gxp/conf/layer.conf +++ b/meta-hpe/meta-gxp/conf/layer.conf @@ -7,6 +7,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gxp-layer" BBFILE_PATTERN_gxp-layer = "^${LAYERDIR}/" LAYERVERSION_gxp-layer = "1" -LAYERSERIES_COMPAT_gxp-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_gxp-layer = "hardknott" GXPBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-hxt/conf/layer.conf b/meta-hxt/conf/layer.conf index bc8cd5bc0..96be31b7b 100644 --- a/meta-hxt/conf/layer.conf +++ b/meta-hxt/conf/layer.conf @@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "hxt" BBFILE_PATTERN_hxt = "" -LAYERSERIES_COMPAT_hxt = "gatesgarth hardknott" +LAYERSERIES_COMPAT_hxt = "hardknott" diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf index 95c571be6..5d49c2d27 100644 --- a/meta-ibm/conf/layer.conf +++ b/meta-ibm/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "ibm-layer" BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ibm-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_ibm-layer = "hardknott honister" diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf index f40a9511d..e57b1d5ed 100644 --- a/meta-ibm/meta-palmetto/conf/layer.conf +++ b/meta-ibm/meta-palmetto/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "palmetto-layer" BBFILE_PATTERN_palmetto-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_palmetto-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_palmetto-layer = "hardknott honister" diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf index efeb24a95..3651ada69 100644 --- a/meta-ibm/meta-romulus/conf/layer.conf +++ b/meta-ibm/meta-romulus/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "romulus-layer" BBFILE_PATTERN_romulus-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_romulus-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_romulus-layer = "hardknott honister" diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf index fc07b595d..66d991ac5 100644 --- a/meta-ingrasys/conf/layer.conf +++ b/meta-ingrasys/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "ingrasys" BBFILE_PATTERN_ingrasys := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ingrasys = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_ingrasys = "hardknott honister" diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf index 0f930d88c..6f62318b9 100644 --- a/meta-ingrasys/meta-zaius/conf/layer.conf +++ b/meta-ingrasys/meta-zaius/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "zaius" BBFILE_PATTERN_zaius := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_zaius = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_zaius = "hardknott honister" diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf index 3e91eb548..9e1f53fb1 100644 --- a/meta-inspur/conf/layer.conf +++ b/meta-inspur/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "inspur-layer" BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_inspur-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_inspur-layer = "hardknott honister" diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf index 99be9a192..f921ba6fe 100644 --- a/meta-inspur/meta-fp5280g2/conf/layer.conf +++ b/meta-inspur/meta-fp5280g2/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "fp5280g2-layer" BBFILE_PATTERN_fp5280g2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_fp5280g2-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_fp5280g2-layer = "hardknott honister" diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf index f638bcc68..2dcf54c88 100644 --- a/meta-inspur/meta-on5263m5/conf/layer.conf +++ b/meta-inspur/meta-on5263m5/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "on5263m5-layer" BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_on5263m5-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_on5263m5-layer = "hardknott honister" diff --git a/meta-intel-openbmc/conf/layer.conf b/meta-intel-openbmc/conf/layer.conf index 3b53a7f1c..f082cafa9 100644 --- a/meta-intel-openbmc/conf/layer.conf +++ b/meta-intel-openbmc/conf/layer.conf @@ -8,5 +8,5 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "intel" BBFILE_PATTERN_intel = "^${LAYERDIR}/" LAYERVERSION_intel = "1" -LAYERSERIES_COMPAT_intel = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_intel = "hardknott honister" LAYERDEPENDS_intel = "phosphor-layer" diff --git a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf index 936b1a9c0..07e7a8369 100644 --- a/meta-intel-openbmc/meta-s2600wf/conf/layer.conf +++ b/meta-intel-openbmc/meta-s2600wf/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "s2600wf" BBFILE_PATTERN_s2600wf = "" BBFILE_PRIORITY_s2600wf = "5" -LAYERSERIES_COMPAT_s2600wf = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_s2600wf = "hardknott honister" diff --git a/meta-inventec/conf/layer.conf b/meta-inventec/conf/layer.conf index 08ca2651e..2b5eade4c 100644 --- a/meta-inventec/conf/layer.conf +++ b/meta-inventec/conf/layer.conf @@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "inventec" BBFILE_PATTERN_inventec = "" -LAYERSERIES_COMPAT_inventec = "gatesgarth hardknott" +LAYERSERIES_COMPAT_inventec = "hardknott" diff --git a/meta-lenovo/conf/layer.conf b/meta-lenovo/conf/layer.conf index 180e9603e..0b7cb4fe9 100644 --- a/meta-lenovo/conf/layer.conf +++ b/meta-lenovo/conf/layer.conf @@ -12,7 +12,7 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "lenovo-layer" BBFILE_PATTERN_lenovo-layer = "" LAYERVERSION_lenovo-layer = "1" -LAYERSERIES_COMPAT_lenovo-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_lenovo-layer = "hardknott" # Provide a variable that points the base of the lenovo layer. LENOVOBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-lenovo/meta-hr630/conf/layer.conf b/meta-lenovo/meta-hr630/conf/layer.conf index 9c1b4d652..2c6117c74 100644 --- a/meta-lenovo/meta-hr630/conf/layer.conf +++ b/meta-lenovo/meta-hr630/conf/layer.conf @@ -11,4 +11,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "hr630-layer" BBFILE_PATTERN_hr630-layer = "" BBFILE_PRIORITY_hr630-layer = "5" -LAYERSERIES_COMPAT_hr630-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_hr630-layer = "hardknott" diff --git a/meta-lenovo/meta-hr855xg2/conf/layer.conf b/meta-lenovo/meta-hr855xg2/conf/layer.conf index 364143298..2af2de166 100644 --- a/meta-lenovo/meta-hr855xg2/conf/layer.conf +++ b/meta-lenovo/meta-hr855xg2/conf/layer.conf @@ -11,4 +11,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "hr855xg2-layer" BBFILE_PATTERN_hr855xg2-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_hr855xg2-layer = "5" -LAYERSERIES_COMPAT_hr855xg2-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_hr855xg2-layer = "hardknott" diff --git a/meta-microsoft/conf/layer.conf b/meta-microsoft/conf/layer.conf index 03c6d8fc7..498b391ed 100755 --- a/meta-microsoft/conf/layer.conf +++ b/meta-microsoft/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "microsoft-layer" BBFILE_PATTERN_microsoft-layer = "" -LAYERSERIES_COMPAT_microsoft-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_microsoft-layer = "hardknott" diff --git a/meta-microsoft/meta-olympus/conf/layer.conf b/meta-microsoft/meta-olympus/conf/layer.conf index 1132bedd2..db4714534 100755 --- a/meta-microsoft/meta-olympus/conf/layer.conf +++ b/meta-microsoft/meta-olympus/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "olympus-layer" BBFILE_PATTERN_olympus-layer = "^${LAYERDIR}/" BBFILE_PRIORITY_olympus-layer = "6" -LAYERSERIES_COMPAT_olympus-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_olympus-layer = "hardknott" diff --git a/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf index 946ac2374..26830d3b1 100644 --- a/meta-nuvoton/conf/layer.conf +++ b/meta-nuvoton/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "nuvoton-layer" BBFILE_PATTERN_nuvoton-layer = "" LAYERVERSION_nuvoton-layer = "1" -LAYERSERIES_COMPAT_nuvoton-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_nuvoton-layer = "hardknott honister" diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf index 4236ab266..9a16ca01f 100644 --- a/meta-openpower/conf/layer.conf +++ b/meta-openpower/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "openpower-layer" BBFILE_PATTERN_openpower-layer := "^${LAYERDIR}/" LAYERVERSION_openpower-layer = "1" LAYERDEPENDS_openpower-layer = "core phosphor-layer aspeed-layer" -LAYERSERIES_COMPAT_openpower-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_openpower-layer = "hardknott honister" diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf index 783545687..7e510ea50 100644 --- a/meta-phosphor/conf/layer.conf +++ b/meta-phosphor/conf/layer.conf @@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "phosphor-layer" BBFILE_PATTERN_phosphor-layer := "^${LAYERDIR}/" LAYERVERSION_phosphor-layer = "1" -LAYERSERIES_COMPAT_phosphor-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_phosphor-layer = "hardknott honister" IMAGE_FEATURES[validitems] += "tools-profile" diff --git a/meta-portwell/meta-neptune/conf/layer.conf b/meta-portwell/meta-neptune/conf/layer.conf index 3ca3cac68..652c8a85d 100644 --- a/meta-portwell/meta-neptune/conf/layer.conf +++ b/meta-portwell/meta-neptune/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "neptune" BBFILE_PATTERN_neptune = "" -LAYERSERIES_COMPAT_neptune = "gatesgarth hardknott" +LAYERSERIES_COMPAT_neptune = "hardknott" diff --git a/meta-qualcomm/conf/layer.conf b/meta-qualcomm/conf/layer.conf index e4c872117..1efa8f6eb 100644 --- a/meta-qualcomm/conf/layer.conf +++ b/meta-qualcomm/conf/layer.conf @@ -4,4 +4,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "qualcomm" BBFILE_PATTERN_qualcomm = "" -LAYERSERIES_COMPAT_qualcomm = "gatesgarth hardknott" +LAYERSERIES_COMPAT_qualcomm = "hardknott" diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf index 39655f5ea..a64d93e6c 100644 --- a/meta-quanta/conf/layer.conf +++ b/meta-quanta/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "quanta-layer" BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_quanta-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_quanta-layer = "hardknott honister" diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf index f29015eb6..021711a07 100644 --- a/meta-quanta/meta-f0b/conf/layer.conf +++ b/meta-quanta/meta-f0b/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "f0b-layer" BBFILE_PATTERN_f0b-layer = "" -LAYERSERIES_COMPAT_f0b-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_f0b-layer = "hardknott honister" diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf index 3f738a053..9f41e0501 100644 --- a/meta-quanta/meta-gbs/conf/layer.conf +++ b/meta-quanta/meta-gbs/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gbs-layer" BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_gbs-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_gbs-layer = "hardknott honister" diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf index a429102b1..7591e0953 100644 --- a/meta-quanta/meta-gsj/conf/layer.conf +++ b/meta-quanta/meta-gsj/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gsj-layer" BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_gsj-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_gsj-layer = "hardknott honister" diff --git a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf index c62ff264a..e78bf9576 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "olympus-nuvoton-layer" BBFILE_PATTERN_olympus-nuvoton-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_olympus-nuvoton-layer = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_olympus-nuvoton-layer = "hardknott honister" diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf index 98e71463b..991945384 100644 --- a/meta-quanta/meta-q71l/conf/layer.conf +++ b/meta-quanta/meta-q71l/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "q71l" BBFILE_PATTERN_q71l = "" -LAYERSERIES_COMPAT_q71l = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_q71l = "hardknott honister" diff --git a/meta-supermicro/conf/layer.conf b/meta-supermicro/conf/layer.conf index f46b3746d..d3943d302 100644 --- a/meta-supermicro/conf/layer.conf +++ b/meta-supermicro/conf/layer.conf @@ -7,5 +7,5 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "supermicro-layer" BBFILE_PATTERN_supermicro-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_supermicro-layer := "gatesgarth hardknott" +LAYERSERIES_COMPAT_supermicro-layer := "hardknott" diff --git a/meta-supermicro/meta-x11spi/conf/layer.conf b/meta-supermicro/meta-x11spi/conf/layer.conf index d77e82e90..83c64e4b3 100644 --- a/meta-supermicro/meta-x11spi/conf/layer.conf +++ b/meta-supermicro/meta-x11spi/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "x11spi" BBFILE_PATTERN_x11spi = "" -LAYERSERIES_COMPAT_x11spi = "gatesgarth hardknott" +LAYERSERIES_COMPAT_x11spi = "hardknott" diff --git a/meta-x86/conf/layer.conf b/meta-x86/conf/layer.conf index cd4289954..aab9a63e2 100644 --- a/meta-x86/conf/layer.conf +++ b/meta-x86/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "obmc_machines_x86" BBFILE_PATTERN_obmc_machines_x86 = "" -LAYERSERIES_COMPAT_obmc_machines_x86 = "gatesgarth hardknott honister" +LAYERSERIES_COMPAT_obmc_machines_x86 = "hardknott honister" diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf index 8d6466ffb..b291db86a 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 honister" +LAYERSERIES_COMPAT_yadro-layer = "hardknott honister" diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf index fc18b8c59..13820273f 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 honister" +LAYERSERIES_COMPAT_nicole-layer = "hardknott honister" -- cgit v1.2.3 From e83c22094b7e4970c96bcee273ab08d05bbc0a30 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 1 Sep 2021 16:17:33 -0500 Subject: meta-phosphor: change systemd.bbclass to match upstream override syntax Upstream bbclasses changed to typically use the `:${PN}` override syntax, including the SYSTEMD_ variables. Change our systemd.bbclass to do the same for consistency and perform a tree-wide variable replacement. Spot checked by building bletchley and witherspoon and checking some of the SYSTEMD_LINK directives on installed packages under qemu. Signed-off-by: Patrick Williams Change-Id: I20a9dd809bff8af8759488734f80486c7228c6eb --- .../recipes-ac01/host/ampere-hostctrl.bb | 4 +-- .../state/phosphor-state-manager_%.bbappend | 2 +- .../recipes-ampere/platform/mtjade-gpio-config.bb | 4 +-- .../recipes-phosphor/gpio/fault-monitor.bb | 4 +-- .../recipes-phosphor/gpio/host-gpio-handling.bb | 4 +-- .../meta-jade/recipes-phosphor/gpio/id-button.bb | 4 +-- .../gpio/phosphor-gpio-monitor_%.bbappend | 4 +-- .../recipes-phosphor/gpio/psu-hotswap-reset.bb | 4 +-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../watchdog/phosphor-watchdog_%.bbappend | 2 +- .../meta-kudo/recipes-kudo/host/ampere-hostctrl.bb | 14 ++++---- .../watchdog/phosphor-watchdog_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../recipes-phosphor/chassis/vrm-control.bb | 2 +- .../recipes-phosphor/gpio/id-button.bb | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../recipes-phosphor/chassis/power-workarounds.bb | 2 +- meta-ibm/recipes-phosphor/chassis/vrm-control.bb | 6 ++-- .../dbus/phosphor-dbus-monitor_%.bbappend | 4 +-- meta-ibm/recipes-phosphor/fans/fan-watchdog.bb | 6 ++-- .../recipes-phosphor/fans/phosphor-fan_%.bbappend | 38 +++++++++++----------- meta-ibm/recipes-phosphor/gpio/id-button.bb | 4 +-- .../gpio/phosphor-gpio-monitor_%.bbappend | 8 ++--- .../leds/phosphor-led-manager_%.bbappend | 2 +- .../recipes-phosphor/logging/ibm-logging_git.bb | 2 +- .../power/phosphor-power_%.bbappend | 2 +- .../power/witherspoon-power-supply-sync.bb | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 14 ++++---- .../watchdog/phosphor-watchdog_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../recipes-phosphor/chassis/vcs-control.bb | 4 +-- .../gpio/phosphor-gpio-monitor_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../recipes-phosphor/fans/phosphor-fan_%.bbappend | 4 +-- .../gpio/phosphor-gpio-monitor_%.bbappend | 4 +-- .../power/phosphor-power_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 2 +- ...openpower-software-manager-virtual-pnor.bbclass | 8 ++--- .../flash/phosphor-software-manager_%.bbappend | 2 +- meta-openpower/recipes-phosphor/fsi/op-fsi.bb | 4 +-- .../recipes-phosphor/host/checkstop-monitor.bb | 6 ++-- .../recipes-phosphor/host/p9-cfam-override.bb | 2 +- .../recipes-phosphor/host/p9-host-start.bb | 2 +- .../occ/openpower-occ-control_git.bb | 6 ++-- .../classes/obmc-phosphor-systemd.bbclass | 12 +++---- .../chassis/obmc-host-failure-reboots.bb | 2 +- .../chassis/obmc-op-control-power_git.bb | 24 +++++++------- .../recipes-phosphor/fans/phosphor-fan_git.bb | 14 ++++---- .../host/obmc-op-control-host_git.bb | 2 +- .../ipmi/phosphor-ipmi-host_git.bb | 2 +- .../leds/phosphor-led-manager_git.bb | 6 ++-- meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb | 2 +- .../state/phosphor-state-manager_git.bb | 12 +++---- meta-phosphor/recipes-phosphor/video/fbterm_git.bb | 2 +- .../watchdog/phosphor-watchdog_git.bb | 8 ++--- .../recipes-phosphor/chassis/ir38163-workaround.bb | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../gpio/phosphor-gpio-monitor_%.bbappend | 28 ++++++++-------- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../watchdog/phosphor-watchdog_%.bbappend | 8 ++--- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../state/phosphor-state-manager_%.bbappend | 2 +- 81 files changed, 207 insertions(+), 207 deletions(-) (limited to 'meta-yadro') diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb index c6ee5d0e2..03f0d58ad 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb @@ -24,12 +24,12 @@ HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset@.service" HOST_WARM_REBOOT_FORCE_INSTMPL = "ampere-host-force-reset@{0}.service" HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target" HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_INSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${HOST_WARM_REBOOT_FORCE_TGT}" HOST_ON_RESET_HOSTTMPL = "ampere-host-on-host-check@.service" HOST_ON_RESET_HOSTINSTMPL = "ampere-host-on-host-check@{0}.service" HOST_ON_RESET_HOSTTGTFMT = "obmc-host-startmin@{0}.target" HOST_ON_RESET_HOSTFMT = "../${HOST_ON_RESET_HOSTTMPL}:${HOST_ON_RESET_HOSTTGTFMT}.requires/${HOST_ON_RESET_HOSTINSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_ON_RESET_HOSTFMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_ON_RESET_HOSTFMT', 'OBMC_HOST_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${HOST_ON_RESET_HOSTTMPL}" diff --git a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend index e8ef45d60..b25ba5d94 100644 --- a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -2,7 +2,7 @@ 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}" FILES:${PN} += "${systemd_system_unitdir}/*" diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb index cc79f5b1a..8886fec6c 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb @@ -28,14 +28,14 @@ CHASSIS_POWERON_SVC = "ampere-gpio-poweron@.service" CHASSIS_POWERON_INSTMPL = "ampere-gpio-poweron@{0}.service" CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target" CHASSIS_POWERON_FMT = "../${CHASSIS_POWERON_SVC}:${CHASSIS_POWERON_TGTFMT}.requires/${CHASSIS_POWERON_INSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" # chassis power off CHASSIS_POWEROFF_SVC = "ampere-gpio-poweroff@.service" CHASSIS_POWEROFF_INSTMPL = "ampere-gpio-poweroff@{0}.service" CHASSIS_POWEROFF_TGTFMT = "obmc-chassis-poweroff@{0}.target" CHASSIS_POWEROFF_FMT = "../${CHASSIS_POWEROFF_SVC}:${CHASSIS_POWEROFF_TGTFMT}.requires/${CHASSIS_POWEROFF_INSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" do_install() { install -d ${D}/usr/sbin diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb index 49376ee9b..4994183a0 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/fault-monitor.bb @@ -19,7 +19,7 @@ do_install() { OBMC_FAULT_MONITOR_INSTANCES = "s0_fault_alert s1_fault_alert" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/gpio/s0_fault_alert \ +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/gpio/s0_fault_alert \ obmc/gpio/s1_fault_alert \ " @@ -29,5 +29,5 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "ampere_fault_led.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_FAULT_MONITOR_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_FAULT_MONITOR_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb index cde625f5b..79bfb726e 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb @@ -10,7 +10,7 @@ RDEPENDS:${PN} += "virtual/obmc-gpio-monitor" OBMC_HOST_ACK_MONITOR_INSTANCES = "reboot_ack shutdown_ack" -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/reboot_ack \ +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/reboot_ack \ obmc/gpio/shutdown_ack \ " @@ -20,4 +20,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "ampere-host-shutdown-ack@.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_ACK_MONITOR_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_ACK_MONITOR_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb index 8e57c3ea2..c1a616a9c 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/id-button.bb @@ -16,7 +16,7 @@ do_install() { ${D}${bindir}/toggle_identify_led.sh } -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/id_button" ID_BUTTON_SERVICE = "id_button" @@ -26,4 +26,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index c6400c2f0..527cbbda0 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -5,8 +5,8 @@ INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK_${PN}-presence:append:mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb index 2ca18a0be..839c6d4d1 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb @@ -13,7 +13,7 @@ OBMC_PSU_MONITOR_INSTANCES = "PSU1_B25 PSU2_B25" # Copies config file having arguments for psu # via GPIO assertion -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/PSU1_B25 \ +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/PSU1_B25 \ obmc/gpio/PSU2_B25 \ " SYSTEMD_SERVICE:${PN} ?= "psu1_hotswap_reset.service psu2_hotswap_reset.service" @@ -29,4 +29,4 @@ GPIO_MONITOR_TMPL = "phosphor-gpio-monitor@.service" GPIO_MONITOR_TGTFMT = "phosphor-gpio-monitor@{0}.service" TGT = "multi-user.target" PSU_MONITOR_FMT = "../${GPIO_MONITOR_TMPL}:${TGT}.requires/${GPIO_MONITOR_TGTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_PSU_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_PSU_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index d7128f4f4..5150e2312 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -16,11 +16,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 43a6f17d5..a77a59be0 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -21,7 +21,7 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS:${MACHINE}')}" ITEMS += "iio-hwmon.conf iio-hwmon-adc14.conf iio-hwmon-battery.conf" ENVS = "obmc/${MACHINE}/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}" do_install:append:mtjade() { SOURCEDIR="${WORKDIR}/obmc/${MACHINE}/hwmon" diff --git a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 140154990..970b12c6a 100644 --- a/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-facebook/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,5 +1,5 @@ FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" # Remove the override to keep service running after DC cycle -SYSTEMD_OVERRIDE_${PN}:remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_OVERRIDE:${PN}:remove = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" SYSTEMD_SERVICE:${PN} = "phosphor-watchdog.service phosphor-watchdog-host-poweroff.service phosphor-watchdog-host-reset.service phosphor-watchdog-host-cycle.service" diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb index 461aeb5d4..f7daa94a8 100644 --- a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb @@ -37,42 +37,42 @@ SYSTEMD_SERVICE:${PN} = " \ HOST_SHUTDOWN_TMPL = "ampere-host-shutdown.service" HOST_SHUTDOWN_TGTFMT = "obmc-host-shutdown@{0}.target" HOST_SHUTDOWN_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_SHUTDOWN_TGTFMT}.requires/${HOST_SHUTDOWN_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SHUTDOWN_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_SHUTDOWN_FMT', 'OBMC_HOST_INSTANCES')}" # Force the power cycle target to run the ampere power cycle HOST_REBOOT_SVC = "ampere-host-power-cycle.service" HOST_REBOOT_SVC_TGTFMT = "obmc-host-reboot@{0}.target" HOST_REBOOT_SVC_FMT = "../${HOST_REBOOT_SVC}:${HOST_REBOOT_SVC_TGTFMT}.requires/${HOST_REBOOT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" # overwrite the host reset to graceful reset HOST_WARM_REBOOT_SOFT_SVC = "ampere-host-reset.service" HOST_WARM_REBOOT_TGTFMT = "obmc-host-warm-reboot@{0}.target" HOST_WARM_REBOOT_SOFT_SVC_FMT = "../${HOST_WARM_REBOOT_SOFT_SVC}:${HOST_WARM_REBOOT_TGTFMT}.requires/${HOST_WARM_REBOOT_SOFT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" # overwrite force reboot HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset.service" HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target" HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_TGT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" # chassis power control CHASSIS_POWERON_SVC = "ampere-chassis-poweron.service" CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target" CHASSIS_POWERON_FMT = "../${CHASSIS_POWERON_SVC}:${CHASSIS_POWERON_TGTFMT}.requires/${CHASSIS_POWERON_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" CHASSIS_POWEROFF_SVC = "ampere-chassis-poweroff.service" CHASSIS_POWEROFF_TGTFMT = "obmc-chassis-poweroff@{0}.target" CHASSIS_POWEROFF_FMT = "../${CHASSIS_POWEROFF_SVC}:${CHASSIS_POWEROFF_TGTFMT}.requires/${CHASSIS_POWEROFF_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" TMPL = "phosphor-gpio-monitor@.service" INSTFMT = "phosphor-gpio-monitor@{0}.service" TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}" do_install() { install -d ${D}/usr/sbin diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 787ddabc6..020212ad8 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" # Remove the override to keep service running after DC cycle -SYSTEMD_OVERRIDE_${PN}:remove:kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_OVERRIDE:${PN}:remove:kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" SYSTEMD_SERVICE:${PN}:kudo = " phosphor-watchdog.service \ phosphor-watchdog-host-poweroff.service \ phosphor-watchdog-host-cycle.service\ diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index c6ccbf012..27d7ae216 100644 --- a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -31,4 +31,4 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 13b8535a5..573c0b869 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -10,4 +10,4 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:palmetto = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:palmetto = " ${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb index 52fc793ac..36b77a03d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb @@ -28,6 +28,6 @@ FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" SYSTEMD_SERVICE:${PN} += "${TMPL_EN}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${TMPL_DIS}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb index 7981baa0c..f25f35442 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb @@ -24,4 +24,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb index 3cbf82408..a7bebeb1c 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb @@ -17,7 +17,7 @@ do_install() { ${D}${bindir}/toggle_identify_led.sh } -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/id_button" ID_BUTTON_SERVICE = "id_button" @@ -27,4 +27,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index e3d012247..703cac279 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -21,5 +21,5 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb index c46926f90..1ae5699b7 100644 --- a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb @@ -31,6 +31,6 @@ FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" SYSTEMD_SERVICE:${PN} += "${TMPL_EN}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN}:append:witherspoon = " ${TMPL_DIS}" -SYSTEMD_LINK_${PN}:append:witherspoon = " ${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}:append:witherspoon = " ${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb index 2d00264dc..6ab0ae2d2 100644 --- a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb +++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb @@ -23,4 +23,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}" SYSTEMD_SERVICE:${PN} += "${TMPL_WA}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb index 8a9ef7fae..cc297d27b 100644 --- a/meta-ibm/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb @@ -37,6 +37,6 @@ FMT_ON_IRUNBIND = "../${TMPL_ON_IRUNBIND}:${TGTFMT_ON}.requires/${INSTFMT_ON_IRU SYSTEMD_SERVICE:${PN} += "${TMPL_ON_IRUNBIND} ${TMPL_ON_IRBIND}" SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " ${TMPL}" -SYSTEMD_LINK_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRBIND', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRUNBIND', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}:append:ibm-ac-server = " ${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON_IRBIND', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON_IRUNBIND', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend index 3071cb4c9..6731a7abb 100644 --- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend @@ -1,2 +1,2 @@ -SYSTEMD_LINK_phosphor-msl-verify:append:ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" -SYSTEMD_LINK_phosphor-msl-verify:append:mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" +SYSTEMD_LINK:phosphor-msl-verify:append:ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" +SYSTEMD_LINK:phosphor-msl-verify:append:mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb index ad44ba346..4673c44c0 100644 --- a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb @@ -18,6 +18,6 @@ WATCHDOG_SERVICE = "fan-watchdog.service" WATCHDOG_FMT = "../${WATCHDOG_SERVICE}:${TGTFMT}.requires/${WATCHDOG_SERVICE}" SYSTEMD_SERVICE:${PN} += "${RESET_SERVICE} ${MONITOR_SERVICE} ${WATCHDOG_SERVICE}" -SYSTEMD_LINK_${PN} += "${RESET_FMT} ${WATCHDOG_FMT}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/reset-fan-watchdog.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/fan-watchdog.conf" +SYSTEMD_LINK:${PN} += "${RESET_FMT} ${WATCHDOG_FMT}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/fan-watchdog/reset-fan-watchdog.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/fan-watchdog/fan-watchdog.conf" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 8b4e91e93..469f76539 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -19,42 +19,42 @@ FMT_COOLING = "../${TMPL_COOLING}:${MULTI_USR_TGT}.requires/${INSTFMT_COOLING}" FILES:phosphor-cooling-type:append:ibm-ac-server = " ${bindir}/phosphor-cooling-type" SYSTEMD_SERVICE:phosphor-cooling-type:append:ibm-ac-server = " ${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" FILES:phosphor-cooling-type:append:mihawk = " ${bindir}/phosphor-cooling-type" SYSTEMD_SERVICE:phosphor-cooling-type:append:mihawk = " ${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" #These services are protected by the watchdog -SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" #These services need to be stopped when watchdog expires -SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" # Witherspoon fan control service linking # Link fan control init service SYSTEMD_SERVICE:${PN}-control:witherspoon += "${TMPL_CONTROL} ${TMPL_CONTROL_INIT}" -SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" # Link fan control service to be started at standby FMT_CONTROL_STDBY:witherspoon = "../${TMPL_CONTROL}:${MULTI_USR_TGT}.wants/${INSTFMT_CONTROL}" -SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY', 'OBMC_CHASSIS_INSTANCES')}" # Link fan control service to also start at poweron FMT_CONTROL_PWRON:witherspoon = "../${TMPL_CONTROL}:${POWERON_TGT}.requires/${INSTFMT_CONTROL}" -SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}" # Enable the use of JSON on the fan applications that support it PACKAGECONFIG:append:witherspoon = " json" diff --git a/meta-ibm/recipes-phosphor/gpio/id-button.bb b/meta-ibm/recipes-phosphor/gpio/id-button.bb index 01df2ea5b..3e53f9d08 100644 --- a/meta-ibm/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/recipes-phosphor/gpio/id-button.bb @@ -17,7 +17,7 @@ do_install() { ${D}${bindir}/toggle_identify_led.sh } -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/id_button" ID_BUTTON_SERVICE = "id_button" @@ -27,4 +27,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 272a8a1f5..6bb236463 100644 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -5,10 +5,10 @@ INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.wants/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK_${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_LINK_${PN}-presence:append:mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index 57fb62b35..f734bf530 100644 --- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -3,7 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SYSTEMD_SERVICE:${PN}:append:p10bmc += "obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service" # Copies config file having arguments for led-set-all-groups-asserted.sh -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc +="obmc/led/set-all/groups/config" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc +="obmc/led/set-all/groups/config" # Use the JSON configuration file at runtime than the static led.yaml # Also, enable Lamp Test and OperationalStatus monitor feature for diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index 8d6e64073..6a0e18189 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -41,7 +41,7 @@ DBUS_SERVICE:${PN} += "${SERVICE}" #The BindsTo in the service will not do the restart, it will only do the #original start and a stop. LOG_FMT = "../${SERVICE}:xyz.openbmc_project.Logging.service.wants/${SERVICE}" -SYSTEMD_LINK_${PN} += "${LOG_FMT}" +SYSTEMD_LINK:${PN} += "${LOG_FMT}" do_install:append(){ diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend index 9acaad768..c8d6a4617 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend @@ -21,4 +21,4 @@ do_install:append(){ FILES:${PN} += "${datadir}/phosphor-power/psu.json" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor:append:ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-monitor:append:ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb index 4c4c88401..74bb9a0c5 100644 --- a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb +++ b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb @@ -13,4 +13,4 @@ TGTFMT = "obmc-chassis-poweron@0.target" SYNC_FMT = "../${SYNC_SERVICE}:${TGTFMT}.wants/${SYNC_SERVICE}" SYSTEMD_SERVICE:${PN} += "${SYNC_SERVICE}" -SYSTEMD_LINK_${PN} += "${SYNC_FMT}" +SYSTEMD_LINK:${PN} += "${SYNC_FMT}" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 080025ead..7932eb3a0 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -106,16 +106,16 @@ 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:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # Enable and install the max31785-msl package PACKAGECONFIG:append:ibm-ac-server = " max31785-msl" -SYSTEMD_ENVIRONMENT_FILE_max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf" -SYSTEMD_LINK_max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" +SYSTEMD_ENVIRONMENT_FILE:max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf" +SYSTEMD_LINK:max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " max31785-hwmon-helper@.service" diff --git a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 7d904461f..e2f146854 100644 --- a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # utilize a 600s default timer config for p10bmc -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc = " obmc/watchdog/poweron" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc = " obmc/watchdog/poweron" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb index 4aebf6f24..b272dfe31 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb @@ -16,9 +16,9 @@ FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}" FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}" SYSTEMD_SERVICE:${PN} += "${TMPL_OFF}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${TMPL_ON}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" SRC_URI += "file://zaius_avsbus.sh" RDEPENDS:${PN} += "i2c-tools" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb index 3c7b92eaa..903ce4545 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb @@ -16,9 +16,9 @@ FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}" FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}" SYSTEMD_SERVICE:${PN} += "${TMPL_OFF}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${TMPL_ON}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" SRC_URI += "file://zaius_vcs.sh" RDEPENDS:${PN} += "i2c-tools" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 005a1e497..ce9c697de 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -7,5 +7,5 @@ INSTFMT = "phosphor-gpio-presence@{0}.service" TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" -SYSTEMD_LINK_${PN}-presence:append:zaius += "${@compose_list(d, 'FMT', 'PCIE_CARD_E2B_INSTANCE')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:zaius += "obmc/gpio/phosphor-pcie-card-e2b.conf" +SYSTEMD_LINK:${PN}-presence:append:zaius += "${@compose_list(d, 'FMT', 'PCIE_CARD_E2B_INSTANCE')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:zaius += "obmc/gpio/phosphor-pcie-card-e2b.conf" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 1ce381522..07b7a382c 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -33,5 +33,5 @@ ZAIUS_OCCITEMS = "${@compose_list(d, 'ZAIUS_OCCSFMT', 'ZAIUS_OCCS')}" ENVS = "obmc/hwmon/{0}" # compose_list is not defined immediately so don't use := -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:zaius = " ${@compose_list(d, 'ENVS', 'ZAIUS_OCCITEMS')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend index 319cd1658..79a13f695 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -14,8 +14,8 @@ FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" FILES:phosphor-cooling-type = "${bindir}/phosphor-cooling-type" SYSTEMD_SERVICE:phosphor-cooling-type += "${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:fp5280g2 = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:phosphor-cooling-type:append:fp5280g2 = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 5fd911433..aa3b357a2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -5,8 +5,8 @@ INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK_${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend index 38efc160d..427018808 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend @@ -6,7 +6,7 @@ SRC_URI += "file://psu.json" PACKAGECONFIG:append = " monitor" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor:append:fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-monitor:append:fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" do_install:append() { install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index aacdd181a..4f8fd6e8b 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -26,5 +26,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:fp5280g2 = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 867c388bd..863f59c38 100644 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -16,4 +16,4 @@ ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb b/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb index 956a62377..89b5b83e6 100644 --- a/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-inventec/meta-lanyang/recipes-phosphor/chassis/avsbus-control.bb @@ -16,9 +16,9 @@ FMT_OFF = "../${TMPL_OFF}:${TGTFMT_OFF}.wants/${INSTFMT_OFF}" FMT_ON = "../${TMPL_ON}:${TGTFMT_ON}.requires/${INSTFMT_ON}" SYSTEMD_SERVICE_${PN} += "${TMPL_OFF}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_OFF', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE_${PN} += "${TMPL_ON}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" SRC_URI += "file://lanyang_avsbus.sh" RDEPENDS_${PN} += "i2c-tools" diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index eb8196ff3..deeb2f9eb 100644 --- a/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-inventec/meta-lanyang/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -10,11 +10,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_lanyang := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}_append_lanyang := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}_append_lanyang := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}_append_lanyang := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 7a2345ebc..4098609cb 100644 --- a/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-lenovo/meta-hr630/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -15,4 +15,4 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_hr630 := "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}_append_hr630 := "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-lenovo/meta-hr855xg2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-lenovo/meta-hr855xg2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 9a26ca04e..1e0803c06 100644 --- a/meta-lenovo/meta-hr855xg2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-lenovo/meta-hr855xg2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -12,4 +12,4 @@ HR855XG2_ITEMS += "iio-hwmon.conf" HR855XG2_ITEMS += "iio-hwmon-battery.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_hr855xg2 := "${@compose_list(d, 'ENVS', 'HR855XG2_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}_append_hr855xg2 := "${@compose_list(d, 'ENVS', 'HR855XG2_ITEMS')}" diff --git a/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass b/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass index 61822f1d4..d37ebc30e 100644 --- a/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass +++ b/meta-openpower/classes/openpower-software-manager-virtual-pnor.bbclass @@ -26,8 +26,8 @@ HOST_STARTMIN_TGTFMT = "obmc-host-startmin@{0}.target" CHECK_CLEAR_VOLATILE_INSTFMT = "obmc-vpnor-check-clearvolatile@{0}.service" CHECK_CLEAR_VOLATILE_START_FMT = "../${CHECK_CLEAR_VOLATILE_TMPL}:${HOST_STARTMIN_TGTFMT}.requires/${CHECK_CLEAR_VOLATILE_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_START_FMT', 'OBMC_HOST_INSTANCES')}" # Chassis target installation - always enable and clear in chassis # power on @@ -36,5 +36,5 @@ ENABLE_CLEAR_VOLATILE_PON_FMT = "../${ENABLE_CLEAR_VOLATILE_TMPL}:${CHASSIS_PON_ CHECK_CLEAR_VOLATILE_PON_FMT = "../${CHECK_CLEAR_VOLATILE_TMPL}:${CHASSIS_PON_TGTFMT}.requires/${CHECK_CLEAR_VOLATILE_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'ENABLE_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'CHECK_CLEAR_VOLATILE_PON_FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 5255be429..9df8193be 100644 --- a/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS:prepend:df-openpower := "${THISDIR}/${PN}:" -SYSTEMD_OVERRIDE_${PN}-updater:append:df-openpower = \ +SYSTEMD_OVERRIDE:${PN}-updater:append:df-openpower = \ " software-bmc-updater.conf:xyz.openbmc_project.Software.BMC.Updater.service.d/software-bmc-updater.conf" diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb index a76acb44c..05d07ddb8 100644 --- a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb +++ b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb @@ -18,5 +18,5 @@ FMT_SCAN_HOST = "../${TMPL_SCAN}:${TGTFMT_HOST}.wants/${INSTFMT_SCAN}" SYSTEMD_SERVICE:${PN} += "${TMPL_SCAN} fsi-enable.service fsi-disable.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN_CHASSIS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN_HOST', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_SCAN_CHASSIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_SCAN_HOST', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb index 83f3a3e03..9b1b1c4c5 100644 --- a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb +++ b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb @@ -14,7 +14,7 @@ OBMC_HOST_MONITOR_INSTANCES = "checkstop" # Copies config file having arguments for monitoring host checkstop # via GPIO assertion -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/checkstop" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/checkstop" # This package is not supplying the unit file and also this is not a native # recipe since state-mgmt needs this package at runtime. Unsetting this below @@ -22,10 +22,10 @@ SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/checkstop" SYSTEMD_SERVICE:${PN} ?="" # Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN} +="checkstop.conf:phosphor-gpio-monitor@checkstop.service.d/checkstop.conf" +SYSTEMD_OVERRIDE:${PN} +="checkstop.conf:phosphor-gpio-monitor@checkstop.service.d/checkstop.conf" STATES = "startmin" GPIO_MONITOR_TMPL = "phosphor-gpio-monitor@.service" GPIO_MONITOR_TGTFMT = "phosphor-gpio-monitor@{1}.service" CHECKSTOP_MONITOR_FMT = "../${GPIO_MONITOR_TMPL}:obmc-host-{0}@{2}.target.wants/${GPIO_MONITOR_TGTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHECKSTOP_MONITOR_FMT', 'STATES', 'OBMC_HOST_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'CHECKSTOP_MONITOR_FMT', 'STATES', 'OBMC_HOST_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb b/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb index 0a189e8c6..d779785e4 100644 --- a/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb +++ b/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb @@ -17,4 +17,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/host/p9-host-start.bb b/meta-openpower/recipes-phosphor/host/p9-host-start.bb index f735c0f82..549bbe242 100644 --- a/meta-openpower/recipes-phosphor/host/p9-host-start.bb +++ b/meta-openpower/recipes-phosphor/host/p9-host-start.bb @@ -22,4 +22,4 @@ TGTFMT = "obmc-host-startmin@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb index 3903ef616..440829175 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -55,8 +55,8 @@ OCC_TMPL = "op-occ-{0}@.service" HOST_TGTFMT = "obmc-host-{1}@{2}.target" OCC_INSTFMT = "op-occ-{0}@{2}.service" HOST_OCC_FMT = "../${OCC_TMPL}:${HOST_TGTFMT}.wants/${OCC_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_ENABLE', 'HOST_START', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_DISABLE', 'HOST_STOP', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_ENABLE', 'HOST_START', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_DISABLE', 'HOST_STOP', 'OBMC_HOST_INSTANCES')}" # Set the occ disable service to be executed on host error HOST_ERROR_TARGETS = "crash timeout" @@ -66,7 +66,7 @@ HOST_ERROR_TGTFMT = "obmc-host-{0}@{1}.target" OCC_DISABLE_INSTFMT = "op-occ-disable@{1}.service" HOST_ERROR_FMT = "../${OCC_DISABLE_TMPL}:${HOST_ERROR_TGTFMT}.wants/${OCC_DISABLE_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_ERROR_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'HOST_ERROR_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" S = "${WORKDIR}/git" diff --git a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass index baea3af02..c67fc021f 100644 --- a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass @@ -25,16 +25,16 @@ # SYSTEMD_USER_${unit}.service = "foo" # The user for the unit/package. # -# SYSTEMD_ENVIRONMENT_FILE_${PN} = "foo" +# SYSTEMD_ENVIRONMENT_FILE:${PN} = "foo" # One or more environment files to be installed. # -# SYSTEMD_LINK_${PN} = "tgt:name" +# SYSTEMD_LINK:${PN} = "tgt:name" # A specification for installing arbitrary links in # the ${systemd_system_unitdir} namespace, where: # tgt: the link target # name: the link name, relative to ${systemd_system_unitdir} # -# SYSTEMD_OVERRIDE_${PN} = "src:dest" +# SYSTEMD_OVERRIDE:${PN} = "src:dest" # A specification for installing unit overrides where: # src: the override file template # dest: the override install location, relative to ${systemd_system_unitdir} @@ -230,11 +230,11 @@ python() { unit_exist = check_sd_unit(d, unit) add_sd_unit(d, unit, pkg, unit_exist) add_sd_user(d, unit.name, pkg) - for name in listvar_to_list(d, 'SYSTEMD_ENVIRONMENT_FILE_%s' % pkg): + for name in listvar_to_list(d, 'SYSTEMD_ENVIRONMENT_FILE:%s' % pkg): add_env_file(d, name, pkg) - for spec in listvar_to_list(d, 'SYSTEMD_LINK_%s' % pkg): + for spec in listvar_to_list(d, 'SYSTEMD_LINK:%s' % pkg): install_link(d, spec, pkg) - for spec in listvar_to_list(d, 'SYSTEMD_OVERRIDE_%s' % pkg): + for spec in listvar_to_list(d, 'SYSTEMD_OVERRIDE:%s' % pkg): add_override(d, spec, pkg) } diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb index 84403d57b..b21440d89 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb @@ -12,4 +12,4 @@ INSTFMT = "host-failure-reboots@{0}.service" LINK_FMT = "${TMPL}:${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb index 8c0394f2a..8e0e38a0c 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb @@ -24,7 +24,7 @@ SYSTEMD_SERVICE:${PN} += " \ op-powered-off@.service \ " -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/power_control" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/power_control" START_TMPL = "op-power-start@.service" START_TGTFMT = "obmc-chassis-poweron@{1}.target" @@ -59,38 +59,38 @@ RESET_ON_CHASSIS_INSTFMT = "op-reset-chassis-on@{0}.service" RESET_ON_CHASSIS_FMT = "../${RESET_ON_CHASSIS_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_CHASSIS_INSTFMT}" # Build up requires relationship for START_TGTFMT and STOP_TGTFMT -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POWERED_OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'POWERED_OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" # Now show that the main control target requires these power targets START_TMPL_CTRL = "obmc-chassis-poweron@.target" START_TGTFMT_CTRL = "obmc-host-startmin@{1}.target" START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target" START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" # Chassis off requires host off STOP_TMPL_CTRL = "obmc-host-stop@.target" STOP_TGTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" STOP_INSTFMT_CTRL = "obmc-host-stop@{1}.target" STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES', 'OBMC_HOST_INSTANCES')}" # Hard power off requires chassis off HARD_OFF_TMPL_CTRL = "obmc-chassis-poweroff@.target" HARD_OFF_TGTFMT_CTRL = "obmc-chassis-hard-poweroff@{0}.target" HARD_OFF_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" HARD_OFF_FMT_CTRL = "../${HARD_OFF_TMPL_CTRL}:${HARD_OFF_TGTFMT_CTRL}.requires/${HARD_OFF_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" # Force the standby target to run the chassis reset check target RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" SYSD_TGT = "multi-user.target" RESET_INSTFMT_CTRL = "obmc-chassis-powerreset@{0}.target" RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index 9e0149382..0cf6a5968 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -60,10 +60,10 @@ FMT_TACH_MUSR = "../${TMPL_TACH}:${MULTI_USR_TGT}.wants/${INSTFMT_TACH}" FILES:${PN}-presence-tach = "${bindir}/phosphor-fan-presence-tach" SYSTEMD_SERVICE:${PN}-presence-tach += "${TMPL_TACH}" -SYSTEMD_LINK_${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSIS_INSTANCES')}" # JSON mode also gets linked into multi-user -SYSTEMD_LINK_${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_TACH_MUSR', 'OBMC_CHASSIS_INSTANCES'), '', d)}" # Package the JSON config files installed from the repo @@ -105,10 +105,10 @@ SYSTEMD_SERVICE:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', # JSON: Linked to multi-user and poweron # YAML: Linked to fans-ready and fan control-init poweron -SYSTEMD_LINK_${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_CONTROL_MUSR', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_CONTROL', 'OBMC_CHASSIS_INSTANCES'), d)}" -SYSTEMD_LINK_${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES'), d)}" @@ -141,11 +141,11 @@ SYSTEMD_SERVICE:${PN}-monitor += "${TMPL_MONITOR}" SYSTEMD_SERVICE:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', '', '${TMPL_MONITOR_INIT}', d)}" # JSON: power on and multi-user links. YAML: fans-ready and fan monitor init links -SYSTEMD_LINK_${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_MONITOR_PWRON', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_MONITOR_FANSREADY', 'OBMC_CHASSIS_INSTANCES'), d)}" -SYSTEMD_LINK_${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ +SYSTEMD_LINK:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_MONITOR_MUSR', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_MONITOR_INIT', 'OBMC_CHASSIS_INSTANCES'), d)}" @@ -163,4 +163,4 @@ PACKAGECONFIG[sensor-monitor] = "--enable-sensor-monitor, --disable-sensor-monit FILES:sensor-monitor += " ${bindir}/sensor-monitor" SYSTEMD_SERVICE:sensor-monitor += "sensor-monitor.service" -SYSTEMD_LINK_sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service" +SYSTEMD_LINK:sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service" diff --git a/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb index 1a6d165b2..ffe2f366e 100644 --- a/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb +++ b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb @@ -23,4 +23,4 @@ START_TGTFMT = "obmc-host-startmin@{1}.target" START_INSTFMT = "op-start-host@{0}.service" START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index 1a1199f73..03d4e4f2f 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -103,7 +103,7 @@ FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ SOFT_SVC = "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service" SOFT_TGTFMT = "obmc-host-shutdown@{0}.target" SOFT_FMT = "../${SOFT_SVC}:${SOFT_TGTFMT}.requires/${SOFT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'SOFT_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'SOFT_FMT', 'OBMC_HOST_INSTANCES')}" #Collect all hardcoded sensor yamls from different recipes and #merge all of them with sensor.yaml. diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb index 341c5f73b..3bfd47d05 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -39,7 +39,7 @@ DBUS_SERVICE:${PN} += "xyz.openbmc_project.LED.GroupManager.service" SYSTEMD_SERVICE:${PN} += "obmc-led-group-start@.service obmc-led-group-stop@.service" SYSTEMD_SERVICE:${PN}-faultmonitor += "obmc-fru-fault-monitor.service" -SYSTEMD_LINK_${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" +SYSTEMD_LINK:${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" CHASSIS_TARGETS = "poweron poweroff" STATES = "start stop" @@ -47,10 +47,10 @@ TMPLFMT = "obmc-led-group-{1}@.service" TGTFMT = "obmc-chassis-{0}@0.target" INSTFMT = "obmc-led-group-{1}@power_on.service" FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'FMT', 'CHASSIS_TARGETS', 'STATES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'FMT', 'CHASSIS_TARGETS', 'STATES')}" # Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" +SYSTEMD_OVERRIDE:${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index c7273a032..3f2ae8622 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -37,7 +37,7 @@ FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "mboxd.service" SYSTEMD_SERVICE:${PN} += "mboxd-reload@.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" # Enable virtual-pnor by DISTRO_FEATURE openpower-virtual-pnor. PACKAGECONFIG:append:df-openpower-virtual-pnor = " virtual-pnor" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 83939c468..408096698 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -174,12 +174,12 @@ SYSTEMD_SERVICE:${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_ACTION_FMT', SYSTEMD_SERVICE:${PN}-obmc-targets += "${@compose_list(d, 'HOST_SYNCH_FMT', 'HOST_SYNCH_TARGETS')}" SYSTEMD_SERVICE:${PN}-obmc-targets += "${@compose_list(d, 'HOST_ACTION_FMT', 'HOST_ACTION_TARGETS')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" SRC_URI += "git://github.com/openbmc/phosphor-state-manager" SRCREV = "0d1c3f1f9329c853677f0581287afef83eeea0f0" diff --git a/meta-phosphor/recipes-phosphor/video/fbterm_git.bb b/meta-phosphor/recipes-phosphor/video/fbterm_git.bb index 57e217450..8480bc60b 100644 --- a/meta-phosphor/recipes-phosphor/video/fbterm_git.bb +++ b/meta-phosphor/recipes-phosphor/video/fbterm_git.bb @@ -26,4 +26,4 @@ do_install() { } SYSTEMD_SERVICE:${PN} += "fbterm.service" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "fbterm" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "fbterm" diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb index b0d9c61cd..d0c91bf0f 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb @@ -28,10 +28,10 @@ EXTRA_OEMESON = " \ " # Copies config file having arguments for host watchdog -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/watchdog/poweron" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/watchdog/poweron" # Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN} += "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_OVERRIDE:${PN} += "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" # For now, watching PowerOn is the only usecase OBMC_HOST_WATCHDOG_INSTANCES = "poweron" @@ -51,5 +51,5 @@ ENABLE_WATCHDOG_TGTFMT = "obmc-enable-host-watchdog@{0}.service" WATCHDOG_FMT = "../${WATCHDOG_TMPL}:obmc-host-startmin@{1}.target.wants/${WATCHDOG_TGTFMT}" ENABLE_WATCHDOG_FMT = "../${ENABLE_WATCHDOG_TMPL}:obmc-host-startmin@{0}.target.wants/${ENABLE_WATCHDOG_TGTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb index fb9a728e3..0ac6c8ecd 100644 --- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb +++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/chassis/ir38163-workaround.bb @@ -19,9 +19,9 @@ FMT_REMOVE = "../${IR_REMOVE}:${TGTFMT_OFF}.wants/${INSTIR_REMOVE}" FMT_ADD = "../${IR_ADD}:${TGTFMT_ON}.requires/${INSTIR_ADD}" SYSTEMD_SERVICE_${PN} += "${IR_REMOVE}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_REMOVE', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_REMOVE', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE_${PN} += "${IR_ADD}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ADD', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ADD', 'OBMC_CHASSIS_INSTANCES')}" SRC_URI += "file://ir38163_workaround.sh" diff --git a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index c6ccbf012..27d7ae216 100644 --- a/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -31,4 +31,4 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 195626d7a..ec17b3bbf 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -10,11 +10,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:f0b := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:f0b := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:f0b := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:f0b := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 12d043cc4..1066cb215 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -19,4 +19,4 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAME')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index edf81760f..c9a0c38c3 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -8,25 +8,25 @@ TMPL_PRESENT = "phosphor-gpio-presence@.service" INSTFMT_PRESENT = "phosphor-gpio-presence@{0}.service" PRESENT_TGT = "multi-user.target" FMT_PRESENT = "../${TMPL_PRESENT}:${PRESENT_TGT}.requires/${INSTFMT_PRESENT}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-0.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-1.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-2.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-3.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-4.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-5.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-6.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-7.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-8.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-9.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-10.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs +="obmc/gpio/gpios-11.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-0.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-1.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-2.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-3.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-4.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-5.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-6.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-7.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-8.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-9.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-10.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-11.conf" GBS_OBMC_PRESENT_INSTANCES = "0 1 2 3 4 5 6 7 8 9 10 11" -SYSTEMD_LINK_${PN}-presence:append:gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}" GBS_PRESENT_ENV_FMT = "obmc/gpio/gpios-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:gbs = " ${@compose_list(d, 'GBS_PRESENT_ENV_FMT', 'GBS_OBMC_PRESENT_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:gbs = " ${@compose_list(d, 'GBS_PRESENT_ENV_FMT', 'GBS_OBMC_PRESENT_INSTANCES')}" do_install:append:gbs() { install -d ${D}${systemd_system_unitdir} diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index f36178d35..b9ea43e1c 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -11,14 +11,14 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:gbs := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:gbs := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" EXTRA_OECONF:append:gbs = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml \ diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 657684d7a..723ac418d 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -22,12 +22,12 @@ GBS_ITEMS += "${@compose_list(d, 'GBS_ITEMSFMT', 'GBS_NAMES')}" GBS_ITEMS:append:gbs += " iio-hwmon-battery.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " ${@compose_list(d, 'ENVS', 'GBS_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " ${@compose_list(d, 'ENVS', 'GBS_ITEMS')}" # Fan sensors FITEMS = "pwm-fan-controller@103000.conf" FENVS = "obmc/hwmon/ahb/apb/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " ${@compose_list(d, 'FENVS', 'FITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " ${@compose_list(d, 'FENVS', 'FITEMS')}" EXTRA_OEMESON:append:gbs = " -Dupdate-functional-on-fail=true -Dnegative-errno-on-fail=false" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 23b063fc3..7ad4e2521 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,11 +1,11 @@ FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " obmc/watchdog/host0" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " obmc/watchdog/host0" OBMC_HOST_WATCHDOG_INSTANCES_A = "host0" WATCHDOG_FMT_A = "phosphor-watchdog@{0}.service" -SYSTEMD_OVERRIDE_${PN}:remove:gbs = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" -SYSTEMD_LINK_${PN}:remove:gbs = "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}:remove:gbs = "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_OVERRIDE:${PN}:remove:gbs = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_LINK:${PN}:remove:gbs = "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}:remove:gbs = "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" SYSTEMD_SERVICE:${PN}:gbs = " ${@compose_list(d, 'WATCHDOG_FMT_A', 'OBMC_HOST_WATCHDOG_INSTANCES_A')} \ phosphor-host-watchdog-reset.service \ phosphor-host-watchdog-poweroff.service \ diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 2fb5443fb..d8e2cb14e 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -10,11 +10,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gsj := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 4363aa352..a27865239 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -15,9 +15,9 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS += "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gsj = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # Fan sensors FITEMS = "pwm-fan-controller@103000.conf" FENVS = "obmc/hwmon/ahb/apb/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj = " ${@compose_list(d, 'FENVS', 'FITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gsj = " ${@compose_list(d, 'FENVS', 'FITEMS')}" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 4db5c6501..04f25c1b0 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -17,11 +17,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "${SYSTEMD_DEFAULT_TARGET}" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 9874bc875..54b7ac14f 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -24,7 +24,7 @@ ITEMS = " \ " ENVS = "obmc/hwmon/ahb/apb/{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # PECI PECINAMES = " \ @@ -35,6 +35,6 @@ PECINAMES = " \ PECIITEMSFMT = "devices/platform/ahb/ahb--apb/f0100000.peci-bus/{0}.conf" PECIITEMS = "${@compose_list(d, 'PECIITEMSFMT', 'PECINAMES')}" PECIENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'PECIENVS', 'PECIITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'PECIENVS', 'PECIITEMS')}" EXTRA_OEMESON:append:olympus-nuvoton = " -Dupdate-functional-on-fail=true" diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 3953f8375..48bd7d2a1 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -10,11 +10,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}:append:quanta-q71l := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:quanta-q71l := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index a2da0e3b9..16cc2722a 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -21,6 +21,6 @@ Q71L_PSUBASE = "ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@{0}.conf" Q71L_ITEMS += "${@compose_list(d, 'Q71L_PSUBASE', 'Q71L_PSUS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVS', 'Q71L_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVS', 'Q71L_ITEMS')}" EXTRA_OEMESON:append:quanta-q71l = " -Dnegative-errno-on-fail=true" 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 3e376e12b..59025ad62 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb @@ -22,4 +22,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" 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 8988ff1af..3038ad0b6 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -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/state/phosphor-state-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend index cdd6bf0e7..dce22fc1c 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 @@ -2,4 +2,4 @@ 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}" -- cgit v1.2.3