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/recipes-core | |
| 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/recipes-core')
3 files changed, 3 insertions, 1 deletions
diff --git a/meta-phosphor/recipes-core/base-files/base-files_%.bbappend b/meta-phosphor/recipes-core/base-files/base-files_%.bbappend index b6c4222b2..30e562325 100644 --- a/meta-phosphor/recipes-core/base-files/base-files_%.bbappend +++ b/meta-phosphor/recipes-core/base-files/base-files_%.bbappend @@ -10,6 +10,8 @@ SRC_URI += " \ " do_install_append() { + sed -i 's/\(\(passwd\|group\):\s*\).*/\1files systemd/' \ + "${D}${sysconfdir}/nsswitch.conf" install -d ${D}/srv diff --git a/meta-phosphor/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/meta-phosphor/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend index e111a4d95..b8648cabf 100644 --- a/meta-phosphor/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend +++ b/meta-phosphor/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend @@ -2,5 +2,4 @@ RDEPENDS_${PN}_append = " \ nativesdk-autoconf-archive \ nativesdk-meson \ nativesdk-python3-sdbus++ \ - nativesdk-phosphor-logging-elog \ " diff --git a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend index f1046de20..1f0b95e39 100644 --- a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend +++ b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend @@ -6,6 +6,7 @@ PACKAGECONFIG = "\ hostnamed \ kmod \ networkd \ + nss \ pam \ randomseed \ resolved \ |