diff options
| author | jmbills <42755197+jmbills@users.noreply.github.com> | 2019-10-25 19:05:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-25 19:05:18 +0300 |
| commit | 0f1b8401f7058fc88fbcf06c7e98c5ebadc23212 (patch) | |
| tree | 62ed92f532a529b93fb67c19fdaa98a9be9de22a /meta-ingrasys | |
| parent | 35e295e2a161fcf146ea031de53431b2888521fa (diff) | |
| parent | 18fd5aec1c2d90a3f35936cd019604f511ceac53 (diff) | |
| download | openbmc-0f1b8401f7058fc88fbcf06c7e98c5ebadc23212.tar.xz | |
Merge pull request #23 from Intel-BMC/update
Update
Diffstat (limited to 'meta-ingrasys')
5 files changed, 5 insertions, 8 deletions
diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf index 8d0b76be0..2686d406b 100644 --- a/meta-ingrasys/conf/layer.conf +++ b/meta-ingrasys/conf/layer.conf @@ -3,7 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "ingrasys" BBFILE_PATTERN_ingrasys := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ingrasys = "thud warrior" - -# Provide a variable that points the base of the ingrasys layer. -INGRASYSBASE = '${@os.path.normpath("${LAYERDIR}/")}' +LAYERSERIES_COMPAT_ingrasys = "warrior zeus" diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf index 5131c3491..d78ede1a1 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 = "thud warrior" +LAYERSERIES_COMPAT_zaius = "warrior zeus" 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 164a9e75b..dd6d6eec0 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb @@ -2,7 +2,7 @@ SUMMARY = "Zaius AVSBus control" DESCRIPTION = "Voltage regulator module (VRM) AVSBus control for Zaius" PR = "r0" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd 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 f33fe0dc2..597dff4ba 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb @@ -2,7 +2,7 @@ SUMMARY = "Zaius VCS rail control" DESCRIPTION = "VCS voltage rail control implementation for Zaius" PR = "r0" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb index 98dbc15b2..129938f37 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb @@ -1,7 +1,7 @@ SUMMARY = "YAML configuration for Zaius" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit allarch |