Merge branch 'ag/kirkstone-up' into 'kirkstone'

Layers upgrade (kirkstone)

See merge request eclipse/oniro-core/oniro!362

manifests/default.xml

@@ -26,22 +26,22 @@ 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="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="bitbake" remote="openembedded" revision="6603c3e39f1cf746669ec6c9f0be8c6e6ece426e" path="bitbake" />
+	<project name="openembedded-core" remote="openembedded" revision="4781fee6aea9512b7cb390b76e6f9f0a86a5bd11" path="oe-core" />
+	<project name="meta-openembedded" remote="openembedded" revision="744a4b6eda88b9a9ca1cf0df6e18be384d9054e3" 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" />
+	<project name="meta-intel" remote="yocto" revision="01ad1a73aaab49d377d14bad8a7dec48f86cba83" path="meta-intel" />
 	<project name="pub/intel/yocto/meta-seco-intel" remote="seco" revision="65a673560211b11986db5785c70254fad190785f" path="meta-seco-intel" />
-	<project name="meta-freescale" remote="yocto" revision="2e785f257ad98581b684f0e32f6d4bb96faefb10" path="meta-freescale" />
+	<project name="meta-freescale" remote="yocto" revision="3747641f1e71d8e4edd5b587b49d09dc2d243942" path="meta-freescale" />
 	<project name="pub/i.mx/yocto/5.x/meta-seco-imx" remote="seco" revision="f2cb750471dc263bc7c94ca6921cbaf25c37ccba" path="meta-seco-imx" />
-	<project name="meta-raspberrypi" remote="yocto" revision="0135a02ea577bd39dd552236ead2c5894d89da1d" path="meta-raspberrypi" />
+	<project name="meta-raspberrypi" remote="yocto" revision="dacad9302a92b0b7edf8546cdcad1f8ef753e462" path="meta-raspberrypi" />
 	<project name="meta-security" remote="yocto" revision="c79262a30bd385f5dbb009ef8704a1a01644528e" path="meta-security" />
-	<project name="rauc/meta-rauc" remote="github" revision="ea4236412dc4449eff4d52d3ef6b6d230355f936" path="meta-rauc" />
+	<project name="rauc/meta-rauc" remote="github" revision="3796f982df039451f813ec979c431676965263f9" path="meta-rauc" />
 	<project name="riscv/meta-riscv" remote="github" revision="70e099d7ceca52a1dde2c978713012f6b20a9891" path="meta-riscv" />
-	<project name="meta-arm" remote="yocto" revision="78fce73c3803aba82149a3a03fde1b708f5424fa" path="meta-arm" />
+	<project name="meta-arm" remote="yocto" revision="bafd1d013c2470bcec123ba4eb8232ab879b2660" path="meta-arm" />
 	<project name="jiazhang0/meta-secure-core" remote="github" revision="1a74be5b363ee61256093e0a3efaa78fd370a27c" path="meta-secure-core" />
 	<project name="pub/rockchip/meta-seco-rockchip" remote="seco" revision="5cba7ff673fd81a2e640202d61b1c5cc7b10b161" path="meta-seco-rockchip" />
-	<project name="meta-virtualization" remote="yocto" revision="e11d5b630e6b5626b58b742b80f5bdf277a44168" path="meta-virtualization" />
+	<project name="meta-virtualization" remote="yocto" revision="9a487c1851aa2021cf24f951957e22fd429c8025" path="meta-virtualization" />
 
 	<!--
 		All entries above are pinned to a specific revision and updated manually.

meta-oniro-core/conf/distro/oniro-linux.conf

@@ -113,9 +113,6 @@ ROOTFS_RO_UNNEEDED:remove = "shadow"
 # Set default hostname to reflect the DISTRO
 hostname:pn-base-files = "${DISTRO}-${MACHINE}"
 
-# Workaround for https://bugzilla.yoctoproject.org/show_bug.cgi?id=14858
-PACKAGE_EXCLUDE_COMPLEMENTARY:append = " openssh"
-
 #
 # Add support for Raspberry Pi 4 (64) in the Raspberry Pi 4 (64) builds.
 #

meta-oniro-core/recipes-core/images/oniro-image-common.inc

@@ -11,6 +11,7 @@ inherit oniro-image
 IMAGE_FEATURES:remove = " nfs-server nfs-client nfs-utils"
 
 IMAGE_INSTALL:append = "\
+			packagegroup-core-ssh-dropbear \
 			packagegroup-oniro-containers \
 			packagegroup-oniro-core \
 			packagegroup-net-essentials \

meta-oniro-core/recipes-core/packagegroups/packagegroup-connectivity.bb

@@ -13,8 +13,6 @@ PACKAGES = "\
 	"
 
 RDEPENDS:packagegroup-net-essentials = "\
-	dropbear \
-	openssh-sftp-server \
 	${@bb.utils.contains("COMBINED_FEATURES", "wifi", "packagegroup-base-wifi iw", "", d)} \
 	networkmanager \
 	networkmanager-nmcli \