diff options
author | jmbills <jason.m.bills@intel.com> | 2022-01-18 21:55:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-18 21:55:05 +0300 |
commit | 7cf0c1cd0ce835d1833509b7b911e8a97380278b (patch) | |
tree | 0b45c3beaa9874facc4ed1a2395a31e42be0135d /meta-google/recipes-phosphor | |
parent | 4dac5fcd49b5e2de1074f1363775ec0f19041072 (diff) | |
parent | 1fc0d70f658da30091bcd49f9bf29aecd6b99ba7 (diff) | |
download | openbmc-7cf0c1cd0ce835d1833509b7b911e8a97380278b.tar.xz |
Merge pull request #76 from Intel-BMC/update1-0.86
Update
Diffstat (limited to 'meta-google/recipes-phosphor')
3 files changed, 2 insertions, 27 deletions
diff --git a/meta-google/recipes-phosphor/console/glome_git.bb b/meta-google/recipes-phosphor/console/glome_git.bb deleted file mode 100644 index 4750de8be..000000000 --- a/meta-google/recipes-phosphor/console/glome_git.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "GLOME Login Client" -DESCRIPTION = "GLOME login is first application of the GLOME protocol. It is used to authorize serial console access to Linux machines" -PR = "r1" -PV = "0.1+git${SRCPV}" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -inherit meson pkgconfig - -DEPENDS += " \ - openssl \ - glib-2.0 \ - " - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/google/glome.git" -SRCREV = "b7084b5c60682a0b4f4ae3f2ec6048e65212c377" - -FILES_${PN} += "${libdir}/security" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[glome-cli] = "-Dglome-cli=true,-Dglome-cli=false" -PACKAGECONFIG[pam-glome] = "-Dpam-glome=true,-Dpam-glome=false,libpam" - -EXTRA_OEMESON = "-Dtests=disabled" diff --git a/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/whitelist b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/whitelist index a2244cca8..f91495077 100644 --- a/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/whitelist +++ b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs/whitelist @@ -4,3 +4,4 @@ /etc/systemd/network /var/google /var/lib/phosphor-inventory-manager +/var/lib/smbios/smbios2 diff --git a/meta-google/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-google/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 46135c3d5..76ec9a53c 100644 --- a/meta-google/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-google/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -8,4 +8,4 @@ RDEPENDS:${PN}-extras:remove:gbmc = "phosphor-nslcd-authority-cert-config" RDEPENDS:${PN}-extrasdev:remove:gbmc = "rest-dbus" # Disable bmcweb for gbmc machines without redfish. -RDEPENDS:${PN}-extras:remove:gbmc = '${@bb.utils.contains:any("MACHINE_FEATURES", ['redfish'], "", "bmcweb phosphor-bmcweb-cert-config", d)}' +RDEPENDS:${PN}-extras:remove:gbmc = '${@bb.utils.contains:any("MACHINE_FEATURES", ['redfish'], "", "bmcweb", d)}' |