Merge branch 'ag/subid/oe-core-up' into 'kirkstone'

Bump oe-core/bitbake to drop local support/fixes as upstream caught up

Closes #772 and #771

See merge request !301

manifests/default.xml

@@ -25,8 +25,8 @@ SPDX-FileCopyrightText: Huawei Inc.
 	<remote name="openembedded" fetch="git://git.openembedded.org" />
 	<remote name="seco" fetch="https://git.seco.com" />
 
-	<project name="bitbake" remote="openembedded" revision="bc85c044ec250001855f2f9f0717ac031feab7c2" path="bitbake" />
-	<project name="openembedded-core" remote="openembedded" revision="54ee67b1a805a07288925d56e9956aabc23b6ab2" path="oe-core" />
+	<project name="bitbake" remote="openembedded" revision="ce9fe70156e8f909a3a81da017b89ea61bc6fe38" path="bitbake" />
+	<project name="openembedded-core" remote="openembedded" revision="2363d69d687fc8e53a7c97bf5300e59c9a04f22e" path="oe-core" />
 	<project name="meta-openembedded" remote="openembedded" revision="acbe74879807fc6f82b62525d32c823899e19036" path="meta-openembedded" />
 	<project name="aehs29/meta-freertos" remote="github" revision="0d0f168b1bbcdfa8d88d97eefc206a18802a66eb" path="meta-freertos" />
 	<project name="meta-intel" remote="yocto" revision="15cdda250fc5aa762ac0139087f96411ca696036" path="meta-intel" />

meta-oniro-core/classes/oniro-image.bbclass

@@ -139,16 +139,3 @@ python deploy_boot_artifacts_to_rootfs() {
         run_cmd(install_cmd)
 }
 ROOTFS_POSTPROCESS_COMMAND += "deploy_boot_artifacts_to_rootfs;"
-
-python () {
-    d.appendVar('ROOTFS_POSTPROCESS_COMMAND', ' clean_backup_files; ')
-}
-python clean_backup_files () {
-    # Cleanup other backup files generated by shadow-utils not covered by the
-    # sort_passwd existing rootfs postcommand.
-    # https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/issues/772
-    import rootfspostcommands
-    for file in ['subuid', 'subgid']:
-        filename = os.path.join(d.expand('${IMAGE_ROOTFS}${sysconfdir}'), file)
-        rootfspostcommands.remove_backup(filename)
-}

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"

meta-oniro-core/recipes-extended/shadow/shadow_%.bbappend

@@ -10,11 +10,3 @@
 # -Werror=format-nonliteral globally in OPTIMIZE_FOR=security mode
 # while keeping shadow building.
 TARGET_CFLAGS:remove = "-Werror=format-nonliteral"
-
-do_install:append () {
-	# usermod requires the subuid/subgid files to be in place before being
-	# able to use the -v/-V flags otherwise it fails:
-	# usermod: /etc/subuid does not exist, you cannot use the flags -v or -V
-	touch ${D}${sysconfdir}/subuid
-	touch ${D}${sysconfdir}/subgid
-}