diff options
| author | Zev Weiss <zev@bewilderbeest.net> | 2021-09-01 06:33:52 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-09-16 00:23:34 +0300 |
| commit | b282c16c4d36e1e4e862cdf3902b3dc4fddffab4 (patch) | |
| tree | 362b8ef2eeeb302f41127d43b875cd3575f711ff /meta-asrock | |
| parent | 0f80cdafb1c14b286e407a284ff12ed874f2113c (diff) | |
| download | openbmc-b282c16c4d36e1e4e862cdf3902b3dc4fddffab4.tar.xz | |
meta-asrock: catch up with yocto updates
Override variable syntax change, honister compat, and a CONF_VERSION
bump.
Fixes openbmc/openbmc#3816.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Change-Id: Ia41d159d8118e5dba4b213bb0f7c2d61753c8ad3
Diffstat (limited to 'meta-asrock')
4 files changed, 10 insertions, 10 deletions
diff --git a/meta-asrock/conf/layer.conf b/meta-asrock/conf/layer.conf index 4c06d8774..37982235f 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 = "hardknott" +LAYERSERIES_COMPAT_asrock-layer = "hardknott honister" diff --git a/meta-asrock/meta-e3c246d4i/conf/layer.conf b/meta-asrock/meta-e3c246d4i/conf/layer.conf index 6b8e77192..818561136 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 = "hardknott" +LAYERSERIES_COMPAT_e3c246d4i-layer = "hardknott honister" diff --git a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample b/meta-asrock/meta-e3c246d4i/conf/local.conf.sample index 1c86431f9..fa8e7f068 100644 --- a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample +++ b/meta-asrock/meta-e3c246d4i/conf/local.conf.sample @@ -1,7 +1,7 @@ MACHINE ??= "e3c246d4i" DISTRO ?= "openbmc-phosphor" PACKAGE_CLASSES ?= "package_rpm" -SANITY_TESTED_DISTROS_append ?= " *" +SANITY_TESTED_DISTROS:append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" PATCHRESOLVE = "noop" @@ -14,7 +14,7 @@ BB_DISKMON_DIRS = "\ ABORT,${DL_DIR},100M,1K \ ABORT,${SSTATE_DIR},100M,1K \ ABORT,/tmp,10M,1K" -CONF_VERSION = "1" +CONF_VERSION = "2" INHERIT += "extrausers" EXTRA_USERS_PARAMS = " \ usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ diff --git a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb index 22619cf0f..e9f676dc8 100644 --- a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb +++ b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb @@ -12,17 +12,17 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-flash-mgmt" PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" -SUMMARY_${PN}-flash = "ASRock Flash" -RDEPENDS_${PN}-flash = " \ +SUMMARY:${PN}-flash = "ASRock Flash" +RDEPENDS:${PN}-flash = " \ obmc-control-bmc \ phosphor-ipmi-flash \ " -SUMMARY_${PN}-system = "ASRock System" -RDEPENDS_${PN}-system = " \ +SUMMARY:${PN}-system = "ASRock System" +RDEPENDS:${PN}-system = " \ bmcweb \ entity-manager \ dbus-sensors \ |