diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-05-24 22:35:24 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-05-24 22:35:24 +0300 |
| commit | 0e0df451ae365f09d5c0c766b253f23de26901f2 (patch) | |
| tree | db4d7d3ce85e02ee01ad58a86ede02ac876aae77 /meta-phosphor/classes | |
| parent | e370fd750e2821620ec427f26f8efab0069824ff (diff) | |
| parent | 7e10dee74964afa47859704886128dd256acf854 (diff) | |
| download | openbmc-0e0df451ae365f09d5c0c766b253f23de26901f2.tar.xz | |
Merge tag '0.52' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/classes')
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image.bbclass | 4 | ||||
| -rw-r--r-- | meta-phosphor/classes/phosphor-logging.bbclass | 1 | ||||
| -rw-r--r-- | meta-phosphor/classes/phosphor-networkd-rev.bbclass | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 0a07fc6f4..c83dce32f 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -88,7 +88,9 @@ remove_etc_version() { } enable_ldap_nsswitch() { - sed -i 's/\(\(passwd\|group\|shadow\):\s*\).*/\1files ldap/' \ + sed -i 's/\(\(passwd\|group\):\s*\).*/\1files systemd ldap/' \ + "${IMAGE_ROOTFS}${sysconfdir}/nsswitch.conf" + sed -i 's/\(shadow:\s*\).*/\1files ldap/' \ "${IMAGE_ROOTFS}${sysconfdir}/nsswitch.conf" } diff --git a/meta-phosphor/classes/phosphor-logging.bbclass b/meta-phosphor/classes/phosphor-logging.bbclass index 48676f4ff..18f53d434 100644 --- a/meta-phosphor/classes/phosphor-logging.bbclass +++ b/meta-phosphor/classes/phosphor-logging.bbclass @@ -1,2 +1 @@ callouts_datadir="${datadir}/phosphor-logging/callouts" -elog_dir = "${datadir}/phosphor-logging/elog" diff --git a/meta-phosphor/classes/phosphor-networkd-rev.bbclass b/meta-phosphor/classes/phosphor-networkd-rev.bbclass index eb4e915a0..94d599fa0 100644 --- a/meta-phosphor/classes/phosphor-networkd-rev.bbclass +++ b/meta-phosphor/classes/phosphor-networkd-rev.bbclass @@ -1,2 +1,2 @@ SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "a5a0944ccb8d925d6d83897b1e2397e85564ea1e" +SRCREV = "a1b897e2a38b0ead01fb02cc647326c1d1035870" |