From a510052801d810d1789d0065b0dc07963c5f5366 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan <andrei.gherzan@huawei.com> Date: Mon, 5 Sep 2022 13:10:42 +0200 Subject: [PATCH] oniro-linux.conf: Drop shadow warning workaround Upstream (oe-core) merged a patch that supresses the warning/errors raised by shadow on musl systems. Merged in oe-core, kirkstone e5ce33228858fcc12051548399c71ce10346bf5b. This revision is included in the last oe-core bump. Related to https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/issues/772 Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> --- meta-oniro-core/conf/distro/oniro-linux.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf index 37e882ea..e097ede7 100644 --- a/meta-oniro-core/conf/distro/oniro-linux.conf +++ b/meta-oniro-core/conf/distro/oniro-linux.conf @@ -111,11 +111,6 @@ require conf/distro/include/openharmony.inc # OpenHarmony requires musl libc, so we cannot allow other TCLIBC values TCLIBC:df-openharmony = "musl" -# The libnss configuration file is only installed when glibc is used. The -# innexistence of it on a musl-based rootfs, will make shadow complain about -# it. -IMAGE_LOG_CHECK_EXCLUDES:libc-musl += "Failed opening /etc/nsswitch.conf" - # We run a read-only rootfs but we want shadow because it includes subid # configuration used by podman in rootless mode. ROOTFS_RO_UNNEEDED:remove = "shadow" -- GitLab