Merge branch 'testing_bb_benchmarks' into testing-5.15-umulti

Resolve conflict for core-image-minimal.bbappend

diff --cc meta-baikal/recipes-core/images/core-image-minimal.bbappend
index 1258a0711bf3f8eeeab16d85723fdcc3fb67ee9b,6ce8e929727ef965b5d689d68988f49eb84b0f12..a14d61992569fc32afe635170f59e03ab3732b9d
--- 1/meta-baikal/recipes-core/images/core-image-minimal.bbappend
--- 2/meta-baikal/recipes-core/images/core-image-minimal.bbappend
+++ b/meta-baikal/recipes-core/images/core-image-minimal.bbappend
@@@ -2,13 -2,14 +2,15 @@@ IMAGE_ROOTFS_SIZE = "32768
  IMAGE_NAME = "${PN}-baikal"
  
  RDEPENDS:append = " kernel-modules"
- IMAGE_INSTALL:append = " kernel-modules"
 -#IMAGE_INSTALL:append = " kernel-modules"
  IMAGE_INSTALL:append = " dropbear"
 -#IMAGE_INSTALL:append = " e2fsprogs"
 -#MAGE_INSTALL:append = " strace"
 -#IMAGE_INSTALL:append = " kexec-tools"
 -# IMAGE_INSTALL:append = " i2c-tools"
 +IMAGE_INSTALL:append = " e2fsprogs"
 +IMAGE_INSTALL:append = " strace"
 +IMAGE_INSTALL:append = " kexec-tools"
 +IMAGE_INSTALL:append = " ethtool"
 +IMAGE_INSTALL:append = " pciutils"
++IMAGE_INSTALL:append = " i2c-tools"
+ IMAGE_INSTALL:append = " lmsensors-sensors"
+ IMAGE_INSTALL:append = " benchmarks"
  EXTRA_IMAGE_FEATURES += "debug-tweaks"
  
  baikal_deploy () {