From: Baikal Electronics <support@baikalelectronics.ru>
Date: Fri, 27 Jan 2023 13:52:48 +0000 (+0300)
Subject: Merge branch 'testing_bb_benchmarks' into testing-5.15-umulti
X-Git-Tag: baikal/mips/sdk6.1~14
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=5cd7a01edb4b129466d09b26364ac9f5d64e283d;p=openembedded-baikal.git

Merge branch 'testing_bb_benchmarks' into testing-5.15-umulti

Resolve conflict for core-image-minimal.bbappend
---

5cd7a01edb4b129466d09b26364ac9f5d64e283d
diff --cc meta-baikal/recipes-core/images/core-image-minimal.bbappend
index 1258a07,6ce8e92..a14d619
--- a/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 () {