From 2b6400a106d4effe5222d7507881c17a9352bcf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kr=C3=B3l?= <piotr.krol@3mdeb.com>
Date: Tue, 18 Jun 2024 00:59:59 +0200
Subject: [PATCH 01/99] dts-base-image: add lshw
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Piotr Król <piotr.krol@3mdeb.com>
---
 meta-dts-distro/recipes-dts/images/dts-base-image.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-dts-distro/recipes-dts/images/dts-base-image.inc b/meta-dts-distro/recipes-dts/images/dts-base-image.inc
index 0615ff9c..128fa6d9 100644
--- a/meta-dts-distro/recipes-dts/images/dts-base-image.inc
+++ b/meta-dts-distro/recipes-dts/images/dts-base-image.inc
@@ -16,6 +16,7 @@ IMAGE_INSTALL:append = " \
     libxcrypt-compat \
     alsa-utils-aplay \
     hw-probe \
+    lshw \
 "
 
 # Enable local auto-login of the root user (local = serial port and

From 400c96002c37568b91dae9d5037bad9ccc0339be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kr=C3=B3l?= <piotr.krol@3mdeb.com>
Date: Tue, 25 Jun 2024 12:08:59 +0200
Subject: [PATCH 02/99] meta-dts-distro: add python3-roca-detect
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Piotr Król <piotr.krol@3mdeb.com>
---
 .../python/python3-roca-detect_git_1.2.12.bb  | 45 +++++++++++++++++++
 .../packagegroups/packagegroup-dts.bb         |  1 +
 2 files changed, 46 insertions(+)
 create mode 100644 meta-dts-distro/recipes-devtool/python/python3-roca-detect_git_1.2.12.bb

diff --git a/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git_1.2.12.bb b/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git_1.2.12.bb
new file mode 100644
index 00000000..bd15657b
--- /dev/null
+++ b/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git_1.2.12.bb
@@ -0,0 +1,45 @@
+# Recipe created by recipetool
+# This is the basis of a recipe and may need further editing in order to be fully functional.
+# (Feel free to remove these comments when editing.)
+
+SUMMARY = "ROCA key detector / fingerprinter tool"
+HOMEPAGE = "https://github.com/crocs-muni/roca"
+# NOTE: License in setup.py/PKGINFO is: MIT
+# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is
+# your responsibility to verify that the values are complete and correct.
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2a6b12210371b9201fd100ff0cbef45a"
+
+SRC_URI = "git://github.com/crocs-muni/roca;protocol=https;branch=master"
+
+# Modify these as desired
+PV = "v1.2.12+git"
+SRCREV = "df6071d502f68701427f8b1d409cab22055ad1b7"
+
+S = "${WORKDIR}/git"
+
+inherit setuptools3
+
+# WARNING: the following rdepends are determined through basic analysis of the
+# python sources, and might not be 100% accurate.
+RDEPENDS:${PN} += "python3-compression python3-core python3-crypt python3-datetime python3-io python3-json python3-logging python3-math python3-netclient python3-unittest"
+
+# WARNING: We were unable to map the following python package/module
+# dependencies to the bitbake packages which include them:
+#    apk_parse.apk
+#    coloredlogs
+#    cryptography.hazmat.backends
+#    cryptography.hazmat.backends.openssl.backend
+#    cryptography.hazmat.backends.openssl.x509
+#    cryptography.hazmat.primitives
+#    cryptography.hazmat.primitives.asymmetric.rsa
+#    cryptography.hazmat.primitives.serialization
+#    cryptography.x509
+#    cryptography.x509.base
+#    cryptography.x509.oid
+#    future.utils
+#    jks
+#    past.builtins
+#    pgpdump.data
+#    pgpdump.packet
+#    pkg_resources
diff --git a/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb b/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
index 9d907a97..eacb03fd 100644
--- a/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
+++ b/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
@@ -55,4 +55,5 @@ RDEPENDS:${PN}-tools-dts = " \
 RDEPENDS:${PN}-python = " \
     python3-binwalk \
     python3-uefi-firmware \
+    python3-roca-detect \
 "

From 3c3461f2ad5d789d491e5ff2e4f9d9038fa8426e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kr=C3=B3l?= <piotr.krol@3mdeb.com>
Date: Thu, 27 Jun 2024 11:51:59 +0200
Subject: [PATCH 03/99] meta-dts-distro: add rdepends for python3-roca-detect
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Piotr Król <piotr.krol@3mdeb.com>
---
 .../recipes-devtool/python/python3-roca-detect_git_1.2.12.bb    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git_1.2.12.bb b/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git_1.2.12.bb
index bd15657b..2670b303 100644
--- a/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git_1.2.12.bb
+++ b/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git_1.2.12.bb
@@ -22,7 +22,7 @@ inherit setuptools3
 
 # WARNING: the following rdepends are determined through basic analysis of the
 # python sources, and might not be 100% accurate.
-RDEPENDS:${PN} += "python3-compression python3-core python3-crypt python3-datetime python3-io python3-json python3-logging python3-math python3-netclient python3-unittest"
+RDEPENDS:${PN} += "python3-compression python3-core python3-crypt python3-datetime python3-io python3-json python3-logging python3-math python3-netclient python3-unittest python3-future python3-coloredlogs"
 
 # WARNING: We were unable to map the following python package/module
 # dependencies to the bitbake packages which include them:

From 2c593d7b97f58d831eeba3b26c7e5d4bbfb0fd20 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Thu, 27 Jun 2024 17:09:55 +0200
Subject: [PATCH 04/99] Revert "dts: Remove separate EC update when updating
 Dasharo"

This reverts commit 1b1e70f83b40d7229d06cebbe6eea06a8ec32499.

We needs this **after** we publish releases with auto EC update
for all boards.
---
 .../dts/dasharo-deploy/dasharo-deploy         | 72 ++++++++++++++-----
 .../recipes-dts/dts/dts/dts-functions.sh      |  4 +-
 2 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy b/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy
index 7736460e..f0843358 100755
--- a/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy
+++ b/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy
@@ -462,6 +462,13 @@ install() {
   fi
 }
 
+update_ec() {
+  verify_artifacts ec
+  echo "Updating EC..."
+  $DASHARO_ECTOOL flash "$EC_UPDATE_FILE" &>> $ERR_LOG_FILE
+  error_check "Failed to update EC firmware"
+}
+
 update() {
   local _can_switch_to_heads="false"
 
@@ -482,11 +489,21 @@ update() {
         BIOS_HASH_LINK=$BIOS_HASH_LINK_COMM
         BIOS_SIGN_LINK=$BIOS_SIGN_LINK_COMM
         BIOS_LINK=$BIOS_LINK_COMM
+        if [ "$HAVE_EC" == "true" ]; then
+          EC_HASH_LINK=$EC_HASH_LINK_COMM
+          EC_SIGN_LINK=$EC_SIGN_LINK_COMM
+          EC_LINK=$EC_LINK_COMM
+        fi
         UPDATE_VERSION=$DASHARO_REL_VER
       else
         BIOS_HASH_LINK=$BIOS_HASH_LINK_DES
         BIOS_SIGN_LINK=$BIOS_SIGN_LINK_DES
         BIOS_LINK=$BIOS_LINK_DES
+        if [ "$HAVE_EC" == "true" ]; then
+          EC_HASH_LINK=$EC_HASH_LINK_DES
+          EC_SIGN_LINK=$EC_SIGN_LINK_DES
+          EC_LINK=$EC_LINK_DES
+        fi
         UPDATE_VERSION=$DASHARO_REL_VER_DES
       fi
     else
@@ -496,6 +513,11 @@ update() {
       BIOS_HASH_LINK=$BIOS_HASH_LINK_COMM
       BIOS_SIGN_LINK=$BIOS_SIGN_LINK_COMM
       BIOS_LINK=$BIOS_LINK_COMM
+      if [ "$HAVE_EC" == "true" ]; then
+        EC_HASH_LINK=$EC_HASH_LINK_COMM
+        EC_SIGN_LINK=$EC_SIGN_LINK_COMM
+        EC_LINK=$EC_LINK_COMM
+      fi
       UPDATE_VERSION=$DASHARO_REL_VER
     fi
     if [ -v HAVE_HEADS_FW ] && [ "$DASHARO_FLAVOR" != "Dasharo (coreboot+heads)" ]; then
@@ -528,6 +550,11 @@ update() {
     BIOS_HASH_LINK=$BIOS_HASH_LINK_COMM
     BIOS_SIGN_LINK=$BIOS_SIGN_LINK_COMM
     BIOS_LINK=$BIOS_LINK_COMM
+    if [ "$HAVE_EC" == "true" ]; then
+      EC_HASH_LINK=$EC_HASH_LINK_COMM
+      EC_SIGN_LINK=$EC_SIGN_LINK_COMM
+      EC_LINK=$EC_LINK_COMM
+    fi
     UPDATE_VERSION=$DASHARO_REL_VER
     if [ -v HAVE_HEADS_FW ] && [ "$DASHARO_FLAVOR" != "Dasharo (coreboot+heads)" ]; then
       print_green "Dasharo heads firmware version is available. If you are interested,"
@@ -676,25 +703,32 @@ update() {
     print_green "Successfully updated Dasharo firmware."
   fi
 
-  echo -n "Syncing disks... "
-  sync
-  echo "Done."
-  echo "The computer will reboot automatically in 5 seconds"
-  sleep 0.5
-  echo "Rebooting in 5s:"
-  echo "5..."
-  sleep 1
-  echo "4..."
-  sleep 1
-  echo "3..."
-  sleep 1
-  echo "2..."
-  sleep 1
-  echo "1..."
-  sleep 0.5
-  echo "Rebooting"
-  sleep 1
-  ${CMD_REBOOT}
+  if [ "$HAVE_EC" == "true" ]; then
+    echo "Updating Embedded Controller firmware. Your computer will power off automatically when done."
+    update_ec # Ends in a reset, does not exit
+  else
+    echo -n "Syncing disks... "
+    sync
+    echo "Done."
+    echo "The computer will reboot automatically in 5 seconds"
+    sleep 0.5
+    echo "Rebooting in 5s:"
+    echo "5..."
+    sleep 1
+    echo "4..."
+    sleep 1
+    echo "3..."
+    sleep 1
+    echo "2..."
+    sleep 1
+    echo "1..."
+    sleep 0.5
+    echo "Rebooting"
+    sleep 1
+    ${CMD_REBOOT}
+  fi
+
+
 }
 
 restore() {
diff --git a/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh b/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh
index 09486aa1..cfe2b9af 100644
--- a/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh
+++ b/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh
@@ -796,7 +796,7 @@ download_artifacts() {
     curl -s -L -f "$BIOS_SIGN_LINK" -o $BIOS_SIGN_FILE
     error_check "Cannot access $FW_STORE_URL while downloading signature. Please
    check your internet connection"
-    if [ "$HAVE_EC" == "true" ] && [ -v EC_LINK ]; then
+    if [ "$HAVE_EC" == "true" ]; then
       curl -s -L -f "$EC_LINK" -o "$EC_UPDATE_FILE"
       error_check "Cannot access $FW_STORE_URL while downloading binary. Please
      check your internet connection"
@@ -818,7 +818,7 @@ download_artifacts() {
     curl -s -L -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$BIOS_SIGN_LINK" -o $BIOS_SIGN_FILE
     error_check "Cannot access $FW_STORE_URL_DES while downloading signature.
    Please check your internet connection and credentials"
-    if [ "$HAVE_EC" == "true" ] && [ -v EC_LINK ]; then
+    if [ "$HAVE_EC" == "true" ]; then
       if [ -v EC_LINK_COMM ] && [ ${EC_LINK} == ${EC_LINK_COMM} ]; then
         curl -s -L -f "$EC_LINK" -o "$EC_UPDATE_FILE"
         error_check "Cannot access $FW_STORE_URL while downloading binary. Please

From 652f2434a7a9bee855d48aa72b6bfab8ddeb21b9 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Thu, 27 Jun 2024 17:18:20 +0200
Subject: [PATCH 05/99] CHANGELOG.md: add v1.2.22

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 108d3373..464c9443 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 All notable changes to the DTS project will be documented in this file.
 
+## v1.2.22 - 2024-06-27
+
+* Extended Dasharo zero-touch initial deployment on PCEngines APU2 platforms for
+  [DES](https://docs.dasharo.com/ways-you-can-help-us/#become-a-dasharo-entry-subscription-subscriber)
+  users with SeaBIOS firmware variant, in addition to UEFI variant.
+* Increase supported Dasharo (coreboot + heads) version from  v0.9.0 to v0.9.1
+  for NovaCustom NV4x 12th Gen series
+* Include new tools into the image: `python3-roca-detect`, `iperf3`, `lshw`
+* Fix [Dell Optiplex 7010 initial deployment](https://github.com/Dasharo/dasharo-issues/issues/706)
+* Update versions of coreboot-utils
+
 ## v1.2.21 - 2024-03-29
 
 * Added Dasharo zero-touch initial deployment on PCEngines APU2 platforms for

From c59ebecd42964824ea91af7977121cf4699f9039 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Thu, 27 Jun 2024 17:38:20 +0200
Subject: [PATCH 06/99] dasharo-deploy: preserve settings for seabios initial
 deploy

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 .../recipes-dts/dts/dasharo-deploy/dasharo-deploy         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy b/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy
index f0843358..b78cbc1c 100755
--- a/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy
+++ b/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy
@@ -428,7 +428,13 @@ install() {
   fi
 
   echo "Installing Dasharo firmware..."
-  $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_REGIONS} -w "$BIOS_UPDATE_FILE" >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
+  # FIXME: It seems we do not have an easy way to add some flasrhom extra args
+  # globally for specific platform and variant
+  local _flashrom_extra_args=""
+  if [ "${BIOS_LINK}" = "${BIOS_LINK_DES_SEABIOS}" ]; then
+    _flashrom_extra_args = "--fmap -i COREBOOT"
+  fi
+  $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_REGIONS} -w "$BIOS_UPDATE_FILE" "${_flashrom_extra_args}" >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
   error_check "Failed to install Dasharo firmware"
 
   print_green "Successfully installed Dasharo firmware"

From c61b14971764b2f0661d360b55c452e51eacf921 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Thu, 27 Jun 2024 18:33:19 +0200
Subject: [PATCH 07/99] dts-functions: support seabios in check_se_creds()

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh b/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh
index cfe2b9af..c053a77c 100644
--- a/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh
+++ b/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh
@@ -691,6 +691,7 @@ check_flash_chip() {
 check_se_creds() {
   local _check_dwn_req_resp_uefi="0"
   local _check_dwn_req_resp_heads="0"
+  local _check_dwn_req_resp_seabios="0"
   local _check_logs_req_resp="0"
   CLOUDSEND_LOGS_URL=$(sed -n '1p' < ${SE_credential_file} | tr -d '\n')
   CLOUDSEND_DOWNLOAD_URL=$(sed -n '2p' < ${SE_credential_file} | tr -d '\n')
@@ -699,7 +700,7 @@ check_se_creds() {
   board_config
   TEST_LOGS_URL="https://cloud.3mdeb.com/index.php/s/${CLOUDSEND_LOGS_URL}/authenticate/showShare"
 
-  if [ ! -v BIOS_LINK_DES ] && [ ! -v HEADS_LINK_DES ]; then
+  if [ ! -v BIOS_LINK_DES ] && [ ! -v HEADS_LINK_DES ] && [ ! -v BIOS_LINK_DES_SEABIOS ]; then
     error_exit "There is no Dasharo Entry Subscription available for your platform!"
   fi
 
@@ -710,9 +711,12 @@ check_se_creds() {
     if [ -v HEADS_LINK_DES ]; then
       _check_dwn_req_resp_heads=$(curl -L -I -s -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$HEADS_LINK_DES" -o /dev/null -w "%{http_code}")
     fi
+    if [ -v BIOS_LINK_DES_SEABIOS ]; then
+      _check_dwn_req_resp_seabios=$(curl -L -I -s -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$BIOS_LINK_DES_SEABIOS" -o /dev/null -w "%{http_code}")
+    fi
 
     _check_logs_req_resp=$(curl -L -I -s -f -H "$CLOUD_REQUEST" "$TEST_LOGS_URL" -o /dev/null -w "%{http_code}")
-    if [ ${_check_dwn_req_resp_uefi} -eq 200 ] || [ ${_check_dwn_req_resp_heads} -eq 200 ]; then
+    if [ ${_check_dwn_req_resp_uefi} -eq 200 ] || [ ${_check_dwn_req_resp_heads} -eq 200 ] || [ ${_check_dwn_req_resp_seabios} -eq 200 ]; then
       if [ ${_check_logs_req_resp} -eq 200 ]; then
         return 0
       else

From 73333676c1058a960a05c0a3e50ad234a1bd1777 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Thu, 27 Jun 2024 22:15:41 +0200
Subject: [PATCH 08/99] dasharo-deploy: fix flashrom_extra_args

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy b/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy
index b78cbc1c..03aac319 100755
--- a/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy
+++ b/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy
@@ -432,9 +432,9 @@ install() {
   # globally for specific platform and variant
   local _flashrom_extra_args=""
   if [ "${BIOS_LINK}" = "${BIOS_LINK_DES_SEABIOS}" ]; then
-    _flashrom_extra_args = "--fmap -i COREBOOT"
+    _flashrom_extra_args="--fmap -i COREBOOT"
   fi
-  $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_REGIONS} -w "$BIOS_UPDATE_FILE" "${_flashrom_extra_args}" >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
+  $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_REGIONS} -w "$BIOS_UPDATE_FILE" ${_flashrom_extra_args} >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
   error_check "Failed to install Dasharo firmware"
 
   print_green "Successfully installed Dasharo firmware"

From 377e0b637fa894194ad2949dfc141e36f3bb30b0 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Thu, 27 Jun 2024 22:58:07 +0200
Subject: [PATCH 09/99] dts-distro.conf: bump to v1.2.23

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 meta-dts-distro/conf/distro/dts-distro.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/conf/distro/dts-distro.conf b/meta-dts-distro/conf/distro/dts-distro.conf
index d12bce28..709120df 100644
--- a/meta-dts-distro/conf/distro/dts-distro.conf
+++ b/meta-dts-distro/conf/distro/dts-distro.conf
@@ -4,7 +4,7 @@ DISTRO = "dts-distro"
 
 # distro name
 DISTRO_NAME = "Dasharo Tools Suite"
-DISTRO_VERSION = "1.2.22"
+DISTRO_VERSION = "1.2.23"
 SDK_VENDOR = "-dtssdk"
 
 MAINTAINER = "3mdeb Sp. z o. o. <contact@3mdeb.com>"

From 4b030b6a7ff755a1ad6987f9b3fdd1c07c2a537d Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Thu, 27 Jun 2024 23:00:42 +0200
Subject: [PATCH 10/99] CHANGELOG.md: v1.2.23

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 464c9443..1e5c0c60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the DTS project will be documented in this file.
 
+## v1.2.23 - 2024-06-27
+
+* Hotfix for PC Engines SeaBIOS firmware variant deployment
+
 ## v1.2.22 - 2024-06-27
 
 * Extended Dasharo zero-touch initial deployment on PCEngines APU2 platforms for

From 2d570406b7c97c8cb810f6f918f97167aa68f681 Mon Sep 17 00:00:00 2001
From: Tymoteusz Burak <tymoteusz.burak@3mdeb.com>
Date: Mon, 8 Jul 2024 16:01:56 +0200
Subject: [PATCH 11/99] workflows: get DTS_VER from tag not dts-distro.conf

---
 .github/workflows/ci.yml      | 26 ++++++++++++++++++++------
 .github/workflows/develop.yml | 26 ++++++++++++++++++++------
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 67b0cc70..c22dcffe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,12 +66,26 @@ jobs:
         id: dts-ver
         shell: bash
         run: |
-          DTS_VER=v`cat meta-dts/meta-dts-distro/conf/distro/dts-distro.conf | grep DISTRO_VERSION | tr -d "\" [A-Z]_="`
-          echo "DTS_VER=${DTS_VER}" >> $GITHUB_OUTPUT
+          # Extract tag version from GITHUB_REF
+          TAG=${GITHUB_REF#refs/tags/}
+          DTS_VER=$(echo "${TAG}" | sed -E 's/^v//')
+          echo "DTS_VER=${DTS_VER}" >> $GITHUB_ENV
+      - name: Validate DTS_VER
+        if: ${{ success() }}
+        shell: bash
+        run: |
+          # Retrieve DTS_VER from previous step
+          DTS_VER_EXPECTED="${{ env.DTS_VER }}"
+          DTS_VER_ACTUAL=$(cat meta-dts/meta-dts-distro/conf/distro/dts-distro.conf | grep DISTRO_VERSION | tr -d "\" [A-Z]_=")
+
+          if [ "${DTS_VER_EXPECTED}" != "${DTS_VER_ACTUAL}" ]; then
+            echo "Tag (${DTS_VER_EXPECTED}) does not match version (${DTS_VER_ACTUAL}) in `meta-dts/meta-dts-distro/conf/distro/dts-distro.conf`"
+            exit 1
+          fi
       - name: Deploy DTS on boot.dasharo.com
         shell: bash
         run: |
-          DTS_VER="${{steps.dts-ver.outputs.DTS_VER}}"
+          DTS_VER="${{ env.DTS_VER }}"
           ssh -i ~/.ssh/dts-ci-key builder@10.1.40.2 "mkdir -p boot/dts/${DTS_VER}"
           cd build/tmp/deploy/images/genericx86-64/
           cp bzImage bzImage-${DTS_VER}
@@ -91,7 +105,7 @@ jobs:
       - name: Deploy sha256 on boot.dasharo.com
         shell: bash
         run: |
-          DTS_VER="${{steps.dts-ver.outputs.DTS_VER}}"
+          DTS_VER="${{ env.DTS_VER }}"
           cd build/tmp/deploy/images/genericx86-64/
           sha256sum bzImage-${DTS_VER} > bzImage-${DTS_VER}.sha256
           sha256sum dts-base-image-${DTS_VER}.cpio.gz > dts-base-image-${DTS_VER}.cpio.gz.sha256
@@ -110,12 +124,12 @@ jobs:
       - name: Update iPXE menu
         shell: bash
         run: |
-          ./meta-dts/scripts/generate-ipxe-menu.sh ${{steps.dts-ver.outputs.DTS_VER}}
+          ./meta-dts/scripts/generate-ipxe-menu.sh ${{ env.DTS_VER }}
           scp -i ~/.ssh/dts-ci-key dts.ipxe builder@10.1.40.2:boot/dts/
       - name: Trigger signing
         shell: bash
         run: |
-          DTS_VER="${{steps.dts-ver.outputs.DTS_VER}}"
+          DTS_VER="${{ env.DTS_VER }}"
           git clone ssh://git@git.3mdeb.com:2222/3mdeb/dts-release-cicd-pipeline.git
           cd dts-release-cicd-pipeline
           echo ${DTS_VER} > LATEST_RELEASE
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index ab4b2aca..52ff0eae 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -65,12 +65,26 @@ jobs:
         id: dts-ver
         shell: bash
         run: |
-          DTS_VER=v`cat meta-dts/meta-dts-distro/conf/distro/dts-distro.conf | grep DISTRO_VERSION | tr -d "\" [A-Z]_="`
-          echo "DTS_VER=${DTS_VER}" >> $GITHUB_OUTPUT
+          # Extract tag version from GITHUB_REF
+          TAG=${GITHUB_REF#refs/tags/}
+          DTS_VER=$(echo "${TAG}" | sed -E 's/^v//')
+          echo "DTS_VER=${DTS_VER}" >> $GITHUB_ENV
+      - name: Validate DTS_VER
+        if: ${{ success() }}
+        shell: bash
+        run: |
+          # Retrieve DTS_VER from previous step
+          DTS_VER_EXPECTED="${{ env.DTS_VER }}"
+          DTS_VER_ACTUAL=$(cat meta-dts/meta-dts-distro/conf/distro/dts-distro.conf | grep DISTRO_VERSION | tr -d "\" [A-Z]_=")
+
+          if [ "${DTS_VER_EXPECTED}" != "${DTS_VER_ACTUAL}" ]; then
+            echo "Tag (${DTS_VER_EXPECTED}) does not match version (${DTS_VER_ACTUAL}) in `meta-dts/meta-dts-distro/conf/distro/dts-distro.conf`"
+            exit 1
+          fi
       - name: Deploy DTS on boot.dasharo.com
         shell: bash
         run: |
-          DTS_VER="${{steps.dts-ver.outputs.DTS_VER}}"
+          DTS_VER="${{ env.DTS_VER }}"
           ssh -i ~/.ssh/dts-ci-key builder@10.1.40.2 "mkdir -p boot/dts/${DTS_VER}"
           cd build/tmp/deploy/images/genericx86-64/
           cp bzImage bzImage-${DTS_VER}
@@ -86,7 +100,7 @@ jobs:
       - name: Deploy sha256 on boot.dasharo.com
         shell: bash
         run: |
-          DTS_VER="${{steps.dts-ver.outputs.DTS_VER}}"
+          DTS_VER="${{ env.DTS_VER }}"
           cd build/tmp/deploy/images/genericx86-64/
           sha256sum bzImage-${DTS_VER} > bzImage-${DTS_VER}.sha256
           sha256sum dts-base-image-${DTS_VER}.cpio.gz > dts-base-image-${DTS_VER}.cpio.gz.sha256
@@ -101,12 +115,12 @@ jobs:
       - name: Update iPXE menu
         shell: bash
         run: |
-          ./meta-dts/scripts/generate-ipxe-menu.sh ${{steps.dts-ver.outputs.DTS_VER}}
+          ./meta-dts/scripts/generate-ipxe-menu.sh DTS_VER="${{ env.DTS_VER }}"
           scp -i ~/.ssh/dts-ci-key dts-rc.ipxe builder@10.1.40.2:boot/dts/
       - name: Trigger signing
         shell: bash
         run: |
-          DTS_VER="${{steps.dts-ver.outputs.DTS_VER}}"
+          DTS_VER="${{ env.DTS_VER }}"
           git clone ssh://git@git.3mdeb.com:2222/3mdeb/dts-release-cicd-pipeline.git
           cd dts-release-cicd-pipeline
           echo ${DTS_VER} > LATEST_RELEASE

From 367b1465d8cab2b082be92244b9ec8ce1c25623c Mon Sep 17 00:00:00 2001
From: Daniil Klimuk <daniil.klimuk@3mdeb.com>
Date: Wed, 3 Apr 2024 10:57:41 +0200
Subject: [PATCH 12/99] kas-uefi-sb: change meta-secure-core origin

Repository jiazhang0/meta-secure-core is archived since 07.02.2023, change to
active Wind-River/meta-secure-core.

Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
---
 kas-uefi-sb.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kas-uefi-sb.yml b/kas-uefi-sb.yml
index d846539d..22a406b2 100644
--- a/kas-uefi-sb.yml
+++ b/kas-uefi-sb.yml
@@ -11,7 +11,7 @@ target:
 
 repos:
   meta-secure-core:
-    url: https://github.com/jiazhang0/meta-secure-core
+    url: https://github.com/Wind-River/meta-secure-core
     refspec: fa438247c3e61d7f746687d85ef3b0dd66dc6b3f
     layers:
       meta-efi-secure-boot:

From d83d594dde28d2af673cf8edbc552e3cdb07133d Mon Sep 17 00:00:00 2001
From: Daniil Klimuk <daniil.klimuk@3mdeb.com>
Date: Wed, 3 Apr 2024 11:10:28 +0200
Subject: [PATCH 13/99] distro: kernel: linux-yocto: remove efi-ext.scc from
 KERNEL_FEATURES

efi-ext.scc is being added in meta-secure-core/meta-efi-secure-boot and
sets, among other configurations, configuration CONFIG_EFI_VARS to m
which conflicts with efivars.cfg that sets the config to y.

Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
---
 meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend b/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend
index 0f1c3b39..f5c4fc77 100644
--- a/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend
+++ b/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend
@@ -19,3 +19,6 @@ SRC_URI:append = " \
     file://ntfs-enable.cfg \
     file://exfat-enable.cfg \
 "
+
+KERNEL_FEATURES:remove:x86 = " ${@bb.utils.contains('DISTRO_FEATURES', 'efi-secure-boot', '${efi_secure_boot_sccs}', '', d)}"
+KERNEL_FEATURES:remove:x86-64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'efi-secure-boot', '${efi_secure_boot_sccs}', '', d)}"

From dd76b019813209acb7a7476228fb859dd953e006 Mon Sep 17 00:00:00 2001
From: Tymoteusz <tymoteusz.burak@3mdeb.com>
Date: Thu, 4 Apr 2024 12:36:20 +0200
Subject: [PATCH 14/99] dts: dts-functions: make dts not use ICMP for network
 connection check

A fix for Dasharo/dasharo-issues#752. The core of the problem revolved around
the use of the ping command for network connectivity verification, which relied
on ICMP packets. This approach posed limitations in environments where ICMP
packets are blocked or filtered, leading to false negatives in connectivity
checks. The implementation replaces ping with `wget --spider` that is used to
check for `cloud.3mdeb.com` access without downloading content. By using wget,
the script now supports environments where ICMP is not an option

Signed-off-by: Tymoteusz Burak <tymoteusz.burak@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh b/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh
index c053a77c..757c9ac8 100644
--- a/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh
+++ b/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh
@@ -137,7 +137,10 @@ check_network_connection() {
   echo 'Waiting for network connection ...'
   n="10"
   while : ; do
-    ping -c 3 cloud.3mdeb.com > /dev/null 2>&1 && break
+    if wget --spider cloud.3mdeb.com > /dev/null 2>&1; then
+      echo 'Network connection established.'
+      return 0
+    fi
     n=$((n-1))
     if [ "${n}" == "0" ]; then
       echo 'No network connection to 3mdeb cloud, please recheck Ethernet connection'
@@ -145,7 +148,6 @@ check_network_connection() {
     fi
     sleep 1
   done
-  return 0
 }
 
 ## Supported boards configuration

From edb950164fb9c77c0e62ce961fc45b26b028c6f9 Mon Sep 17 00:00:00 2001
From: Daniil Klimuk <daniil.klimuk@3mdeb.com>
Date: Mon, 8 Apr 2024 11:41:39 +0200
Subject: [PATCH 15/99] distro: recipes-dts: move DTS scripts to another repo

Move all DTS scripts to another repo and add as git package.

Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
---
 .../dts-scripts/dts-scripts_git.bb            |  44 +
 .../recipes-dts/dts/dasharo-deploy.bb         |  23 -
 .../dts/dasharo-deploy/dasharo-deploy         | 907 ------------------
 meta-dts-distro/recipes-dts/dts/dts.bb        |  40 -
 .../recipes-dts/dts/dts/cloud_list            |  58 --
 meta-dts-distro/recipes-dts/dts/dts/dts       | 227 -----
 meta-dts-distro/recipes-dts/dts/dts/dts-boot  |  14 -
 .../recipes-dts/dts/dts/dts-environment.sh    |  91 --
 .../recipes-dts/dts/dts/dts-profile.sh        |   5 -
 .../recipes-dts/dts/dts/ec_transition         | 130 ---
 .../packagegroups/packagegroup-dts.bb         |   4 +-
 .../recipes-dts/reports/dasharo-hcl-report.bb |  30 -
 .../dasharo-hcl-report/dasharo-hcl-report     | 370 -------
 .../recipes-dts/reports/touchpad-info.bb      |  23 -
 .../reports/touchpad-info/touchpad-info       |  42 -
 15 files changed, 45 insertions(+), 1963 deletions(-)
 create mode 100644 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
 delete mode 100644 meta-dts-distro/recipes-dts/dts/dasharo-deploy.bb
 delete mode 100755 meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy
 delete mode 100644 meta-dts-distro/recipes-dts/dts/dts.bb
 delete mode 100755 meta-dts-distro/recipes-dts/dts/dts/cloud_list
 delete mode 100644 meta-dts-distro/recipes-dts/dts/dts/dts
 delete mode 100644 meta-dts-distro/recipes-dts/dts/dts/dts-boot
 delete mode 100644 meta-dts-distro/recipes-dts/dts/dts/dts-environment.sh
 delete mode 100644 meta-dts-distro/recipes-dts/dts/dts/dts-profile.sh
 delete mode 100644 meta-dts-distro/recipes-dts/dts/dts/ec_transition
 delete mode 100644 meta-dts-distro/recipes-dts/reports/dasharo-hcl-report.bb
 delete mode 100755 meta-dts-distro/recipes-dts/reports/dasharo-hcl-report/dasharo-hcl-report
 delete mode 100644 meta-dts-distro/recipes-dts/reports/touchpad-info.bb
 delete mode 100644 meta-dts-distro/recipes-dts/reports/touchpad-info/touchpad-info

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
new file mode 100644
index 00000000..eef78397
--- /dev/null
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -0,0 +1,44 @@
+SUMMARY = "Dasharo Tools Suite scripts."
+SECTION = "tools"
+HOMEPAGE = "https://github.com/Dasharo/dts-v2"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=575ab8837c52eafc7b9eb8b244072bc7"
+
+SRCREV = "13dad8ea6901cf921de0dd45d464bea3535892e0"
+SRC_URI = "git://github.com/Dasharo/dts-v2;protocol=https;branch=main"
+
+PV = "0.1+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+RDEPENDS:${PN} = " \
+    packagegroup-coreboot-utils \
+    flashrom \
+    iasl \
+    tar \
+    i2c-tools \
+    i2c-tools-misc \
+    bash \
+    dmidecode \
+    acpi-call-dkms \
+    iotools \
+"
+
+do_install () {
+    install -d ${D}/${sbindir}
+    install -m 0755 ${S}/scripts/dts ${D}/${sbindir}
+    install -m 0755 ${S}/scripts/dts-boot ${D}/${sbindir}
+    install -m 0755 ${S}/scripts/ec_transition ${D}/${sbindir}
+    install -m 0755 ${S}/scripts/cloud_list ${D}/${sbindir}
+    install -m 0755 ${S}/scripts/dasharo-deploy ${D}/${sbindir}
+    install -m 0755 ${S}/reports/dasharo-hcl-report ${D}/${sbindir}
+    install -m 0755 ${S}/reports/touchpad-info ${D}/${sbindir}
+    install -m 0664 ${S}/include/dts-environment.sh ${D}/${sbindir}
+    install -m 0664 ${S}/include/dts-functions.sh ${D}/${sbindir}
+
+    # install profile dropin so the DTS_ENV and DTS_FUNCS variables are set when
+    # loged via SSH
+    install -d ${D}${sysconfdir}/profile.d/
+    install -m 0755 ${S}/scripts/dts-profile.sh ${D}${sysconfdir}/profile.d/
+}
diff --git a/meta-dts-distro/recipes-dts/dts/dasharo-deploy.bb b/meta-dts-distro/recipes-dts/dts/dasharo-deploy.bb
deleted file mode 100644
index 45591719..00000000
--- a/meta-dts-distro/recipes-dts/dts/dasharo-deploy.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Dasharo Deploy Tools"
-SECTION = "tools"
-HOMEPAGE = "https://docs.dasharo.com"
-
-LICENSE = "MIT"
-
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-SRC_URI = " \
-    file://dasharo-deploy \
-"
-
-S = "${WORKDIR}"
-
-RDEPENDS:${PN} = " \
-    bash \
-    packagegroup-coreboot-utils \
-"
-
-do_install () {
-    install -d ${D}/${sbindir}
-    install -m 0755 ${S}/dasharo-deploy ${D}/${sbindir}
-}
diff --git a/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy b/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy
deleted file mode 100755
index 03aac319..00000000
--- a/meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy
+++ /dev/null
@@ -1,907 +0,0 @@
-#!/usr/bin/env bash
-
-source $DTS_ENV
-source $DTS_FUNCS
-
-[ -z "$BOARD_VENDOR" ] && error_exit "BOARD_VENDOR not given"
-[ -z "$SYSTEM_MODEL" ] && error_exit "SYSTEM_MODEL not given"
-
-CMD="$1"
-FUM="$2"
-
-ask_for_version() {
-  while : ; do
-    echo
-    echo "Please, select Dasharo firmware version to install"
-
-    # -v: True if the shell variable varname is set (has been assigned a value).
-    if [ -v BIOS_HASH_LINK_COMM ]; then
-      echo "  c) Community version"
-    fi
-    if [ -v BIOS_HASH_LINK_DES ]; then
-      if [ -v DES_IS_LOGGED ]; then
-        echo "  d) DES version (coreboot + UEFI)"
-      else
-        echo "  DES version (coreboot + UEFI) available, if you are interested, please visit https://shop.3mdeb.com/product-category/dasharo-entry-subscription/"
-      fi
-    fi
-    if [ -v BIOS_HASH_LINK_DES_SEABIOS ]; then
-      if [ -v DES_IS_LOGGED ]; then
-        echo "  s) DES version (coreboot + SeaBIOS)"
-      else
-        echo "  DES version (coreboot + SeaBIOS) available, if you are interested, please visit https://shop.3mdeb.com/product-category/dasharo-entry-subscription/"
-      fi
-    fi
-    echo "  b) Back to main menu"
-    echo
-    read -r -p "Enter an option: " OPTION
-    echo
-
-    case ${OPTION} in
-      c|C|comm|community|COMMUNITY|COMM|Community)
-        if [ -v BIOS_HASH_LINK_COMM ]; then
-          BIOS_LINK=$BIOS_LINK_COMM
-          BIOS_HASH_LINK=$BIOS_HASH_LINK_COMM
-          BIOS_SIGN_LINK=$BIOS_SIGN_LINK_COMM
-          if [ -v EC_HASH_LINK_COMM ]; then
-            EC_LINK=$EC_LINK_COMM
-            EC_HASH_LINK=$EC_HASH_LINK_COMM
-            EC_SIGN_LINK=$EC_SIGN_LINK_COMM
-          fi
-          echo "Community version selected"
-          break
-        else
-          error_exit "Bad option or resignation. Returning to main menu..."
-        fi
-        ;;
-      d|D|des|DES|Des)
-        if [ -v BIOS_HASH_LINK_DES ]; then
-          BIOS_LINK=$BIOS_LINK_DES
-          BIOS_HASH_LINK=$BIOS_HASH_LINK_DES
-          BIOS_SIGN_LINK=$BIOS_SIGN_LINK_DES
-          if [ -v EC_HASH_LINK_DES ]; then
-            EC_LINK=$EC_LINK_DES
-            EC_HASH_LINK=$EC_HASH_LINK_DES
-            EC_SIGN_LINK=$EC_SIGN_LINK_DES
-          fi
-          echo "Dasharo Entry Subscription (coreboot + edk2) version selected"
-          break
-        else
-          error_exit "Bad option. Returning to main menu..."
-        fi
-        ;;
-      s|S|sea|seabios|SeaBIOS)
-        if [ -v BIOS_HASH_LINK_DES_SEABIOS ]; then
-          BIOS_LINK=$BIOS_LINK_DES_SEABIOS
-          BIOS_HASH_LINK=$BIOS_HASH_LINK_DES_SEABIOS
-          BIOS_SIGN_LINK=$BIOS_SIGN_LINK_DES_SEABIOS
-          echo "Dasharo Entry Subscription (coreboot + SeaBIOS) version selected"
-          break
-        else
-          error_exit "Bad option. Returning to main menu..."
-        fi
-        ;;
-      b|B)
-        echo "Returning to main menu..."
-        exit 0
-        ;;
-      *)
-        ;;
-    esac
-  done
-}
-
-display_flashing_warning() {
-  while : ; do
-    echo
-    print_warning "Please verify detected hardware!"
-    echo
-
-    if [ -v BOARD_VENDOR ]; then
-      echo "Board vendor: $BOARD_VENDOR"
-    fi
-    if [ -v SYSTEM_MODEL ]; then
-      echo "System model: $SYSTEM_MODEL"
-    fi
-    if [ -v BOARD_MODEL ]; then
-      echo "Board model: $BOARD_MODEL"
-    fi
-    echo
-    read -r -p "Does it match your actual specification? (Y|n) " OPTION
-    echo
-
-    case ${OPTION} in
-      yes|y|Y|Yes|YES)
-        break
-        ;;
-      n|N)
-        echo "Returning to main menu..."
-        exit 0
-        ;;
-      *)
-        ;;
-    esac
-  done
-
-  while : ; do
-    echo "Following firmware will be used to install Dasharo"
-    if [ -v BIOS_HASH_LINK ]; then
-      local _bios_hash="$(cat $BIOS_HASH_FILE | cut -d ' ' -f 1)"
-      echo "Dasharo BIOS firmware:"
-      echo "  - link: $BIOS_LINK"
-      echo "  - hash: $_bios_hash"
-    fi
-    if [ -v EC_HASH_LINK ]; then
-      local _ec_hash="$(cat $EC_HASH_FILE | cut -d ' ' -f 1)"
-      echo "Dasharo EC firmware:"
-      echo "  - link: $EC_LINK"
-      echo "  - hash: $_ec_hash"
-    fi
-    echo
-    echo "You can learn more about this release on: https://docs.dasharo.com/"
-
-    if check_if_dasharo; then
-        echo
-        read -r -p "Do you want to update Dasharo firmware on your hardware? (Y|n) " OPTION
-        echo
-    else
-        echo
-        read -r -p "Do you want to install Dasharo firmware on your hardware? (Y|n) " OPTION
-        echo
-    fi
-
-    case ${OPTION} in
-      yes|y|Y|Yes|YES)
-        break
-        ;;
-      n|N)
-        echo "Returning to main menu..."
-        exit 0
-        ;;
-      *)
-        ;;
-    esac
-  done
-}
-
-backup() {
-  rm -rf "$FW_BACKUP_DIR"
-  mkdir -p "$FW_BACKUP_DIR"
-
-  echo "Backing up BIOS firmware and store it locally..."
-  echo "Remember that firmware is also backed up in HCL report."
-  check_intel_regions
-  if [ $BOARD_HAS_FD_REGION -ne 0 ]; then
-    # Use safe defaults. Descriptor may contain additional regions not detected
-    # by flashrom and will return failure when attempted to be read. BIOS and
-    # Flash descriptor regions should always be readable. If not, then we have
-    # some ugly case, hard to deal with.
-    FLASHROM_ADD_OPT_READ="--ifd -i fd -i bios"
-    if [ $BOARD_HAS_ME_REGION -ne 0 ] && [ $BOARD_ME_REGION_LOCKED -eq 0 ]; then
-      # ME region is not locked, read it as well
-      FLASHROM_ADD_OPT_READ+=" -i me"
-    fi
-    if [ $BOARD_HAS_GBE_REGION -ne 0 ] && [ $BOARD_GBE_REGION_LOCKED -eq 0 ]; then
-      # GBE region is present and not locked, read it as well
-      FLASHROM_ADD_OPT_READ+=" -i gbe"
-    fi
-  else
-      # No descriptor, probably safe to read everything
-      FLASHROM_ADD_OPT_READ=""
-  fi
-  $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} -r "${FW_BACKUP_DIR}"/rom.bin ${FLASHROM_ADD_OPT_READ} >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-  error_check "Failed to read BIOS firmware backup"
-
-  if [ "$HAVE_EC" == "true" ]; then
-    echo "Checking for Open Source Embedded Controller firmware"
-    $DASHARO_ECTOOL info >> $ERR_LOG_FILE 2>&1
-    if [ $? -eq 0 ]; then
-      echo "Device has already Open Source Embedded Controller firmware, do not backup EC..."
-    else
-      echo "Backing up EC firmware..."
-      $FLASHROM -p "$PROGRAMMER_EC" ${FLASH_CHIP_SELECT} -r "${FW_BACKUP_DIR}"/ec.bin >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-      error_check "Failed to read EC firmware backup"
-    fi
-  fi
-
-  echo "Saving backup to: $FW_BACKUP_TAR"
-  tar --gzip -cf "$FW_BACKUP_TAR" "$FW_BACKUP_DIR"
-  error_check "Failed to create firmware backup archive"
-  rm -rf "${FW_BACKUP_DIR}"
-
-  echo "Successfully backed up firmware locally at: $FW_BACKUP_TAR"
-}
-
-romhole_migration() {
-    cbfstool $BIOS_UPDATE_FILE layout -w | grep -q "ROMHOLE" || return
-
-    $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} -r /tmp/rom.bin --ifd -i bios >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-    error_check "Failed to read current firmware to migrate MSI ROMHOLE"
-    if check_if_dasharo; then
-      cbfstool /tmp/rom.bin layout -w | grep -q "ROMHOLE" || return
-      # This one is rather unlikely to fail, but just in case print a warning
-      cbfstool /tmp/rom.bin read -r ROMHOLE -f /tmp/romhole.bin 2> /dev/null
-      if [ $? -ne 0 ]; then
-        print_warning "Failed to migrate MSI ROMHOLE, your platform's unique SMBIOS/DMI data may be lost"
-        return
-      fi
-    else
-      dd if=/tmp/rom.bin of=/tmp/romhole.bin skip=$((0x17C0000)) bs=128K count=1 iflag=skip_bytes > /dev/null 2>&1
-    fi
-
-    cbfstool "$BIOS_UPDATE_FILE" write -r ROMHOLE -f /tmp/romhole.bin -u 2> /dev/null
-}
-
-smbios_migration() {
-  echo -n "$(dmidecode -s system-uuid)" > $SYSTEM_UUID_FILE
-  echo -n "$(dmidecode -s baseboard-serial-number)" > $SERIAL_NUMBER_FILE
-
-  COREBOOT_SEC=$(cbfstool $BIOS_UPDATE_FILE layout -w | grep "COREBOOT")
-  FW_MAIN_A_SEC=$(cbfstool $BIOS_UPDATE_FILE layout -w | grep "FW_MAIN_A")
-  FW_MAIN_B_SEC=$(cbfstool $BIOS_UPDATE_FILE layout -w | grep "FW_MAIN_B")
-
-  if [ -n "$COREBOOT_SEC" ]; then
-    # if the migration can be done there for sure will be COREBOOT section
-    echo "Beginning SMBIOS migration process..."
-    echo "Migrate to COREBOOT section."
-    cbfstool $BIOS_UPDATE_FILE add -f $SERIAL_NUMBER_FILE -n serial_number -t raw -r COREBOOT
-    cbfstool $BIOS_UPDATE_FILE add -f $SYSTEM_UUID_FILE -n system_uuid -t raw -r COREBOOT
-  fi
-
-  if [ -n "$FW_MAIN_A_SEC" ]; then
-    echo "Migrate to FW_MAIN_A section."
-    cbfstool $BIOS_UPDATE_FILE expand -r FW_MAIN_A
-    cbfstool $BIOS_UPDATE_FILE add -f $SERIAL_NUMBER_FILE -n serial_number -t raw -r FW_MAIN_A
-    cbfstool $BIOS_UPDATE_FILE add -f $SYSTEM_UUID_FILE -n system_uuid -t raw -r FW_MAIN_A
-    cbfstool $BIOS_UPDATE_FILE truncate -r FW_MAIN_A
-  fi
-
-  if [ -n "$FW_MAIN_B_SEC" ]; then
-    echo "Migrate to FW_MAIN_B section."
-    cbfstool $BIOS_UPDATE_FILE expand -r FW_MAIN_B
-    cbfstool $BIOS_UPDATE_FILE add -f $SERIAL_NUMBER_FILE -n serial_number -t raw -r FW_MAIN_B
-    cbfstool $BIOS_UPDATE_FILE add -f $SYSTEM_UUID_FILE -n system_uuid -t raw -r FW_MAIN_B
-    cbfstool $BIOS_UPDATE_FILE truncate -r FW_MAIN_B
-  fi
-}
-
-smmstore_migration() {
-    echo -n "Backing up firmware configuration... "
-    $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} -r /tmp/dasharo_dump.rom ${FLASHROM_ADD_OPT_READ} --fmap -i FMAP -i SMMSTORE >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-    cbfstool /tmp/dasharo_dump.rom read -r SMMSTORE -f /tmp/smmstore.bin >> $ERR_LOG_FILE 2>&1 || \
-      print_warning "Failed! Default settings will be used."
-    cbfstool "$BIOS_UPDATE_FILE" write -r SMMSTORE -f /tmp/smmstore.bin -u >> $ERR_LOG_FILE 2>&1 || \
-      print_warning "Failed! Default settings will be used."
-    print_green Done.
-}
-
-bootsplash_migration() {
-    $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} -r /tmp/dasharo_dump.rom ${FLASHROM_ADD_OPT_READ} --fmap -i FMAP -i BOOTSPLASH >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-    # If no custom logo, return from bootsplash_migration early and don't show
-    # unnecessary messages
-    cbfstool /tmp/dasharo_dump.rom extract -r BOOTSPLASH -n logo.bmp -f /tmp/logo.bmp >> $ERR_LOG_FILE 2>&1 || return 1
-    echo -n "Backing up custom boot logo... "
-    dcu logo $BIOS_UPDATE_FILE -l /tmp/logo.bmp >> $ERR_LOG_FILE 2>&1 || \
-      print_warning "Failed! Default boot splash will be used." || return 1
-    print_green Done.
-}
-
-resign_binary() {
-  if [ "$HAVE_VBOOT" -eq 0 ]; then
-    download_keys
-    sign_firmware.sh $BIOS_UPDATE_FILE $KEYS_DIR $RESIGNED_BIOS_UPDATE_FILE
-    error_check "Cannot resign binary file. Please, make sure if you have proper keys. Aborting..."
-    BIOS_UPDATE_FILE="$RESIGNED_BIOS_UPDATE_FILE"
-  fi
-}
-
-check_vboot_keys() {
-  if [ "$HAVE_VBOOT" -eq 0 ]; then
-    # If we flash whole BIOS region, no need to check if keys match
-    grep -q "\--ifd" <<< "$FLASHROM_ADD_OPT_UPDATE" && grep -q "\-i bios" <<< "$FLASHROM_ADD_OPT_UPDATE" && return
-    # No FMAP flashing? Also skip
-    grep -q "\--fmap" <<< "$FLASHROM_ADD_OPT_UPDATE" || return
-
-    BINARY_KEYS=$(CBFSTOOL=$(which cbfstool) futility show $BIOS_UPDATE_FILE| grep -i 'key sha1sum')
-
-    if [ $BOARD_HAS_FD_REGION -eq 0 ]; then
-      FLASHROM_ADD_OPT_READ=""
-    else
-      FLASHROM_ADD_OPT_READ="--ifd -i bios"
-    fi
-    echo "Checking vboot keys."
-    $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_READ} -r /tmp/bios.bin > /dev/null 2>/dev/null
-    if [ $? -eq 0 ] && [ -f "/tmp/bios.bin" ]; then
-      FLASH_KEYS=$(CBFSTOOL=$(which cbfstool) futility show /tmp/bios.bin | grep -i 'key sha1sum')
-      diff <(echo "$BINARY_KEYS") <(echo "$FLASH_KEYS") > /dev/null 2>&1
-      # If keys are different we must additionally flash at least GBB region as well
-      if [ $? -ne 0 ]; then
-        FLASHROM_ADD_OPT_UPDATE+=" -i GBB"
-      fi
-    fi
-  fi
-}
-
-blob_transmission() {
-  echo "Extracting the UEFI image from BIOS update"
-  wget -O "$DBT_BIOS_UPDATE_FILENAME" --user-agent='Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)' "$DBT_BIOS_UPDATE_URL" >> $ERR_LOG_FILE 2>&1
-  error_file_check "$DBT_BIOS_UPDATE_FILENAME" "Failed to download BIOS for $SYSTEM_MODEL. Please make sure Ethernet cable is connected and try again."
-
-  sha256sum --check <(echo "$DBT_BIOS_UPDATE_HASH")
-  error_check "Failed SHA-256 sum check on the downloaded BIOS for $SYSTEM_MODEL"
-
-  binwalk --run-as=root -e "$DBT_BIOS_UPDATE_FILENAME" -C /tmp >> $ERR_LOG_FILE 2>&1
-  error_file_check "$DBT_UEFI_IMAGE" "Failed to extract UEFI image from BIOS update"
-
-  uefi-firmware-parser -e "$DBT_UEFI_IMAGE" -O >> $ERR_LOG_FILE 2>&1
-
-  if [ -n "$SINIT_ACM_FILENAME" ] && [ -n "$SINIT_ACM_URL" ]; then
-    echo "Downloading the Intel SINIT ACM"
-    wget -O "$SINIT_ACM_FILENAME" "$SINIT_ACM_URL" >> $ERR_LOG_FILE 2>&1
-    error_file_check "$SINIT_ACM_FILENAME" "Failed to download Intel SINIT ACM. Please make sure Ethernet cable is connected and try again."
-
-    # Intel does not provide hash of the package, use SHA256 we know is good
-    sha256sum --check <(echo "$SINIT_ACM_HASH")
-    error_check "Failed SHA-256 sum check on the downloaded Intel SINIT ACM."
-
-    unzip -o "$SINIT_ACM_FILENAME" -d /tmp >> $ERR_LOG_FILE 2>&1
-    error_check "Failed to decompress Intel SINIT ACM package."
-  fi
-
-  echo "Beginning Dasharo Blobs Transmission process..."
-
-  if [ -n "$SCH5545_FW" ]; then
-    error_file_check "$SCH5545_FW" "Failed to find SCH5545 EC firmware binary."
-    echo -n "Adding SCH5545 EC firmware..."
-    cbfstool "$BIOS_UPDATE_FILE" add -f "$SCH5545_FW" -n sch5545_ecfw.bin -t raw
-    print_green "Done"
-  fi
-
-  if [ -n "$ACM_BIN" ]; then
-    error_file_check "$ACM_BIN" "Failed to find BIOS ACM binary."
-    echo -n "Adding BIOS ACM..."
-    cbfstool "$BIOS_UPDATE_FILE" add -f "$ACM_BIN" -n txt_bios_acm.bin -t raw
-    print_green "Done"
-  fi
-
-  if [ -n "$SINIT_ACM" ]; then
-    error_file_check "$SINIT_ACM" "Failed to find Intel SINIT ACM binary."
-    echo -n "Adding SINIT ACM..."
-    cbfstool "$BIOS_UPDATE_FILE" add -f "$SINIT_ACM" -n txt_sinit_acm.bin -t raw
-    print_green "Done"
-  fi
-}
-
-install_ec() {
-  verify_artifacts ec
-  echo "Installing EC..."
-  $FLASHROM -p "$PROGRAMMER_EC" ${FLASH_CHIP_SELECT} -w "$EC_UPDATE_FILE" >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-  error_check "Failed to install Dasharo EC firmware"
-  echo "Successfully installed Dasharo EC firmware"
-}
-
-install() {
-  ask_for_version
-  download_artifacts
-  display_flashing_warning
-  check_flash_lock
-  verify_artifacts bios
-
-  check_intel_regions
-  check_blobs_in_binary $BIOS_UPDATE_FILE
-  check_if_me_disabled
-  set_intel_regions_update_params "-N --ifd -i bios"
-
-  if [ "$HAVE_EC" == "true" ]; then
-    echo "Checking for Open Source Embedded Controller firmware"
-    $DASHARO_ECTOOL info >> $ERR_LOG_FILE 2>&1
-    if [ $? -eq 0 ]; then
-      echo "Device has already Open Source Embedded Controller firmware, do not flash EC..."
-    else
-      _ec_fw_version=$($FLASHROM -p "$PROGRAMMER_EC" ${FLASH_CHIP_SELECT} | grep "Mainboard EC Version" | tr -d ' ' | cut -d ':' -f 2)
-      if [ "$_ec_fw_version" != "$COMPATIBLE_EC_FW_VERSION" ]; then
-        print_warning "EC version: $_ec_fw_version is not supported, update required"
-        install_ec
-      fi
-    fi
-  fi
-
-  cbfstool "$BIOS_UPDATE_FILE" extract -r COREBOOT -n config -f "$BIOS_UPDATE_CONFIG_FILE"
-  grep "CONFIG_VBOOT=y" "$BIOS_UPDATE_CONFIG_FILE"
-  HAVE_VBOOT="$?"
-
-  if [ "$NEED_ROMHOLE_MIGRATION" = "true" ]; then
-    romhole_migration
-  fi
-
-  if [ "$NEED_BOOTSPLASH_MIGRATION" = "true" ]; then
-    bootsplash_migration
-  fi
-
-  if [ "$NEED_SMBIOS_MIGRATION" = "true" ]; then
-    smbios_migration
-    resign_binary
-  fi
-
-  if [ "$NEED_BLOB_TRANSMISSION" = "true" ]; then
-    blob_transmission
-  fi
-
-  echo "Installing Dasharo firmware..."
-  # FIXME: It seems we do not have an easy way to add some flasrhom extra args
-  # globally for specific platform and variant
-  local _flashrom_extra_args=""
-  if [ "${BIOS_LINK}" = "${BIOS_LINK_DES_SEABIOS}" ]; then
-    _flashrom_extra_args="--fmap -i COREBOOT"
-  fi
-  $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_REGIONS} -w "$BIOS_UPDATE_FILE" ${_flashrom_extra_args} >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-  error_check "Failed to install Dasharo firmware"
-
-  print_green "Successfully installed Dasharo firmware"
-
-  echo -n "Syncing disks... "
-  sync
-  echo "Done."
-  if [ "$NEED_EC_RESET" = "true" ]; then
-    echo "The computer will shut down automatically in 5 seconds"
-  else
-    echo "The computer will reboot automatically in 5 seconds"
-  fi
-  sleep 0.5
-  echo "Rebooting in 5s:"
-  echo "5..."
-  sleep 1
-  echo "4..."
-  sleep 1
-  echo "3..."
-  sleep 1
-  echo "2..."
-  sleep 1
-  echo "1..."
-  sleep 0.5
-  echo "Rebooting"
-  sleep 1
-  if [ "$NEED_EC_RESET" = "true" ]; then
-    it5570_shutdown
-  else
-    ${CMD_REBOOT}
-  fi
-}
-
-update_ec() {
-  verify_artifacts ec
-  echo "Updating EC..."
-  $DASHARO_ECTOOL flash "$EC_UPDATE_FILE" &>> $ERR_LOG_FILE
-  error_check "Failed to update EC firmware"
-}
-
-update() {
-  local _can_switch_to_heads="false"
-
-  check_if_ac
-  error_check "Firmware update process interrupted on user request."
-
-  echo "Checking for the latest Dasharo update available..."
-  echo "Current Dasharo version: $DASHARO_VERSION"
-  if [ -v DES_IS_LOGGED ]; then
-    if [ -v DASHARO_REL_VER_DES ]; then
-      if [ "$DASHARO_FLAVOR" != "Dasharo (coreboot+heads)" ]; then
-        echo "Latest available Dasharo version: $DASHARO_REL_VER_DES"
-      fi
-      curl -sfI -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$BIOS_LINK_DES" -o /dev/null
-      if [ $? -ne 0 ]; then
-        echo "Current DES credentials do not match the current platform/firmware flavor."
-        echo "Latest possible and available update is $DASHARO_REL_VER"
-        BIOS_HASH_LINK=$BIOS_HASH_LINK_COMM
-        BIOS_SIGN_LINK=$BIOS_SIGN_LINK_COMM
-        BIOS_LINK=$BIOS_LINK_COMM
-        if [ "$HAVE_EC" == "true" ]; then
-          EC_HASH_LINK=$EC_HASH_LINK_COMM
-          EC_SIGN_LINK=$EC_SIGN_LINK_COMM
-          EC_LINK=$EC_LINK_COMM
-        fi
-        UPDATE_VERSION=$DASHARO_REL_VER
-      else
-        BIOS_HASH_LINK=$BIOS_HASH_LINK_DES
-        BIOS_SIGN_LINK=$BIOS_SIGN_LINK_DES
-        BIOS_LINK=$BIOS_LINK_DES
-        if [ "$HAVE_EC" == "true" ]; then
-          EC_HASH_LINK=$EC_HASH_LINK_DES
-          EC_SIGN_LINK=$EC_SIGN_LINK_DES
-          EC_LINK=$EC_LINK_DES
-        fi
-        UPDATE_VERSION=$DASHARO_REL_VER_DES
-      fi
-    else
-      if [ "$DASHARO_FLAVOR" != "Dasharo (coreboot+heads)" ]; then
-        echo "Latest available Dasharo version: $DASHARO_REL_VER"
-      fi
-      BIOS_HASH_LINK=$BIOS_HASH_LINK_COMM
-      BIOS_SIGN_LINK=$BIOS_SIGN_LINK_COMM
-      BIOS_LINK=$BIOS_LINK_COMM
-      if [ "$HAVE_EC" == "true" ]; then
-        EC_HASH_LINK=$EC_HASH_LINK_COMM
-        EC_SIGN_LINK=$EC_SIGN_LINK_COMM
-        EC_LINK=$EC_LINK_COMM
-      fi
-      UPDATE_VERSION=$DASHARO_REL_VER
-    fi
-    if [ -v HAVE_HEADS_FW ] && [ "$DASHARO_FLAVOR" != "Dasharo (coreboot+heads)" ]; then
-      # Check if given SE credentials give access to heads, if not,
-      # then it means DES is for regualar releases
-      curl -sfI -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$HEADS_LINK_DES" -o /dev/null
-      if [ $? -ne 0 ]; then
-        print_warning "Dasharo Heads firmware version is available, but your"
-        print_warning "subscription does not give you the access to this firmware."
-        print_warning "If you are interested, please visit https://shop.3mdeb.com/product-category/dasharo-entry-subscription/"
-      else
-        # Access to the heads FW is possible, allow to switch to heads
-        _can_switch_to_heads="true"
-        print_green "Dasharo Heads firmware version is available and your subscription"
-        print_green "gives you access to this firmware."
-      fi
-    elif [ -v HAVE_HEADS_FW ] && [ "$DASHARO_FLAVOR" == "Dasharo (coreboot+heads)" ]; then
-      # Set the switch flag to offer switch back
-      echo "Latest available Dasharo version: $HEADS_REL_VER_DES"
-      _can_switch_to_heads="true"
-    fi
-  else
-    if [ -v DASHARO_REL_VER_DES ]; then
-      print_green "DES version (coreboot + UEFI) available, if you are interested"
-      print_green "please visit https://shop.3mdeb.com/product-category/dasharo-entry-subscription/"
-    fi
-    if [ "$DASHARO_FLAVOR" != "Dasharo (coreboot+heads)" ]; then
-      echo "Latest available Dasharo version: $DASHARO_REL_VER"
-    fi
-    BIOS_HASH_LINK=$BIOS_HASH_LINK_COMM
-    BIOS_SIGN_LINK=$BIOS_SIGN_LINK_COMM
-    BIOS_LINK=$BIOS_LINK_COMM
-    if [ "$HAVE_EC" == "true" ]; then
-      EC_HASH_LINK=$EC_HASH_LINK_COMM
-      EC_SIGN_LINK=$EC_SIGN_LINK_COMM
-      EC_LINK=$EC_LINK_COMM
-    fi
-    UPDATE_VERSION=$DASHARO_REL_VER
-    if [ -v HAVE_HEADS_FW ] && [ "$DASHARO_FLAVOR" != "Dasharo (coreboot+heads)" ]; then
-      print_green "Dasharo heads firmware version is available. If you are interested,"
-      print_green "please provide your subscription credentials in the main DTS menu"
-      print_green "and select 'Update Dasharo firmware' again to check if you are eligible."
-    elif [ -v HAVE_HEADS_FW ] && [ "$DASHARO_FLAVOR" == "Dasharo (coreboot+heads)" ]; then
-      # Set the switch flag to offer switch back
-      _can_switch_to_heads="true"
-    fi
-  fi
-
-  handle_fw_switching $_can_switch_to_heads
-
-  if [[ "$UPDATE_VERSION" == "1.1.1" && \
-    ( "$BOARD_MODEL" == "PRO Z690-A WIFI DDR4(MS-7D25)" || \
-      "$BOARD_MODEL" == "PRO Z690-A DDR4(MS-7D25)" || \
-      "$BOARD_MODEL" == "PRO Z690-A (MS-7D25)" || \
-      "$BOARD_MODEL" == "PRO Z690-A WIFI (MS-7D25)" ) ]]; then
-
-    cpu_gen_check=$(lscpu | grep -F "Model name" | grep -E "\-(13|14)[0-9]{3}" | wc -l)
-
-    if [ $cpu_gen_check -ne 0 ]; then
-      echo "You have a 13th gen or above CPU and are trying to flash Dasharo v1.1.1 on a MSI PRO Z690-A DDR4 or DDR5 board"
-      echo "That version does not support gen 13 and above CPU. Therefore we cannot continue with flashing."
-      error_exit "Aborting update process..."
-    fi
-
-  fi
-
-  while : ; do
-    echo
-    read -r -p "Are you sure you want to proceed with update? (Y|n) " OPTION
-    echo
-
-    case ${OPTION} in
-      yes|y|Y|Yes|YES)
-        break
-        ;;
-      n|N)
-        error_exit "Aborting update process..."
-        ;;
-      *)
-        ;;
-    esac
-  done
-
-  download_artifacts
-  if [ ! "$FUM" == "fum" ]; then
-    display_flashing_warning
-  fi
-  check_flash_lock
-
-  verify_artifacts bios
-
-  if [ "$HAVE_EC" == "true" ]; then
-    $DASHARO_ECTOOL info >> $ERR_LOG_FILE 2>&1
-    error_check "Device does not have Dasharo EC firmware - cannot continue update!"
-  fi
-
-  if [ "$NEED_SMMSTORE_MIGRATION" = "true" ]; then
-    smmstore_migration
-  fi
-
-  if [ "$NEED_BOOTSPLASH_MIGRATION" = "true" ]; then
-    bootsplash_migration
-  fi
-
-  cbfstool "$BIOS_UPDATE_FILE" extract -r COREBOOT -n config -f "$BIOS_UPDATE_CONFIG_FILE"
-  grep -q "CONFIG_VBOOT=y" "$BIOS_UPDATE_CONFIG_FILE"
-  HAVE_VBOOT="$?"
-
-  check_intel_regions
-  check_blobs_in_binary $BIOS_UPDATE_FILE
-  check_if_me_disabled
-  set_flashrom_update_params $BIOS_UPDATE_FILE
-  set_intel_regions_update_params "-N --ifd"
-  check_vboot_keys
-
-  echo "Updating Dasharo firmware..."
-  print_warning "This may take several minutes. Please be patient and do not power off your computer or touch the keyboard!"
-
-  # FLASHROM_ADD_OPT_UPDATE_OVERRIDE takes priority over auto-detected update params.
-  # It set only by platform-specific and firmware version-specific conditions
-  if [ -v FLASHROM_ADD_OPT_UPDATE_OVERRIDE ]; then
-    # To standardize the operation of the FLASHROM_ADD_OPT_UPDATE_OVERRIDE flag,
-    # by default it contains only the bios section, below we verify the
-    # downloaded binary and add more sections when they were detected after
-    # using the `check_blobs_in_binary` function.
-    set_intel_regions_update_params "$FLASHROM_ADD_OPT_UPDATE_OVERRIDE"
-    FLASHROM_ADD_OPT_UPDATE_OVERRIDE="$FLASHROM_ADD_OPT_REGIONS"
-    $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_UPDATE_OVERRIDE} -w "$BIOS_UPDATE_FILE"  >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-    error_check "Failed to update Dasharo firmware"
-  else
-    $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_UPDATE} -w "$BIOS_UPDATE_FILE"  >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-    error_check "Failed to update Dasharo firmware"
-
-    if [ $BINARY_HAS_RW_B -eq 0 ]; then
-      echo "Updating second firmware partition..."
-      $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} --fmap -N -i RW_SECTION_B -w "$BIOS_UPDATE_FILE"  >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-      error_check "Failed to update second firmware partition"
-    fi
-  fi
-
-  # We use FLASHROM_ADD_OPT_REGIONS for updating ME and IFD.
-  # If FLASHROM_ADD_OPT_REGIONS remains the same after
-  # set_intel_regions_update_params or is cleared, it means
-  # we either cannot update any region, or were not allowed to,
-  # or platform has no descriptor.
-  if [ "$FLASHROM_ADD_OPT_REGIONS" != "-N --ifd" ] && [ "$FLASHROM_ADD_OPT_REGIONS" != "" ]; then
-    UPDATE_STRING=""
-    grep -q "\-i fd" <<< "$FLASHROM_ADD_OPT_REGIONS"
-    UPDATE_IFD=$?
-    grep -q "\-i me" <<< "$FLASHROM_ADD_OPT_REGIONS"
-    UPDATE_ME=$?
-    if [ $UPDATE_IFD -eq 0 ]; then
-      UPDATE_STRING+="Flash Descriptor"
-      if [ $UPDATE_ME -eq 0 ]; then
-        UPDATE_STRING+=" and "
-      fi
-    fi
-    if [ $UPDATE_ME -eq 0 ]; then
-      UPDATE_STRING+="Managment Engine"
-    fi
-    echo "Updating $UPDATE_STRING"
-    $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_REGIONS} -w "$BIOS_UPDATE_FILE" >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-    error_check "Failed to update $UPDATE_STRING"
-  fi
-
-  if [ ! -z "$SWITCHING_TO" ]; then
-    # Any post-branch-switch messaging should go here
-    case "$SWITCHING_TO" in
-      "uefi")
-        print_green "Successfully switched to Dasharo UEFI firmware."
-        print_warning "You may need to re-create boot manager entries!"
-        ;;
-      "heads")
-        print_green "Successfully switched to Dasharo Heads firmware."
-        print_warning "On first boot you will see a warning about unsealing TOTP secrets."
-        print_warning "This is expected. Run OEM Factory Reset / Re-Ownership to finish deploying Heads."
-        ;;
-    esac
-    echo "Press any key to continue" # Make sure the user acknowledges.
-    read -n 1 -r input
-  else
-    # Regular update flow
-    print_green "Successfully updated Dasharo firmware."
-  fi
-
-  if [ "$HAVE_EC" == "true" ]; then
-    echo "Updating Embedded Controller firmware. Your computer will power off automatically when done."
-    update_ec # Ends in a reset, does not exit
-  else
-    echo -n "Syncing disks... "
-    sync
-    echo "Done."
-    echo "The computer will reboot automatically in 5 seconds"
-    sleep 0.5
-    echo "Rebooting in 5s:"
-    echo "5..."
-    sleep 1
-    echo "4..."
-    sleep 1
-    echo "3..."
-    sleep 1
-    echo "2..."
-    sleep 1
-    echo "1..."
-    sleep 0.5
-    echo "Rebooting"
-    sleep 1
-    ${CMD_REBOOT}
-  fi
-
-
-}
-
-restore() {
-  while : ; do
-    echo
-    echo "Restoring firmware from HCL report."
-    echo "Take note that this will only restore BIOS firmware, no EC."
-    echo "Please select one of available options."
-
-    echo "  1) Check for HCL report stored locally"
-    if [ -n "${DES_IS_LOGGED}" ]; then
-      echo "  2) Check for HCL report stored on 3mdeb cloud"
-    fi
-    echo "  b) Back to main menu"
-    echo
-    read -r -p "Enter an option: " OPTION
-    echo
-
-    # HCL report should be named as in dasharo-hcl-report so we can find
-    # the package based on uuid saved in name, we need to check two options
-    # with and without MAC address
-    uuid_string=`cat /sys/class/net/$(ip route show default | awk '/default/ {print $5}')/address`
-    # if above gives error then there is no internet connection and first
-    # part of uuid should be blank
-    if [ ! $? -eq 0 ]; then
-      uuid_string=""
-    fi
-    uuid_string+="_$(dmidecode -s system-product-name)"
-    uuid_string+="_$(dmidecode -s system-manufacturer)"
-    uuid=`uuidgen -n @x500 -N $uuid_string -s`
-
-    case ${OPTION} in
-      1)
-        echo
-        echo "Searching for HCL report on device..."
-
-        HCL_REPORT_PACKAGE="$(find / -name "*$uuid*" | head -n1)"
-        if [ ! -z $HCL_REPORT_PACKAGE ]; then
-          tar -zxf "$HCL_REPORT_PACKAGE" -C /tmp
-          echo "Restoring BIOS firmware..."
-          if [ -f "/tmp/logs/rom.bin" ]; then
-            print_green "Found $HCL_REPORT_PACKAGE"
-            read -p "Do you want to restore firmware from the given HCL report? [N/y] "
-            case ${REPLY} in
-                yes|y|Y|Yes|YES)
-                  # Ideally we would like to write the entire flash when restoring,
-                  # but in reality we may face locked or unaccessible regions.
-                  # To be on the safe side, flash whatever can be flashed by determining
-                  # what is writable.
-                  check_flash_lock
-                  check_intel_regions
-                  check_blobs_in_binary /tmp/logs/rom.bin
-                  check_if_me_disabled
-                  set_intel_regions_update_params "-N --ifd -i bios"
-                  $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_REGIONS} -w "/tmp/logs/rom.bin" >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-                  error_check "Failed to restore BIOS firmware! You can try one more time."
-                  print_green "Successfully restored firmware"
-                  echo "Returning to main menu..."
-                  exit 0
-                  ;;
-                *)
-                  echo "Returning to main menu..."
-                  exit 0
-                  ;;
-            esac
-          else
-            print_error "Report does not have firmware backup!"
-          fi
-        else
-          print_warning "No HCL report found, cannot restore firmware"
-          echo "Returning to main menu..."
-          exit 0
-        fi
-        ;;
-      2)
-        echo
-        echo "Searching for HCL report on cloud..."
-
-        ${CMD_CLOUD_LIST} $uuid
-        error_check "Could not download HCL report from cloud."
-
-        HCL_REPORT_PACKAGE="$(find / -name *$uuid* | head -n1)"
-        tar -zxf "$HCL_REPORT_PACKAGE" -C /tmp
-        echo "Restoring BIOS firmware..."
-        if [ -f "/tmp/logs/rom.bin" ]; then
-          # Ideally we would like to write the entire flash when restoring,
-          # but in reality we may face locked or unaccessible regions.
-          # To be on the safe side, flash whatever can be flashed by determining
-          # what is writable.
-          check_flash_lock
-          check_intel_regions
-          check_blobs_in_binary /tmp/logs/rom.bin
-          check_if_me_disabled
-          set_intel_regions_update_params "-N --ifd -i bios"
-          flashrom -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_REGIONS} -w "/tmp/logs/rom.bin" >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-          error_check "Failed to restore BIOS firmware! You can try one more time."
-          print_green "Successfully restored firmware"
-        else
-          print_error "Report does not have firmware backup!"
-        fi
-        ;;
-      b|B)
-        echo "Returning to main menu..."
-        exit 0
-        ;;
-      *)
-        ;;
-    esac
-  done
-}
-
-usage() {
-  echo "Usage:"
-  echo "  $0 install  - Install Dasharo on this device"
-  echo "  $0 backup   - Backup current firmware"
-  echo "  $0 restore  - Restore from a previously saved backup"
-}
-
-# for FUM we start in dasharo-deploy so we need to verify that we have internet
-# connection to download shasums in board_config
-if [ "$FUM" == "fum" ]; then
-    check_network_connection
-fi
-
-board_config
-check_flash_chip
-if [ -v PLATFORM_SIGN_KEY ]; then
-    get_signing_keys
-fi
-
-case "$CMD" in
-  install)
-    if check_if_dasharo; then
-      error_exit "Dasharo Firmware is already installed. This script is only for\r
-        initial deployment of Dasharo Firmware. Aborting..."
-    fi
-    backup
-    install
-    ;;
-  update)
-    if [ "$FUM" == "fum" ]; then
-        echo "Firmware Update Mode detected; proceed with automatic update in 5 seconds"
-        echo "Updating in 5s:"
-        echo "5..."
-        sleep 1
-        echo "4..."
-        sleep 1
-        echo "3..."
-        sleep 1
-        echo "2..."
-        sleep 1
-        echo "1..."
-        sleep 0.5
-    fi
-    update
-    ;;
-  backup)
-    backup
-    ;;
-  restore)
-    if ! check_if_dasharo; then
-      error_exit "Dasharo Firmware is not installed. This script is only for\r
-        restoring original firmware on platforms that runs Dasharo Firmware. Aborting..."
-    fi
-    restore
-    ;;
-  *)
-    usage
-    ;;
-esac
diff --git a/meta-dts-distro/recipes-dts/dts/dts.bb b/meta-dts-distro/recipes-dts/dts/dts.bb
deleted file mode 100644
index 6542d422..00000000
--- a/meta-dts-distro/recipes-dts/dts/dts.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "Dasharo Tools Suite"
-SECTION = "tools"
-HOMEPAGE = "https://docs.dasharo.com"
-
-LICENSE = "MIT"
-
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-SRC_URI = " \
-    file://dts \
-    file://dts-boot \
-    file://dts-profile.sh \
-    file://ec_transition \
-    file://cloud_list \
-    file://dts-environment.sh \
-    file://dts-functions.sh \
-"
-
-S = "${WORKDIR}"
-
-RDEPENDS:${PN} = " \
-    bash \
-    dasharo-hcl-report \
-    iotools \
-"
-
-do_install () {
-    install -d ${D}/${sbindir}
-    install -m 0755 ${S}/dts ${D}/${sbindir}
-    install -m 0755 ${S}/dts-boot ${D}/${sbindir}
-    install -m 0755 ${S}/ec_transition ${D}/${sbindir}
-    install -m 0755 ${S}/cloud_list ${D}/${sbindir}
-    install -m 0664 ${S}/dts-environment.sh ${D}/${sbindir}
-    install -m 0664 ${S}/dts-functions.sh ${D}/${sbindir}
-
-    # install profile dropin so the DTS_ENV and DTS_FUNCS variables are set when
-    # loged via SSH
-    install -d ${D}${sysconfdir}/profile.d/
-    install -m 0755 ${WORKDIR}/dts-profile.sh ${D}${sysconfdir}/profile.d/
-}
diff --git a/meta-dts-distro/recipes-dts/dts/dts/cloud_list b/meta-dts-distro/recipes-dts/dts/dts/cloud_list
deleted file mode 100755
index e5831318..00000000
--- a/meta-dts-distro/recipes-dts/dts/dts/cloud_list
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-
-TMP_RESPONSE="/tmp/webdav_response"
-TMP_LIST="/tmp/cloud_list"
-HW_UUID="$1"
-
-### Error checks
-print_error() {
-  echo -e "$RED""$1""$COLOR_OFF"
-}
-
-error_exit() {
-  _error_msg="$1"
-  print_error "$_error_msg"
-  exit 1
-}
-
-error_check() {
-  _error_code=$?
-  _error_msg="$1"
-  [ "$_error_code" -ne 0 ] && error_exit "$_error_msg : ($_error_code)"
-}
-
-USER_DETAILS="$CLOUDSEND_LOGS_URL:$CLOUDSEND_PASSWORD"
-CLOUD_REQUEST="X-Requested-With: XMLHttpRequest"
-
-tmpURL="https://cloud.3mdeb.com/public.php/webdav/"
-
-curl -L -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" -X PROPFIND "$tmpURL" -o "$TMP_RESPONSE"
-error_check "Cannot access list of files on cloud."
-
-# parse response
-sed -i 's/\://g' "$TMP_RESPONSE"
-sed -i 's/\?//g' "$TMP_RESPONSE"
-sed -i 's/<dresponse>/&\n&\n<dresponse>/g' "$TMP_RESPONSE"
-sed -i 's#<&/dresponse>#<&/dresponse>&\n#g' "$TMP_RESPONSE"
-
-# create line per record
-grep "public.php/webdav/" "$TMP_RESPONSE" > "$TMP_LIST"
-# remove xml tags
-sed -i 's#/dhref.*#\/dhref>#' "$TMP_LIST"
-sed -i 's#<*dresponse>##g' "$TMP_LIST"
-sed -i 's#<dhref>##g' "$TMP_LIST"
-sed -i 's#</dhref>##g' "$TMP_LIST"
-sed -i 's#/public.php/webdav/##g' "$TMP_LIST"
-
-# get first, oldest HCL report with given UUID in name
-HCL_REPORT_NAME=$(cat $TMP_LIST | grep -m1 $HW_UUID)
-
-# download HCL report
-tmpURL="https://cloud.3mdeb.com/public.php/webdav/$HCL_REPORT_NAME"
-curl -L -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" -X GET "$tmpURL" -o /$HCL_REPORT_NAME
-if [ -f /$HCL_REPORT_NAME ]; then
-  echo "Report downloaded"
-else
-  echo "Report not found!"
-  exit 1
-fi
diff --git a/meta-dts-distro/recipes-dts/dts/dts/dts b/meta-dts-distro/recipes-dts/dts/dts/dts
deleted file mode 100644
index 53bf5346..00000000
--- a/meta-dts-distro/recipes-dts/dts/dts/dts
+++ /dev/null
@@ -1,227 +0,0 @@
-#!/usr/bin/env bash
-
-source $DTS_ENV
-source $DTS_FUNCS
-
-trap : 2
-trap : 3
-
-check_os_version() {
-  local os_version=$(grep "VERSION_ID" ${OS_VERSION_FILE} | cut -d "=" -f 2-)
-  echo "  DTS version v${os_version}"
-}
-
-print_disclaimer() {
-echo -e \
-"Please note that the report is not anonymous, but we will use it only for\r
-backup and future improvement of the Dasharo product. Every log is encrypted\r
-and sent over HTTPS, so security is assured.\r
-If you still have doubts, you can skip HCL report generation.\r\n
-What is inside the HCL report? We gather information about:\r
-  - PCI, Super I/O, GPIO, EC, audio, and Intel configuration,\r
-  - MSRs, CMOS NVRAM, CPU info, DIMMs, state of touchpad, SMBIOS and ACPI tables,\r
-  - Decoded BIOS information, full firmware image backup, kernel dmesg,\r
-  - IO ports, input bus types, and topology - including I2C and USB,\r
-\r
-You can find more info about HCL in docs.dasharo.com/glossary\r"
-}
-
-print_banner() {
-echo '    ____             __                        ______            __        _____       _ __'
-echo '   / __ \____ ______/ /_  ____ __________     /_  __/___  ____  / /____   / ___/__  __(_) /'____
-echo '  / / / / __ `/ ___/ __ \/ __ `/ ___/ __ \     / / / __ \/ __ \/ / ___/   \__ \/ / / / / __/ _ \'
-echo ' / /_/ / /_/ (__  ) / / / /_/ / /  / /_/ /    / / / /_/ / /_/ / (__  )   ___/ / /_/ / / /_/  __/'
-echo '/_____/\__,_/____/_/ /_/\__,_/_/   \____/    /_/  \____/\____/_/____/   /____/\__,_/_/\__/\___/'
-echo
-}
-
-print_banner
-
-logs_sent="${LOGS_SENT:-}"
-
-while : ; do
-  # Each time the main menu is displayed, check for DES credentials and export
-  # them, if file exists
-  if [ -e "${SE_credential_file}" ]; then
-    export CLOUDSEND_LOGS_URL=$(sed -n '1p' < ${SE_credential_file} | tr -d '\n')
-    export CLOUDSEND_DOWNLOAD_URL=$(sed -n '2p' < ${SE_credential_file} | tr -d '\n')
-    export CLOUDSEND_PASSWORD=$(sed -n '3p' < ${SE_credential_file} | tr -d '\n')
-    export USER_DETAILS="$CLOUDSEND_DOWNLOAD_URL:$CLOUDSEND_PASSWORD"
-    export DES_IS_LOGGED="true"
-  else
-    export CLOUDSEND_LOGS_URL="$BASE_CLOUDSEND_LOGS_URL"
-    export CLOUDSEND_PASSWORD="$BASE_CLOUDSEND_PASSWORD"
-    unset CLOUDSEND_DOWNLOAD_URL
-    unset DES_IS_LOGGED
-  fi
-
-  echo
-  check_os_version
-  echo
-  echo "  1) Dasharo HCL report - dump hardware information from this device"
-  if ! check_if_dasharo; then
-    echo "  2) Install Dasharo firmware"
-  fi
-  if check_if_dasharo; then
-    echo "  3) Restore firmware from Dasharo HCL report"
-  fi
-  if [ -n "${DES_IS_LOGGED}" ]; then
-      echo "  4) Edit your DES keys"
-      echo "     Logs key    : " ${CLOUDSEND_LOGS_URL}
-      echo "     Download key: " ${CLOUDSEND_DOWNLOAD_URL}
-      echo "     Password    : " ${CLOUDSEND_PASSWORD}
-  else
-      echo "  4) Load your DES keys"
-  fi
-  if check_if_dasharo; then
-    echo "  5) Check and apply Dasharo firmware updates"
-  fi
-  if systemctl is-active sshd.socket > /dev/null 2>&1; then
-      echo "  8) Stop SSH server"
-  else
-      echo "  8) Start SSH server"
-  fi
-  echo "  9) Shell"
-  echo "  10) Power off system"
-  echo "  11) Reboot system"
-  echo
-  read -p "Enter an option: " OPTION
-  echo
-
-  case ${OPTION} in
-    1)
-      print_disclaimer
-      read -p "Do you want to support Dasharo development by sending us logs with your hardware configuration? [N/y] "
-      case ${REPLY} in
-          yes|y|Y|Yes|YES)
-          export SEND_LOGS="true"
-          echo "Thank you for contributing to the Dasharo development!"
-          ;;
-          *)
-          export SEND_LOGS="false"
-          echo "Logs will be saved in root directory."
-          echo "Please consider supporting Dasharo by sending the logs next time."
-          ;;
-      esac
-      if [ "${SEND_LOGS}" == "true" ]; then
-          # DEPLOY_REPORT variable is used in dasharo-hcl-report to determine
-          # which logs should be printed in the terminal, in the future whole
-          # dts scripting should get some LOGLEVEL and maybe dumping working
-          # logs to file
-          export DEPLOY_REPORT="false"
-          check_network_connection && ${CMD_DASHARO_HCL_REPORT} && logs_sent="1"
-      else
-          export DEPLOY_REPORT="false"
-          ${CMD_DASHARO_HCL_REPORT}
-      fi
-      ;;
-    2)
-      if ! check_if_dasharo; then
-        if check_network_connection; then
-          echo "Preparing ..."
-          if [ -z "${logs_sent}" ]; then
-            export SEND_LOGS="true"
-            export DEPLOY_REPORT="true"
-            if ! ${CMD_DASHARO_HCL_REPORT}; then
-              echo -e "Unable to connect to cloud.3mdeb.com for submitting the
-                        \rHCL report. Please recheck your internet connection."
-            else
-              logs_sent="1"
-            fi
-          fi
-        fi
-      fi
-
-      if [ -n "${logs_sent}" ]; then
-          ${CMD_DASHARO_DEPLOY} install
-      fi
-      ;;
-    3)
-      if check_if_dasharo; then
-        ${CMD_DASHARO_DEPLOY} restore
-      fi
-      ;;
-    4)
-      echo ""
-      read -p "Enter logs key:                " 'TMP_CLOUDSEND_LOGS_URL'
-      echo ""
-      read -p "Enter firmware download key:   " 'TMP_CLOUDSEND_DOWNLOAD_URL'
-      echo ""
-      read -p "Enter password:                " 'TMP_CLOUDSEND_PASSWORD'
-
-      echo ${TMP_CLOUDSEND_LOGS_URL} > ${SE_credential_file}
-      echo ${TMP_CLOUDSEND_DOWNLOAD_URL} >> ${SE_credential_file}
-      echo ${TMP_CLOUDSEND_PASSWORD} >> ${SE_credential_file}
-
-      print_green "Dasharo DES credentials have been saved"
-      echo "Verifying Dasharo DES credentials..."
-
-      check_se_creds
-      if [ $? -eq 0 ]; then
-         print_green "Verification of the Dasharo DES was successful. They are valid and will be used."
-      else
-        echo -e "Something may be wrong with the DES credentials. Please use option 4 to change the DES keys
-                  \rand make sure that there is no typo."
-        rm ${SE_credential_file}
-        export CLOUDSEND_LOGS_URL="$BASE_CLOUDSEND_LOGS_URL"
-        export CLOUDSEND_PASSWORD="$BASE_CLOUDSEND_PASSWORD"
-        unset CLOUDSEND_DOWNLOAD_URL
-        unset DES_IS_LOGGED
-      fi
-      ;;
-    5)
-      if check_if_dasharo; then
-        # For NovaCustom TGL laptops with Dasharo version lower than 1.3.0,
-        # we shall run the ec_transition script instead. See:
-        # https://docs.dasharo.com/variants/novacustom_nv4x_tgl/releases/#v130-2022-10-18
-        if [ "$BOARD_VENDOR" = "Notebook" ]; then
-            case "$SYSTEM_MODEL" in
-              "NS50_70MU"|"NV4XMB,ME,MZ")
-                compare_versions $DASHARO_VERSION 1.3.0
-                if [ $? -eq 1 ]; then
-                # For Dasharo version lesser than 1.3.0
-                  print_warning "Detected NovaCustom hardware with version < 1.3.0"
-                  print_warning "Need to perform EC transition after which the platform will turn off"
-                  print_warning "Then, please power it on and proceed with update again"
-                  print_warning "EC transition procedure will start in 5 seconds"
-                  sleep 5
-                  ${CMD_EC_TRANSITION}
-                  error_check "Could not perform EC transition"
-                fi
-                # Continue with regular update process for Dasharo version
-                #  greater or equal 1.3.0
-                ;;
-            esac
-        fi
-
-        # Use regular update process for everything else
-        ${CMD_DASHARO_DEPLOY} update
-      fi
-      ;;
-    8)
-      if systemctl is-active sshd.socket > /dev/null 2>&1; then
-        print_green "Turning off the SSH server..."
-        systemctl stop sshd.socket
-      else
-        print_warning "Starting SSH server!"
-        print_warning "Now you can log in into the system using root account."
-        print_warning "Stopping server will not drop all connected sessions."
-        systemctl start sshd.socket
-        print_green "Listening on IPs: $(ip -br -f inet a show scope global | grep UP | awk '{ print $3 }' | tr '\n' ' ')"
-      fi
-      ;;
-    9)
-      echo "Entering shell, to leave type exit and press Enter or press LCtrl+D"
-      echo ""
-      ${CMD_SHELL}
-      ;;
-    10)
-      ${CMD_POWEROFF}
-      ;;
-    11)
-      ${CMD_REBOOT}
-      ;;
-    *)
-      ;;
-  esac
-done
diff --git a/meta-dts-distro/recipes-dts/dts/dts/dts-boot b/meta-dts-distro/recipes-dts/dts/dts/dts-boot
deleted file mode 100644
index a1be141a..00000000
--- a/meta-dts-distro/recipes-dts/dts/dts/dts-boot
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-SBIN_DIR="/usr/sbin"
-FUM_EFIVAR="/sys/firmware/efi/vars/FirmwareUpdateMode-d15b327e-ff2d-4fc1-abf6-c12bd08c1359"
-
-export DTS_FUNCS="$SBIN_DIR/dts-functions.sh"
-export DTS_ENV="$SBIN_DIR/dts-environment.sh"
-
-if [ -d $FUM_EFIVAR ]; then
-    $SBIN_DIR/dasharo-deploy update fum
-else
-    $SBIN_DIR/dts
-fi
-
diff --git a/meta-dts-distro/recipes-dts/dts/dts/dts-environment.sh b/meta-dts-distro/recipes-dts/dts/dts/dts-environment.sh
deleted file mode 100644
index 9baa8185..00000000
--- a/meta-dts-distro/recipes-dts/dts/dts/dts-environment.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env bash
-
-# Text Reset
-COLOR_OFF='\033[0m'
-RED='\033[0;31m'
-YELLOW='\033[0;33m'
-GREEN='\033[0;32m'
-
-BOARD_VENDOR="${BOARD_VENDOR:-$(dmidecode -s system-manufacturer)}"
-SYSTEM_MODEL="${SYSTEM_MODEL:-$(dmidecode -s system-product-name)}"
-BOARD_MODEL="${BOARD_MODEL:-$(dmidecode -s baseboard-product-name)}"
-
-BIOS_VENDOR="${BIOS_VENDOR:-$(dmidecode -s bios-vendor)}"
-BIOS_VERSION="${BIOS_VERSION:-$(dmidecode -s bios-version)}"
-DASHARO_VERSION="$(echo $BIOS_VERSION | cut -d ' ' -f 3 | tr -d 'v')"
-DASHARO_FLAVOR="$(echo $BIOS_VERSION | cut -d ' ' -f 1,2)"
-
-# path to temporary files, created while deploying or updating Dasharo firmware
-BIOS_UPDATE_FILE="/tmp/biosupdate.rom"
-EC_UPDATE_FILE="/tmp/ecupdate.rom"
-BIOS_HASH_FILE="/tmp/bioshash.sha256"
-EC_HASH_FILE="/tmp/echash.sha256"
-BIOS_SIGN_FILE="/tmp/biossignature.sig"
-EC_SIGN_FILE="/tmp/ecsignature.sig"
-BIOS_UPDATE_CONFIG_FILE="/tmp/biosupdate_config"
-RESIGNED_BIOS_UPDATE_FILE="/tmp/biosupdate_resigned.rom"
-SYSTEM_UUID_FILE="/tmp/system_uuid.txt"
-SERIAL_NUMBER_FILE="/tmp/serial_number.txt"
-
-# default value for flash chip related information
-FLASH_CHIP_SELECT=""
-FLASH_CHIP_SIZE=""
-
-# dasharo-deploy backup cmd related variables, do we still use and need this as
-# backup is placed in HCL?
-ROOT_DIR="/"
-FW_BACKUP_NAME="fw_backup"
-FW_BACKUP_DIR="${ROOT_DIR}${FW_BACKUP_NAME}"
-FW_BACKUP_TAR="${FW_BACKUP_DIR}.tar.gz"
-FW_BACKUP_TAR="$(echo "$FW_BACKUP_TAR" | sed 's/\ /_/g')"
-
-# path to system files
-ERR_LOG_FILE="/var/local/dts-err.log"
-FLASHROM_LOG_FILE="/var/local/flashrom.log"
-FLASH_INFO_FILE="/tmp/flash_info"
-OS_VERSION_FILE="/etc/os-release"
-KEYS_DIR="/tmp/devkeys"
-
-# path to system commands
-CMD_POWEROFF="/sbin/poweroff"
-CMD_REBOOT="/sbin/reboot"
-CMD_SHELL="/bin/bash"
-CMD_DASHARO_HCL_REPORT="/usr/sbin/dasharo-hcl-report"
-CMD_NCMENU="/usr/sbin/novacustom_menu"
-CMD_DASHARO_DEPLOY="/usr/sbin/dasharo-deploy"
-CMD_CLOUD_LIST="/usr/sbin/cloud_list"
-CMD_EC_TRANSITION="/usr/sbin/ec_transition"
-
-# default values for flashrom programmer
-FLASHROM="${FLASHROM:-flashrom}"
-PROGRAMMER_BIOS="internal"
-PROGRAMMER_EC="ite_ec"
-
-DASHARO_ECTOOL="${DASHARO_ECTOOL:-dasharo_ectool}"
-
-# variables defining Dasharo specific entries in DMI tables, used to check if
-# Dasharo FW is already installed
-DASHARO_VENDOR="3mdeb"
-DASHARO_NAME="Dasharo"
-
-# most the time one flash chipset will be detected, for other cases (like for
-# ASUS KGPE-D16) we will test the following list in check_flash_chip function
-FLASH_CHIP_LIST="W25Q64BV/W25Q64CV/W25Q64FV W25Q64JV-.Q W25Q128.V..M"
-
-# Dasharo Supporters Entrance variables
-SE_credential_file="/etc/cloud-pass"
-FW_STORE_URL="${FW_STORE_URL_DEV:-https://dl.3mdeb.com/open-source-firmware/Dasharo}"
-FW_STORE_URL_DES="https://cloud.3mdeb.com/public.php/webdav"
-CLOUD_REQUEST="X-Requested-With: XMLHttpRequest"
-
-## base values
-BASE_CLOUDSEND_LOGS_URL="39d4biH4SkXD8Zm"
-BASE_CLOUDSEND_PASSWORD="1{\[\k6G"
-DEPLOY_REPORT="false"
-
-# set custom localization for PGP keys
-if [ -d /home/root/.dasharo-gnupg ]; then
-    GNUPGHOME=/home/root/.dasharo-gnupg
-
-    export GNUPGHOME
-fi
diff --git a/meta-dts-distro/recipes-dts/dts/dts/dts-profile.sh b/meta-dts-distro/recipes-dts/dts/dts/dts-profile.sh
deleted file mode 100644
index 89fa0387..00000000
--- a/meta-dts-distro/recipes-dts/dts/dts/dts-profile.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-SBIN_DIR="/usr/sbin"
-export DTS_FUNCS="$SBIN_DIR/dts-functions.sh"
-export DTS_ENV="$SBIN_DIR/dts-environment.sh"
diff --git a/meta-dts-distro/recipes-dts/dts/dts/ec_transition b/meta-dts-distro/recipes-dts/dts/dts/ec_transition
deleted file mode 100644
index 019a79d8..00000000
--- a/meta-dts-distro/recipes-dts/dts/dts/ec_transition
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/bin/env bash
-
-source $DTS_ENV
-source $DTS_FUNCS
-
-check_network_connection() {
-  echo 'Waiting for network connection ...'
-  n="5"
-  while : ; do
-    ping -c 3 cloud.3mdeb.com > /dev/null 2>&1 && break
-    n=$((n-1))
-    if [ "${n}" == "0" ]; then
-      error_exit "No network connection to 3mdeb cloud, please recheck Ethernet connection"
-    fi
-    sleep 1
-  done
-}
-
-board_config() {
-  case "$BOARD_VENDOR" in
-    "Notebook")
-      case "$SYSTEM_MODEL" in
-        "NS50_70MU")
-          HAVE_EC="true"
-          NEED_EC_RESET="true"
-          COMPATIBLE_EC_FW_VERSION="2022-08-31_cbff21b"
-          EC_HASH="d1001465cea74a550914c14f0c8f901b14827a3b5fa0b612ae6d11594ac2b405  /tmp/ecupdate.rom"
-          BIOS_HASH="d4c30660c53bac505997de30b9eac4c5ac15f3212c62366730dc2ca3974bba18  /tmp/biosupdate.rom"
-          PROGRAMMER_BIOS="internal"
-          PROGRAMMER_EC="ite_ec"
-          BIOS_LINK="https://cloud.3mdeb.com/index.php/s/SKpqSNzfFNY7AbK/download"
-          EC_LINK="https://cloud.3mdeb.com/index.php/s/GK2KbXaYprkCCWM/download"
-          ;;
-        "NV4XMB,ME,MZ")
-          HAVE_EC="true"
-          NEED_EC_RESET="true"
-          COMPATIBLE_EC_FW_VERSION="2022-10-07_c662165"
-          EC_HASH="7a75fd9afd81012f7c1485cc335298979509e5929d931d898465fbddb4ce105c  /tmp/ecupdate.rom"
-          BIOS_HASH="7271b638c87cba658162931f55bdaa6987eb5b0555075ce8e2297a79a505c8b0  /tmp/biosupdate.rom"
-          PROGRAMMER_BIOS="internal:boardmismatch=force"
-          PROGRAMMER_EC="ite_ec:boardmismatch=force,romsize=128K,autoload=disable"
-          BIOS_LINK="https://cloud.3mdeb.com/index.php/s/3cjkJSWBzPfb5SP/download"
-          EC_LINK="https://cloud.3mdeb.com/index.php/s/9S5Tmy6kwFjpcNm/download"
-          ;;
-        *)
-          error_exit "Board model $SYSTEM_MODEL is currently not supported"
-	;;
-      esac
-      ;;
-    *)
-      error_exit "Board vendor: $BOARD_VENDOR is currently not supported"
-      ;;
-  esac
-}
-
-check_for_opensource_firmware()
-{
-  echo "Checking for opensource firmware"
-  $DASHARO_ECTOOL info >> /dev/null 2>&1
-  if [ $? -eq 0 ]; then
-    error_exit "Device has already Open Source Embedded Controller firmware, aborting..."
-  fi
-}
-
-download_files()
-{
-  check_network_connection
-  BIOS_UPDATE_FILE="/tmp/biosupdate.rom"
-  EC_UPDATE_FILE="/tmp/ecupdate.rom"
-  wget -O $EC_UPDATE_FILE $EC_LINK
-  error_check "Cannot download EC update file. Aborting..."
-  wget -O $BIOS_UPDATE_FILE $BIOS_LINK
-  error_check "Cannot download FW update file. Aborting..."
-  echo "Successfully downloaded EC and FW files."
-}
-
-update_ec() {
-  sha256sum --check <(echo "$EC_HASH")
-  error_check "Failed to download EC firmware update"
-
-  echo "Updating EC..."
-  $FLASHROM -p ${PROGRAMMER_EC} -w /tmp/ecupdate.rom >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-  error_check "Failed to update EC firmware"
-
-  echo "Successfully updated EC firmware"
-}
-
-install() {
-  sha256sum --check <(echo "$BIOS_HASH")
-  error_check "Failed to verify Dasharo firmware"
-
-  if [ "$HAVE_EC" == "true" ]; then
-    _ec_fw_version=$($FLASHROM -p ${PROGRAMMER_EC} | grep "Mainboard EC Version" | tr -d ' ' | cut -d ':' -f 2)
-
-    if [ "$_ec_fw_version" != "$COMPATIBLE_EC_FW_VERSION" ]; then
-      echo "EC version: $_ec_fw_version is not supported, update required"
-      update_ec
-    fi
-  fi
-
-  echo "Installing Dasharo firmware..."
-  $FLASHROM -p ${PROGRAMMER_BIOS} --ifd -i bios -w /tmp/biosupdate.rom >> $FLASHROM_LOG_FILE 2>> $ERR_LOG_FILE
-  error_check "Failed to install Dasharo firmware"
-
-  echo "Successfully installed Dasharo firmware"
-
-  echo "Powering off"
-  sleep 1
-  if [ "$NEED_EC_RESET" = "true" ]; then
-    it5570_shutdown
-  else
-    ${CMD_POWEROFF}
-  fi
-}
-
-usage() {
-  echo "Usage:"
-  echo "  $0 "
-  exit 1
-}
-
-ROOT_DIR="/"
-
-[ -z "$BOARD_VENDOR" ] && error_exit "BOARD_VENDOR not given"
-[ -z "$SYSTEM_MODEL" ] && error_exit "SYSTEM_MODEL not given"
-
-check_for_opensource_firmware
-board_config
-download_files
-install
diff --git a/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb b/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
index eacb03fd..4a1c18f2 100644
--- a/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
+++ b/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
@@ -43,13 +43,11 @@ RDEPENDS:${PN}-tools-base = " \
 RDEPENDS:${PN}-tools-dts = " \
     mei-amt-check \
     cloudsend \
-    dasharo-deploy \
-    dasharo-hcl-report \
-    dts \
     dasharo-ectool \
     txt-suite \
     bg-suite \
     dasharo-configuration-utility \
+    dts-scripts \
 "
 
 RDEPENDS:${PN}-python = " \
diff --git a/meta-dts-distro/recipes-dts/reports/dasharo-hcl-report.bb b/meta-dts-distro/recipes-dts/reports/dasharo-hcl-report.bb
deleted file mode 100644
index 0b7471fd..00000000
--- a/meta-dts-distro/recipes-dts/reports/dasharo-hcl-report.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Dasharo HCL Report"
-SECTION = "tools"
-HOMEPAGE = "https://github.com/Dasharo/jubilant-octo-train/blob/master/config/includes.chroot/usr/bin/dasharo-hcl-report"
-
-LICENSE = "MIT"
-
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-SRC_URI = " \
-    file://dasharo-hcl-report \
-"
-
-S = "${WORKDIR}"
-
-RDEPENDS:${PN} = " \
-    packagegroup-coreboot-utils \
-    flashrom \
-    iasl \
-    tar \
-    i2c-tools \
-    i2c-tools-misc \
-    bash \
-    touchpad-info \
-    dmidecode \
-"
-
-do_install () {
-    install -d ${D}/${sbindir}
-    install -m 0755 ${S}/dasharo-hcl-report ${D}/${sbindir}
-}
diff --git a/meta-dts-distro/recipes-dts/reports/dasharo-hcl-report/dasharo-hcl-report b/meta-dts-distro/recipes-dts/reports/dasharo-hcl-report/dasharo-hcl-report
deleted file mode 100755
index 96f33354..00000000
--- a/meta-dts-distro/recipes-dts/reports/dasharo-hcl-report/dasharo-hcl-report
+++ /dev/null
@@ -1,370 +0,0 @@
-#!/usr/bin/env bash
-
-source $DTS_ENV
-source $DTS_FUNCS
-
-update_result() {
-  TOOL=$1
-  ERRORFILE=$2
-  LOGFILE=`printf $2 | sed 's/[.].*$//' && echo ".log"`
-
-  # check if status was set as a unknown
-  if [ ! -v $3 ]; then
-   echo -e [$YELLOW"UNKNOWN"$COLOR_OFF]"\t"$TOOL >> result
-   return
-  fi
-
-  ERR=$(stat -c%s "$ERRORFILE" 2> /dev/null)
-  LOG=$(stat -c%s "$LOGFILE" 2> /dev/null)
-
-  # if ERR or LOG var is empty, set it to 1 so we will go into UNKNOWN state
-  if [ -z "$LOG" ]; then
-    LOG=1
-  fi
-  if [ -z "$ERR" ]; then
-    ERR=1
-  fi
-  # specific check for firmware dump
-  if [ $LOGFILE == "logs/flashrom_read.log" ]; then
-    if [ $LOG -ne 0 ] && [ -f "logs/rom.bin" ]; then
-      echo -e [$GREEN"OK"$COLOR_OFF]"\t\t"$TOOL >> result
-    else
-      echo -e [$RED"ERROR"$COLOR_OFF]"\t\t"$TOOL >> result
-    fi
-    return
-  fi
-
-  # generic checks
-  if [ $LOG -ne 0 ] && [ $ERR -eq 0 ]; then
-   echo -e [$GREEN"OK"$COLOR_OFF]"\t\t"$TOOL >> result
-  elif [ $LOG -eq 0 ] && [ $ERR -ne 0 ]; then
-   echo -e [$RED"ERROR"$COLOR_OFF]"\t\t"$TOOL >> result
-  else
-   echo -e [$YELLOW"UNKNOWN"$COLOR_OFF]"\t"$TOOL >> result
-  fi
-}
-
-CMD_DASHARO_DEPLOY="/usr/sbin/dasharo-deploy"
-
-if [ "$(id -u)" -ne 0 ]; then
-  echo "This script must be started as root!"
-  exit 1
-fi
-
-if [ -d logs ]; then
-  rm -rf logs
-fi
-
-FULL_UPLOAD_URL="https://cloud.3mdeb.com/index.php/s/"${CLOUDSEND_LOGS_URL}
-
-check_flash_chip
-
-mkdir logs
-if [ $DEPLOY_REPORT = "false" ]; then
-  echo "Getting hardware information. It will take a few minutes..."
-fi
-# echo "Dumping PCI configuration space and topology..."
-lspci -nnvvvxxxx > logs/lspci.log 2> logs/lspci.err.log
-update_result "PCI configuration space and topology" logs/lspci.err.log
-printf '##                                                                 |\r'
-
-# echo "Dumping USB devices and topology..."
-lsusb -vvv > logs/lsusb.log 2> logs/lsusb.err.log
-update_result "USB devices and topology" logs/lsusb.err.log
-printf '####                                                               |\r'
-
-# echo "Dumping Super I/O configuration..."
-superiotool -deV > logs/superiotool.log 2> logs/superiotool.err.log
-update_result "Super I/O configuration" logs/superiotool.err.log
-printf '######                                                             |\r'
-
-# echo "Dumping Embedded Controller configuration (this may take a while if EC is not present)..."
-ectool -ip > logs/ectool.log 2> logs/ectool.err.log
-update_result "EC configuration" logs/ectool.err.log
-printf '########                                                           |\r'
-
-# echo "Dumping MSRs..."
-msrtool > logs/msrtool.log 2> logs/msrtool.err.log
-update_result "MSRs" logs/msrtool.err.log
-printf '##########                                                         |\r'
-
-# echo "Dumping SMBIOS tables..."
-dmidecode > logs/dmidecode.log 2> logs/dmidecode.err.log
-update_result "SMBIOS tables" logs/dmidecode.err.log
-printf '############                                                       |\r'
-
-# echo "Decoding BIOS information..."
-biosdecode > logs/biosdecode.log 2> logs/biosdecode.err.log
-update_result "BIOS information" logs/biosdecode.err.log
-printf '##############                                                     |\r'
-
-# echo "Extracting CMOS NVRAM..."
-nvramtool -x > logs/nvramtool.log 2> logs/nvramtool.err.log
-update_result "CMOS NVRAM" logs/nvramtool.err.log
-printf '################                                                   |\r'
-
-# echo "Dumping Intel configuration registers..."
-inteltool -a > logs/inteltool.log 2> logs/inteltool.err.log
-update_result "Intel configuration registers" logs/inteltool.err.log
-printf '##################                                                 |\r'
-
-# echo "Generating GPIO configuration C header files for coreboot..."
-intelp2m -file logs/inteltool.log -fld cb -i -p snr -o logs/gpio_snr.h > logs/intelp2m.log 2> logs/intelp2m.err.log
-intelp2m -file logs/inteltool.log -fld cb -i -p cnl -o logs/gpio_cnl.h >> logs/intelp2m.log 2>> logs/intelp2m.err.log
-intelp2m -file logs/inteltool.log -fld cb -i -p apl -o logs/gpio_apl.h >> logs/intelp2m.log 2>> logs/intelp2m.err.log
-intelp2m -file logs/inteltool.log -fld cb -i -p lbg -o logs/gpio_lbg.h >> logs/intelp2m.log 2>> logs/intelp2m.err.log
-update_result "GPIO configuration C header files" logs/intelp2m.err.log
-printf '####################                                               |\r'
-
-# echo "Dumping kernel dmesg..."
-dmesg > logs/dmesg.log 2> logs/dmesg.err.log
-update_result "kernel dmesg" logs/dmesg.err.log
-printf '######################                                             |\r'
-
-# echo "Dumping ACPI tables..."
-acpidump > logs/acpidump.log 2> logs/acpidump.err.log
-update_result "ACPI tables" logs/acpidump.err.log
-printf '########################                                           |\r'
-
-# echo "Dumping Audio devices configuration..."
-
-# This is a workaround to soundcard's files absence in short time after booting.
-# Thread is continued here https://github.com/Dasharo/dasharo-issues/issues/247
-for t in {1..12}
-do
-  SND_HW_FILES=/sys/class/sound/card0/hw*/init_pin_configs
-  SND_CODEC_FILES=/proc/asound/card0/codec#*
-  SND_HW_FILE=`echo $SND_HW_FILES | cut -d ' ' -f 1`
-  SND_CODEC_FILE=`echo $SND_CODEC_FILES | cut -d ' ' -f 1`
-
-  if [ -f "$SND_HW_FILE" ] && [ -f "$SND_CODEC_FILE" ]; then
-    break
-  else
-    sleep 5
-    if [ $t -eq 12 ]; then
-      if [ $DEPLOY_REPORT = "false" ]; then
-        echo "Sound card files are missing!"
-      fi
-    fi
-  fi
-done
-
-for x in /sys/class/sound/card0/hw*; do cat "$x/init_pin_configs" > logs/pin_"$(basename "$x")" 2> logs/pin_"$(basename "$x")".err.log; done
-for x in /proc/asound/card0/codec#*; do cat "$x" > logs/"$(basename "$x")" 2> logs/"$(basename "$x")".err.log; done
-update_result "Audio devices configuration" 0 UNKNOWN
-printf '##########################                                         |\r'
-
-# echo "Dumping CPU info..."
-cat /proc/cpuinfo > logs/cpuinfo.log 2> logs/cpuinfo.err.log
-update_result "CPU info" logs/cpuinfo.err.log
-printf '############################                                       |\r'
-
-# echo "Dumping I/O ports..."
-cat /proc/ioports > logs/ioports.log 2> logs/ioports.err.log
-update_result "I/O ports" logs/ioports.err.log
-printf '##############################                                     |\r'
-
-# echo "Dumping input bus types..."
-cat /sys/class/input/input*/id/bustype > logs/input_bustypes.log
-update_result "Input bus types"  logs/ioports.err.log
-printf '################################                                   |\r'
-
-# echo "Trying to read firmware image with flashrom..."
-# Some regions may be not available so we need to use specific regions to read
-check_intel_regions
-if [ $BOARD_HAS_FD_REGION -eq 0 ]; then
-  # No descriptor, probably safe to read everything
-  FLASHROM_ADD_OPT_READ=" "
-else
-  # Use safe defaults. Descriptor may contain additional regions not detected
-  # by flashrom and will return failure when attempted to be read. BIOS and
-  # Flash descriptor regions should always be readable. If not, then we have
-  # some ugly case, hard to deal with.
-  FLASHROM_ADD_OPT_READ="--ifd -i fd -i bios"
-  if [ $BOARD_HAS_ME_REGION -eq 0 ] && [ $BOARD_ME_REGION_LOCKED -ne 0 ]; then
-    # ME region is not locked, read it as well
-    FLASHROM_ADD_OPT_READ+=" -i me"
-  fi
-  if [ $BOARD_HAS_GBE_REGION -eq 0 ] && [ $BOARD_GBE_REGION_LOCKED -ne 0 ]; then
-    # GBE region is present and not locked, read it as well
-    FLASHROM_ADD_OPT_READ+=" -i gbe"
-  fi
-fi
-
-$FLASHROM -V -p internal:laptop=force_I_want_a_brick ${FLASH_CHIP_SELECT} -r logs/rom.bin ${FLASHROM_ADD_OPT_READ} > logs/flashrom_read.log 2> logs/flashrom_read.err.log
-if [ $? -ne 0 ]; then
-  echo "CRITICAL ERROR: cannot dump firmware"
-fi
-update_result "Firmware image" logs/flashrom_read.err.log
-printf '##################################                                 |\r'
-
-# echo "Probing all I2C buses..."
-MAX_I2C_ID=$(i2cdetect -l | awk 'BEGIN{c1=0} //{c1++} END{print "",--c1}')
-for bus in $(seq 0 "$MAX_I2C_ID");
-do
-  echo "I2C bus number: $bus" >> logs/i2cdetect.log 2>> logs/i2cdetect.err.log
-  i2cdetect -y "$bus" >> logs/i2cdetect.log 2>> logs/i2cdetect.err.log
-done
-update_result "I2C bus" logs/i2cdetect.err.log
-printf '####################################                               |\r'
-
-# echo "Decompiling ACPI tables..."
-mkdir -p logs/acpi
-if pushd logs/acpi &> /dev/null; then
-  acpixtract -a ../acpidump.log &>/dev/null
-  iasl -d ./*.dat &>/dev/null
-  popd &> /dev/null
-fi
-update_result "ACPI tables" 0 UNKNOWN
-printf '######################################                             |\r'
-
-# echo "Getting touchpad information..."
-touchpad-info > logs/touchpad.log 2> logs/touchpad.err.log
-update_result "Touchpad information" logs/touchpad.err.log
-printf '########################################                           |\r'
-
-# echo "Getting DIMMs information..."
-decode-dimms > logs/decode-dimms.log 2> logs/decode-dimms.err.log
-update_result "DIMMs information" logs/decode-dimms.err.log
-printf '##########################################                         |\r'
-
-# echo "Getting CBMEM table..."
-cbmem > logs/cbmem.log 2> logs/cbmem.err.log
-update_result "CBMEM table information" logs/cbmem.err.log
-printf '############################################                       |\r'
-
-# echo "Getting TPM information..."
-find `realpath /sys/class/tpm/tpm*` -type f -print -exec cat {} \; > logs/tpm_version.log 2> logs/tpm_version.err.log
-update_result "TPM information" logs/tpm_version.err.log
-printf '#############################################                      |\r'
-
-# echo "Checking AMT..."
-mei-amt-check > logs/amt-check.log 2> logs/amt-check.err.log
-update_result "AMT information" logs/amt-check.err.log
-printf '###############################################                    |\r'
-
-# echo "Checking ME..."
-intelmetool -m > logs/intelmetool.log 2> logs/intelmetool.err.log
-update_result "ME information" logs/intelmetool.err.log
-printf '################################################                   |\r'
-
-printf '##################################################                 |\r'
-printf '####################################################               |\r'
-printf '######################################################             |\r'
-printf '########################################################           |\r'
-printf '##########################################################         |\r'
-printf '############################################################       |\r'
-printf '##############################################################     |\r'
-printf '################################################################   |\r'
-printf '################################################################## |\r'
-printf '###################################################################|\r'
-# next two echo cmds helps with printing
-echo
-echo
-
-echo "Results of getting data:" >> result
-echo -e "\nLegend:" >> result
-echo -e [$GREEN"OK"$COLOR_OFF]"\t\t Data get successfully" >> result
-echo -e [$YELLOW"UNKNOWN"$COLOR_OFF]"\t Result is unknown" >> result
-echo -e [$RED"ERROR"$COLOR_OFF]"\t\t Error during getting data\n" >> result
-
-mv result logs/result
-if [ $DEPLOY_REPORT = "false" ]; then
-  cat logs/result
-fi
-
-# Create name for generated report
-filename="$(dmidecode -s system-manufacturer)"
-filename+=" $(dmidecode -s system-product-name)"
-filename+=" $(dmidecode -s bios-version)"
-
-# MAC address of device that is used to connect the internet
-# it could return none only when there is no internet connection but
-# in those cases report will be stored locally only
-uuid_string=`cat /sys/class/net/$(ip route show default | head -1 | awk '/default/ {print $5}')/address`
-# next two values are hardware related so they will be always the same
-uuid_string+="_$(dmidecode -s system-product-name)"
-uuid_string+="_$(dmidecode -s system-manufacturer)"
-
-# using values from above should generate the same uuid all the time if only
-# the MAC address will not change
-uuid=`uuidgen -n @x500 -N $uuid_string -s`
-
-filename+="_$uuid"
-filename+="_$(date +'%Y_%m_%d_%H_%M_%S_%N')"
-filename="${filename// /_}"
-filename="${filename//\//_}"
-
-if [ $DEPLOY_REPORT = "false" ]; then
-  echo "Creating archive with logs..."
-fi
-
-# remove MAC address from logs as sensitive data
-MAC_ADDR=`cat /sys/class/net/$(ip route show default | head -1 | awk '/default/ {print $5}')/address`
-grep -rl "${MAC_ADDR}" logs > /dev/null && grep -rl "${MAC_ADDR}" logs | xargs sed -i 's/'${MAC_ADDR}'/MAC ADDRESS REMOVED/g'
-tar -zcf "$filename.tar.gz" logs/*
-rm -rf logs
-
-if [ $DEPLOY_REPORT = "false" ]; then
-  echo "Done! Logs saved to: $(readlink -f $filename.tar.gz)"
-fi
-
-if [ "$SEND_LOGS" = "true" ]; then
-  if [ $DEPLOY_REPORT = "false" ]; then
-    echo "Sending logs to 3mdeb cloud..."
-    CLOUDSEND_OPTS="-e"
-  else
-    CLOUDSEND_OPTS="-e -q"
-  fi
-  cloudsend.sh \
-    ${CLOUDSEND_OPTS} \
-    $(readlink -f $filename.tar.gz) \
-    ${FULL_UPLOAD_URL}
-  if [ "$?" -ne "0" ]; then
-    echo "Failed to send logs to the cloud"
-    if [ -a "${CMD_DASHARO_DEPLOY}" ]; then
-      echo -e "Something may be wrong with credentials. Please use option 4 to change DES keys
-               \rand make sure that there is no typo."
-    fi
-    exit 1
-  fi
-  if [ $DEPLOY_REPORT = "false" ]; then
-    echo "Thank you for supporting Dasharo!"
-  fi
-fi
-
-echo -e \
-"-----------------------------------------------------------------------------\r
-Would you like to contribute to the \"Hardware for Linux\" project?\r
-it is an open source project that that anonymously collects hardware details\r
-of Linux-powered computers over the world and helps people to collaboratively\r
-debug hardware related issues, check for Linux-compatibility and find drivers.\r
------------------------------------------------------------------------------\r
-You can find more about it here:\r
-https://linux-hardware.org/\r
-https://github.com/linuxhw/hw-probe\r
------------------------------------------------------------------------------\r
-Do you want to participate in this project?\r
-(if you answer \"yes\", then command hw-probe --all --upload will be ran, in \r
-order to participate)\r
-"
-
-read -p "[N/y] "
-case ${REPLY} in
-    yes|y|Y|Yes|YES)
-    /usr/bin/hw-probe -all -upload
-    if [ $? -eq 0 ]; then
-        echo "Thank you for contributing to the \"Hardware for Linux\" project!"
-    else
-        echo "couldn't probe/upload. Check your internet connection..."
-        exit 1
-    fi
-    ;;
-    *)
-    echo -e \
-    "Please consider contributing to the \"Hardware for Linux\" project in the future.\r
-    All you have to do is run this command:\r
-    hw-probe --all --upload\r
-    "
-    ;;
-esac
diff --git a/meta-dts-distro/recipes-dts/reports/touchpad-info.bb b/meta-dts-distro/recipes-dts/reports/touchpad-info.bb
deleted file mode 100644
index fe473f8e..00000000
--- a/meta-dts-distro/recipes-dts/reports/touchpad-info.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Touchpad info script"
-DESCRIPTION = "Gets information on the touchpad devices. Currently supports only Clevo devices"
-SECTION = "tools"
-HOMEPAGE = "https://github.com/3mdeb/fwdump-docker/blob/touchpad_info/scripts/get_touchpad_info.sh"
-
-LICENSE = "MIT"
-
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-SRC_URI = "file://touchpad-info"
-
-S = "${WORKDIR}"
-
-RDEPENDS:${PN} = " \
-    bash  \
-    i2c-tools \
-    acpi-call-dkms \
-"
-
-do_install () {
-    install -d ${D}/${sbindir}
-    install -m 0755 ${S}/touchpad-info ${D}/${sbindir}
-}
diff --git a/meta-dts-distro/recipes-dts/reports/touchpad-info/touchpad-info b/meta-dts-distro/recipes-dts/reports/touchpad-info/touchpad-info
deleted file mode 100644
index 5186fe3f..00000000
--- a/meta-dts-distro/recipes-dts/reports/touchpad-info/touchpad-info
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-# A script to dump info about the touchpad
-
-if ! dmesg | grep hid-multitouch | grep "I2C HID" > /dev/null; then
-  echo "No I2C touchpads detected. Exiting"
-  exit 2
-fi
-
-devname=$(dmesg | grep hid-multitouch | awk 'NF>1{print $NF}')
-hid=$(cat "/sys/bus/i2c/devices/$devname/firmware_node/hid")
-path=$(cat "/sys/bus/i2c/devices/$devname/firmware_node/path")
-
-ACPI_CALL_PATH="/proc/acpi/call"
-
-if [ ! -f "$ACPI_CALL_PATH" ]; then
-   echo "File ${ACPI_CALL_PATH} doesn\'t exist. Exiting"
-   exit 3
-fi
-
-echo "$path._DSM bF7F6DF3C67425545AD05B30A3D8938DE 1 1" > ${ACPI_CALL_PATH}
-descriptor_offset=$(tr -d '\0' < ${ACPI_CALL_PATH} | cut -d 'c' -f 1)
-
-i2c_row=$(i2cdetect -y -r 0 | grep UU)
-i2c_col=0
-for x in $i2c_row
-do
-  if [ "$x" = 'UU' ]; then
-  	break;
-  fi
-  i2c_col=$(($i2c_col + 1))
-done
-
-i2c_addr=$(echo "$i2c_row" | cut -d ":" -f 1)
-i2c_col=$(printf '%s\n' $(($i2c_col - 1)))
-i2c_addr=$(printf '%s\n' $(($i2c_addr + $i2c_col)))
-
-echo "Found touchpad at: $path:"
-echo
-echo "HID:                $hid"
-echo "I2C address:        0x$i2c_addr"
-echo "Descriptor address: $descriptor_offset"
-echo

From 4cee3dd5003f2768468b4a2029bb2b47d714bf4a Mon Sep 17 00:00:00 2001
From: Daniil Klimuk <daniil.klimuk@3mdeb.com>
Date: Tue, 9 Apr 2024 12:38:33 +0200
Subject: [PATCH 16/99] distro: recipes-dts: dts-scripts: do_install via
 Makefile

Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
---
 .../dts-scripts/dts-scripts_git.bb            | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index eef78397..1b759e22 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/Dasharo/dts-v2"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=575ab8837c52eafc7b9eb8b244072bc7"
 
-SRCREV = "13dad8ea6901cf921de0dd45d464bea3535892e0"
+SRCREV = "c57dc8c60d73ccd0f540148e46be73221ecc67bb"
 SRC_URI = "git://github.com/Dasharo/dts-v2;protocol=https;branch=main"
 
 PV = "0.1+git${SRCPV}"
@@ -25,20 +25,9 @@ RDEPENDS:${PN} = " \
     iotools \
 "
 
-do_install () {
-    install -d ${D}/${sbindir}
-    install -m 0755 ${S}/scripts/dts ${D}/${sbindir}
-    install -m 0755 ${S}/scripts/dts-boot ${D}/${sbindir}
-    install -m 0755 ${S}/scripts/ec_transition ${D}/${sbindir}
-    install -m 0755 ${S}/scripts/cloud_list ${D}/${sbindir}
-    install -m 0755 ${S}/scripts/dasharo-deploy ${D}/${sbindir}
-    install -m 0755 ${S}/reports/dasharo-hcl-report ${D}/${sbindir}
-    install -m 0755 ${S}/reports/touchpad-info ${D}/${sbindir}
-    install -m 0664 ${S}/include/dts-environment.sh ${D}/${sbindir}
-    install -m 0664 ${S}/include/dts-functions.sh ${D}/${sbindir}
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
 
-    # install profile dropin so the DTS_ENV and DTS_FUNCS variables are set when
-    # loged via SSH
-    install -d ${D}${sysconfdir}/profile.d/
-    install -m 0755 ${S}/scripts/dts-profile.sh ${D}${sysconfdir}/profile.d/
+do_install () {
+    oe_runmake install DESTDIR="${D}"
 }

From c8b709150baa11f0f5b749f36be4def110654ba7 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Wed, 10 Apr 2024 11:26:03 +0200
Subject: [PATCH 17/99] dts-scripts_git.bb: relicense to Apache-2.0

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 .../recipes-dts/dts-scripts/dts-scripts_git.bb         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 1b759e22..86f4ee04 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -1,12 +1,12 @@
 SUMMARY = "Dasharo Tools Suite scripts."
 SECTION = "tools"
-HOMEPAGE = "https://github.com/Dasharo/dts-v2"
+HOMEPAGE = "https://github.com/Dasharo/dts-scripts"
 
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=575ab8837c52eafc7b9eb8b244072bc7"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded4771514fcc  "
 
-SRCREV = "c57dc8c60d73ccd0f540148e46be73221ecc67bb"
-SRC_URI = "git://github.com/Dasharo/dts-v2;protocol=https;branch=main"
+SRCREV = "3870e7b944d88d68821d7cdd83d70d6959348ed8"
+SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
 
 PV = "0.1+git${SRCPV}"
 

From 7672292295d4719249e81ae3c121b15c1e4f8e1e Mon Sep 17 00:00:00 2001
From: Daniil Klimuk <daniil.klimuk@3mdeb.com>
Date: Tue, 16 Apr 2024 09:22:31 +0200
Subject: [PATCH 18/99] distro: dts-scripts: bump revision

Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 86f4ee04..ebaef7c8 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/Dasharo/dts-scripts"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded4771514fcc  "
 
-SRCREV = "3870e7b944d88d68821d7cdd83d70d6959348ed8"
+SRCREV = "6718d85302bf0422dbc969c816e78394044ac744"
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
 
 PV = "0.1+git${SRCPV}"

From 2be55791aaaa3271803bddfb293956addd21c8a1 Mon Sep 17 00:00:00 2001
From: Daniil Klimuk <daniil.klimuk@3mdeb.com>
Date: Wed, 22 May 2024 14:05:23 +0200
Subject: [PATCH 19/99] distro: support: hidapi: delete

This recipe was not used in the builds, instead recipe from meta-openembedded is
being used. Surplus metadata should be deleted.

Refs:
https://github.com/Dasharo/dasharo-issues/issues/770
https://github.com/Dasharo/dasharo-issues/issues/769

Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
---
 .../recipes-support/hidapi/hidapi_1.4.1.bb    | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 meta-dts-distro/recipes-support/hidapi/hidapi_1.4.1.bb

diff --git a/meta-dts-distro/recipes-support/hidapi/hidapi_1.4.1.bb b/meta-dts-distro/recipes-support/hidapi/hidapi_1.4.1.bb
deleted file mode 100644
index db9a861a..00000000
--- a/meta-dts-distro/recipes-support/hidapi/hidapi_1.4.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-inherit cargo
-
-SRC_URI += "gitsm://git@github.com/ruabmbua/hidapi-rs.git;protocol=ssh;nobranch=1"
-SRCREV = "f39c5e17a50ada9f8b631dbbc2c4d262553e5602"
-S = "${WORKDIR}/git"
-CARGO_SRC_DIR = ""
-PV:append = ".AUTOINC+f39c5e17a5"
-
-SRC_URI += " \
-    crate://crates.io/cc/1.0.73 \
-    crate://crates.io/libc/0.2.132 \
-    crate://crates.io/pkg-config/0.3.25 \
-"
-
-LIC_FILES_CHKSUM = " \
-    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \
-"
-
-SUMMARY = "Rust-y wrapper around hidapi"
-HOMEPAGE = "https://github.com/ruabmbua/hidapi-rs"
-LICENSE = "MIT"

From 514c5638dd8be883a6947cd74869dceb7bdbb766 Mon Sep 17 00:00:00 2001
From: Daniil Klimuk <daniil.klimuk@3mdeb.com>
Date: Wed, 22 May 2024 14:41:06 +0200
Subject: [PATCH 20/99] distro: kernel: acpi-call-dkms: change license to GPLv3

This package provides license statement in README.md, but Yocto needs it
to be a separate file.

Refs:
https://github.com/nix-community/acpi_call/blob/fe9dc95a83a95e4826c1a7c809d41c2f16de40a6/README.md?plain=1#L68

Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
---
 .../kernel/acpi-call-dkms_git.bb              |   8 +-
 .../files/0001-GPLv3-licence-file-added.patch |  28 ++
 .../0001-LGPLv2-licence-file-added.patch      | 359 ------------------
 3 files changed, 31 insertions(+), 364 deletions(-)
 create mode 100644 meta-dts-distro/recipes-kernel/kernel/files/0001-GPLv3-licence-file-added.patch
 delete mode 100644 meta-dts-distro/recipes-kernel/kernel/files/0001-LGPLv2-licence-file-added.patch

diff --git a/meta-dts-distro/recipes-kernel/kernel/acpi-call-dkms_git.bb b/meta-dts-distro/recipes-kernel/kernel/acpi-call-dkms_git.bb
index 9f4ec722..d920008a 100644
--- a/meta-dts-distro/recipes-kernel/kernel/acpi-call-dkms_git.bb
+++ b/meta-dts-distro/recipes-kernel/kernel/acpi-call-dkms_git.bb
@@ -1,16 +1,14 @@
 SUMMARY = "A kernel simple module that enables you to call ACPI methods by writing the method name followed by arguments to /proc/acpi/call."
 DESCRIPTION = "${SUMMARY}"
 
-LICENSE = "CLOSED"
-
-LICENSE = "LGPLv2 | LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=025e46592215127e8c98b397ff29a037"
 
 inherit module
 
 SRC_URI = "git://github.com/nix-community/acpi_call.git;branch=master;protocol=https \
            file://0001-Makefile-fixing-build-errrors.patch \
-           file://0001-LGPLv2-licence-file-added.patch \
+           file://0001-GPLv3-licence-file-added.patch \
            "
 
 SRCREV = "fe9dc95a83a95e4826c1a7c809d41c2f16de40a6"
diff --git a/meta-dts-distro/recipes-kernel/kernel/files/0001-GPLv3-licence-file-added.patch b/meta-dts-distro/recipes-kernel/kernel/files/0001-GPLv3-licence-file-added.patch
new file mode 100644
index 00000000..33743afc
--- /dev/null
+++ b/meta-dts-distro/recipes-kernel/kernel/files/0001-GPLv3-licence-file-added.patch
@@ -0,0 +1,28 @@
+Author: Daniil Klimuk <daniil.klimuk@3mdeb.com>
+Date:   Wed May 22 14:35:18 2024 +0200
+
+    LICENSE: add GPLv3 license
+
+    This repo specifies license in README.md file, but Yocto needs license
+    to be provided as a separate file. This statement was exctracted
+    from the README file.
+
+    Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
+
+diff --git a/LICENSE b/LICENSE
+new file mode 100644
+index 000000000000..6e4fe59cdcba
+--- /dev/null
++++ b/LICENSE
+@@ -0,0 +1,11 @@
++Copyright (c) 2010: Michal Kottman
++
++This program is free software: you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation, either version 3 of the License, or
++(at your option) any later version.
++
++This program is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++GNU General Public License for more details.
diff --git a/meta-dts-distro/recipes-kernel/kernel/files/0001-LGPLv2-licence-file-added.patch b/meta-dts-distro/recipes-kernel/kernel/files/0001-LGPLv2-licence-file-added.patch
deleted file mode 100644
index cbd46a40..00000000
--- a/meta-dts-distro/recipes-kernel/kernel/files/0001-LGPLv2-licence-file-added.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-From c0bed7aa920dc81ba39b9c04cd21c9a24c7d66e8 Mon Sep 17 00:00:00 2001
-From: Kas User <kas@example.com>
-Date: Mon, 16 May 2022 11:15:37 +0000
-Subject: [PATCH] LGPLv2 licence file added
-
-Signed-off-by: Kas User <kas@example.com>
----
- COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 339 insertions(+)
- create mode 100644 COPYING
-
-diff --git a/COPYING b/COPYING
-new file mode 100644
-index 0000000..d511905
---- /dev/null
-+++ b/COPYING
-@@ -0,0 +1,339 @@
-+		    GNU GENERAL PUBLIC LICENSE
-+		       Version 2, June 1991
-+
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+			    Preamble
-+
-+  The licenses for most software are designed to take away your
-+freedom to share and change it.  By contrast, the GNU General Public
-+License is intended to guarantee your freedom to share and change free
-+software--to make sure the software is free for all its users.  This
-+General Public License applies to most of the Free Software
-+Foundation's software and to any other program whose authors commit to
-+using it.  (Some other Free Software Foundation software is covered by
-+the GNU Lesser General Public License instead.)  You can apply it to
-+your programs, too.
-+
-+  When we speak of free software, we are referring to freedom, not
-+price.  Our General Public Licenses are designed to make sure that you
-+have the freedom to distribute copies of free software (and charge for
-+this service if you wish), that you receive source code or can get it
-+if you want it, that you can change the software or use pieces of it
-+in new free programs; and that you know you can do these things.
-+
-+  To protect your rights, we need to make restrictions that forbid
-+anyone to deny you these rights or to ask you to surrender the rights.
-+These restrictions translate to certain responsibilities for you if you
-+distribute copies of the software, or if you modify it.
-+
-+  For example, if you distribute copies of such a program, whether
-+gratis or for a fee, you must give the recipients all the rights that
-+you have.  You must make sure that they, too, receive or can get the
-+source code.  And you must show them these terms so they know their
-+rights.
-+
-+  We protect your rights with two steps: (1) copyright the software, and
-+(2) offer you this license which gives you legal permission to copy,
-+distribute and/or modify the software.
-+
-+  Also, for each author's protection and ours, we want to make certain
-+that everyone understands that there is no warranty for this free
-+software.  If the software is modified by someone else and passed on, we
-+want its recipients to know that what they have is not the original, so
-+that any problems introduced by others will not reflect on the original
-+authors' reputations.
-+
-+  Finally, any free program is threatened constantly by software
-+patents.  We wish to avoid the danger that redistributors of a free
-+program will individually obtain patent licenses, in effect making the
-+program proprietary.  To prevent this, we have made it clear that any
-+patent must be licensed for everyone's free use or not licensed at all.
-+
-+  The precise terms and conditions for copying, distribution and
-+modification follow.
-+
-+		    GNU GENERAL PUBLIC LICENSE
-+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+  0. This License applies to any program or other work which contains
-+a notice placed by the copyright holder saying it may be distributed
-+under the terms of this General Public License.  The "Program", below,
-+refers to any such program or work, and a "work based on the Program"
-+means either the Program or any derivative work under copyright law:
-+that is to say, a work containing the Program or a portion of it,
-+either verbatim or with modifications and/or translated into another
-+language.  (Hereinafter, translation is included without limitation in
-+the term "modification".)  Each licensee is addressed as "you".
-+
-+Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope.  The act of
-+running the Program is not restricted, and the output from the Program
-+is covered only if its contents constitute a work based on the
-+Program (independent of having been made by running the Program).
-+Whether that is true depends on what the Program does.
-+
-+  1. You may copy and distribute verbatim copies of the Program's
-+source code as you receive it, in any medium, provided that you
-+conspicuously and appropriately publish on each copy an appropriate
-+copyright notice and disclaimer of warranty; keep intact all the
-+notices that refer to this License and to the absence of any warranty;
-+and give any other recipients of the Program a copy of this License
-+along with the Program.
-+
-+You may charge a fee for the physical act of transferring a copy, and
-+you may at your option offer warranty protection in exchange for a fee.
-+
-+  2. You may modify your copy or copies of the Program or any portion
-+of it, thus forming a work based on the Program, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+    a) You must cause the modified files to carry prominent notices
-+    stating that you changed the files and the date of any change.
-+
-+    b) You must cause any work that you distribute or publish, that in
-+    whole or in part contains or is derived from the Program or any
-+    part thereof, to be licensed as a whole at no charge to all third
-+    parties under the terms of this License.
-+
-+    c) If the modified program normally reads commands interactively
-+    when run, you must cause it, when started running for such
-+    interactive use in the most ordinary way, to print or display an
-+    announcement including an appropriate copyright notice and a
-+    notice that there is no warranty (or else, saying that you provide
-+    a warranty) and that users may redistribute the program under
-+    these conditions, and telling the user how to view a copy of this
-+    License.  (Exception: if the Program itself is interactive but
-+    does not normally print such an announcement, your work based on
-+    the Program is not required to print an announcement.)
-+
-+These requirements apply to the modified work as a whole.  If
-+identifiable sections of that work are not derived from the Program,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works.  But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Program, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Program.
-+
-+In addition, mere aggregation of another work not based on the Program
-+with the Program (or with a work based on the Program) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+  3. You may copy and distribute the Program (or a work based on it,
-+under Section 2) in object code or executable form under the terms of
-+Sections 1 and 2 above provided that you also do one of the following:
-+
-+    a) Accompany it with the complete corresponding machine-readable
-+    source code, which must be distributed under the terms of Sections
-+    1 and 2 above on a medium customarily used for software interchange; or,
-+
-+    b) Accompany it with a written offer, valid for at least three
-+    years, to give any third party, for a charge no more than your
-+    cost of physically performing source distribution, a complete
-+    machine-readable copy of the corresponding source code, to be
-+    distributed under the terms of Sections 1 and 2 above on a medium
-+    customarily used for software interchange; or,
-+
-+    c) Accompany it with the information you received as to the offer
-+    to distribute corresponding source code.  (This alternative is
-+    allowed only for noncommercial distribution and only if you
-+    received the program in object code or executable form with such
-+    an offer, in accord with Subsection b above.)
-+
-+The source code for a work means the preferred form of the work for
-+making modifications to it.  For an executable work, complete source
-+code means all the source code for all modules it contains, plus any
-+associated interface definition files, plus the scripts used to
-+control compilation and installation of the executable.  However, as a
-+special exception, the source code distributed need not include
-+anything that is normally distributed (in either source or binary
-+form) with the major components (compiler, kernel, and so on) of the
-+operating system on which the executable runs, unless that component
-+itself accompanies the executable.
-+
-+If distribution of executable or object code is made by offering
-+access to copy from a designated place, then offering equivalent
-+access to copy the source code from the same place counts as
-+distribution of the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+
-+  4. You may not copy, modify, sublicense, or distribute the Program
-+except as expressly provided under this License.  Any attempt
-+otherwise to copy, modify, sublicense or distribute the Program is
-+void, and will automatically terminate your rights under this License.
-+However, parties who have received copies, or rights, from you under
-+this License will not have their licenses terminated so long as such
-+parties remain in full compliance.
-+
-+  5. You are not required to accept this License, since you have not
-+signed it.  However, nothing else grants you permission to modify or
-+distribute the Program or its derivative works.  These actions are
-+prohibited by law if you do not accept this License.  Therefore, by
-+modifying or distributing the Program (or any work based on the
-+Program), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Program or works based on it.
-+
-+  6. Each time you redistribute the Program (or any work based on the
-+Program), the recipient automatically receives a license from the
-+original licensor to copy, distribute or modify the Program subject to
-+these terms and conditions.  You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties to
-+this License.
-+
-+  7. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License.  If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Program at all.  For example, if a patent
-+license would not permit royalty-free redistribution of the Program by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Program.
-+
-+If any portion of this section is held invalid or unenforceable under
-+any particular circumstance, the balance of the section is intended to
-+apply and the section as a whole is intended to apply in other
-+circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system, which is
-+implemented by public license practices.  Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+
-+  8. If the distribution and/or use of the Program is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Program under this License
-+may add an explicit geographical distribution limitation excluding
-+those countries, so that distribution is permitted only in or among
-+countries not thus excluded.  In such case, this License incorporates
-+the limitation as if written in the body of this License.
-+
-+  9. The Free Software Foundation may publish revised and/or new versions
-+of the General Public License from time to time.  Such new versions will
-+be similar in spirit to the present version, but may differ in detail to
-+address new problems or concerns.
-+
-+Each version is given a distinguishing version number.  If the Program
-+specifies a version number of this License which applies to it and "any
-+later version", you have the option of following the terms and conditions
-+either of that version or of any later version published by the Free
-+Software Foundation.  If the Program does not specify a version number of
-+this License, you may choose any version ever published by the Free Software
-+Foundation.
-+
-+  10. If you wish to incorporate parts of the Program into other free
-+programs whose distribution conditions are different, write to the author
-+to ask for permission.  For software which is copyrighted by the Free
-+Software Foundation, write to the Free Software Foundation; we sometimes
-+make exceptions for this.  Our decision will be guided by the two goals
-+of preserving the free status of all derivatives of our free software and
-+of promoting the sharing and reuse of software generally.
-+
-+			    NO WARRANTY
-+
-+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-+REPAIR OR CORRECTION.
-+
-+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGES.
-+
-+		     END OF TERMS AND CONDITIONS
-+
-+	    How to Apply These Terms to Your New Programs
-+
-+  If you develop a new program, and you want it to be of the greatest
-+possible use to the public, the best way to achieve this is to make it
-+free software which everyone can redistribute and change under these terms.
-+
-+  To do so, attach the following notices to the program.  It is safest
-+to attach them to the start of each source file to most effectively
-+convey the exclusion of warranty; and each file should have at least
-+the "copyright" line and a pointer to where the full notice is found.
-+
-+    <one line to give the program's name and a brief idea of what it does.>
-+    Copyright (C) <year>  <name of author>
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License along
-+    with this program; if not, write to the Free Software Foundation, Inc.,
-+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+If the program is interactive, make it output a short notice like this
-+when it starts in an interactive mode:
-+
-+    Gnomovision version 69, Copyright (C) year name of author
-+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-+    This is free software, and you are welcome to redistribute it
-+    under certain conditions; type `show c' for details.
-+
-+The hypothetical commands `show w' and `show c' should show the appropriate
-+parts of the General Public License.  Of course, the commands you use may
-+be called something other than `show w' and `show c'; they could even be
-+mouse-clicks or menu items--whatever suits your program.
-+
-+You should also get your employer (if you work as a programmer) or your
-+school, if any, to sign a "copyright disclaimer" for the program, if
-+necessary.  Here is a sample; alter the names:
-+
-+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-+
-+  <signature of Ty Coon>, 1 April 1989
-+  Ty Coon, President of Vice
-+
-+This General Public License does not permit incorporating your program into
-+proprietary programs.  If your program is a subroutine library, you may
-+consider it more useful to permit linking proprietary applications with the
-+library.  If this is what you want to do, use the GNU Lesser General
-+Public License instead of this License.
--- 
-2.20.1
-

From 5f4ff7c04f87b08582a3a68d6ccf21f7536f20ce Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Tue, 14 May 2024 21:58:12 +0200
Subject: [PATCH 21/99] update layers to scarthgap

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 kas/common.yml                  | 6 +++---
 meta-dts-distro/conf/layer.conf | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kas/common.yml b/kas/common.yml
index 44c1cbcd..7895d4a0 100644
--- a/kas/common.yml
+++ b/kas/common.yml
@@ -8,7 +8,7 @@ repos:
 
   poky:
     url: https://git.yoctoproject.org/git/poky
-    refspec: 00c04394cbc5ecaced7cc1bc8bc8787e621f987d
+    refspec: d71d1c02ff622e00d6fa5ca9ce44a4e567691dce
     layers:
       meta:
       meta-poky:
@@ -16,7 +16,7 @@ repos:
 
   meta-openembedded:
     url: https://git.openembedded.org/meta-openembedded
-    refspec: 0b78362654262145415df8211052442823b9ec9b
+    refspec: a72010b414ee3d73888ac9cb4e310e8f05e13aea
     layers:
       meta-oe:
       meta-networking:
@@ -24,7 +24,7 @@ repos:
 
   meta-security:
     url: https://git.yoctoproject.org/git/meta-security
-    refspec: c79262a30bd385f5dbb009ef8704a1a01644528e
+    refspec: 11ea91192d43d7c2b0b95a93aa63ca7e73e38034
     layers:
       meta-tpm:
 
diff --git a/meta-dts-distro/conf/layer.conf b/meta-dts-distro/conf/layer.conf
index c597c0be..a9424ab2 100644
--- a/meta-dts-distro/conf/layer.conf
+++ b/meta-dts-distro/conf/layer.conf
@@ -17,4 +17,4 @@ LAYERDEPENDS_dts-distro = " \
     openembedded-layer \
     "
 
-LAYERSERIES_COMPAT_dts-distro = "honister kirkstone master"
+LAYERSERIES_COMPAT_dts-distro = "scarthgap master"

From 95a9d9c2ce9e09b7c256e1d3e3e71970f44b08af Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Tue, 14 May 2024 21:58:42 +0200
Subject: [PATCH 22/99] dts-distro.conf: add usrmerge to DISTRO_FEATURES

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 meta-dts-distro/conf/distro/dts-distro.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/conf/distro/dts-distro.conf b/meta-dts-distro/conf/distro/dts-distro.conf
index 709120df..7cbc3868 100644
--- a/meta-dts-distro/conf/distro/dts-distro.conf
+++ b/meta-dts-distro/conf/distro/dts-distro.conf
@@ -14,7 +14,7 @@ TARGET_VENDOR = "-dts"
 # distro features
 # DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat"
 # POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan"
-DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} systemd tpm tpm2"
+DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} systemd usrmerge tpm tpm2"
 
 # explictely use systemd and disable sysvinit completely
 VIRTUAL-RUNTIME_init_manager = "systemd"

From f88836b8554a06264322bf320aedc834c8600aa4 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Tue, 14 May 2024 21:59:08 +0200
Subject: [PATCH 23/99] packagegroup-dts.bb: s/bmap-tools/bmaptool

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb b/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
index 4a1c18f2..323ae225 100644
--- a/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
+++ b/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
@@ -33,7 +33,7 @@ RDEPENDS:${PN}-tests = " \
 RDEPENDS:${PN}-tools-base = " \
     packagegroup-coreboot-utils \
     packagegroup-core-tools-debug \
-    bmap-tools \
+    bmaptool \
     flashrom \
     fwupd \
     me-cleaner \

From da6331048bc3d72b96a6d7dedfd2677c720a5196 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Tue, 14 May 2024 21:59:32 +0200
Subject: [PATCH 24/99] dasharo-ectoo: add sha256sums for cargo deps

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 .../dasharo-ectool/dasharo-ectool_0.3.8.bb    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb b/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
index 07b35360..725cd618 100644
--- a/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
+++ b/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
@@ -32,6 +32,29 @@ SRC_URI += " \
     crate://crates.io/winapi/0.3.9 \
 "
 
+SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+SRC_URI[clap-3.2.23.sha256sum] = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
+SRC_URI[clap_lex-0.2.4.sha256sum] = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+SRC_URI[downcast-rs-1.2.0.sha256sum] = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+SRC_URI[hidapi-1.5.0.sha256sum] = "798154e4b6570af74899d71155fb0072d5b17e6aa12f39c8ef22c60fb8ec99e7"
+SRC_URI[indexmap-1.9.2.sha256sum] = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+SRC_URI[libc-0.2.139.sha256sum] = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+SRC_URI[os_str_bytes-6.4.1.sha256sum] = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+SRC_URI[pkg-config-0.3.26.sha256sum] = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+SRC_URI[redox_hwio-0.1.6.sha256sum] = "8eb516ad341a84372b5b15a5a35cf136ba901a639c8536f521b108253d7fce74"
+SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+SRC_URI[termcolor-1.2.0.sha256sum] = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+SRC_URI[textwrap-0.16.0.sha256sum] = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
+SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+
 DEPENDS += "hidapi"
 LIC_FILES_CHKSUM = " \
     file://tool/LICENSE;md5=af209eac18ec76ed06fb2839a906b1ad \

From 301de10e344205bb51b65879fcd9d3ede4df1765 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Mon, 13 May 2024 12:38:06 +0200
Subject: [PATCH 25/99] iotools: allow overriding CC

Otherwise, the host gcc was used

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 .../0001-Makefile-allow-overriding-CC.patch   | 26 +++++++++++++++++++
 .../recipes-support/iotools/iotools_git.bb    |  5 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 meta-dts-distro/recipes-support/iotools/iotools/0001-Makefile-allow-overriding-CC.patch

diff --git a/meta-dts-distro/recipes-support/iotools/iotools/0001-Makefile-allow-overriding-CC.patch b/meta-dts-distro/recipes-support/iotools/iotools/0001-Makefile-allow-overriding-CC.patch
new file mode 100644
index 00000000..619d0cc5
--- /dev/null
+++ b/meta-dts-distro/recipes-support/iotools/iotools/0001-Makefile-allow-overriding-CC.patch
@@ -0,0 +1,26 @@
+From c64770eaa13ccc82181d07b97547a0c1cfb419ab Mon Sep 17 00:00:00 2001
+From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
+Date: Mon, 13 May 2024 12:35:57 +0200
+Subject: [PATCH] Makefile: allow overriding CC
+
+Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 4cd2f4f142c6..fb3dd41d5dfe 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,7 @@
+ VER_MAJOR = 1
+ VER_MINOR = 6
+ 
+-CC=$(CROSS_COMPILE)gcc
++CC ?= $(CROSS_COMPILE)gcc
+ 
+ # build options
+ DEBUG ?= 1
+-- 
+2.45.0
+
diff --git a/meta-dts-distro/recipes-support/iotools/iotools_git.bb b/meta-dts-distro/recipes-support/iotools/iotools_git.bb
index 45e198cf..77733377 100644
--- a/meta-dts-distro/recipes-support/iotools/iotools_git.bb
+++ b/meta-dts-distro/recipes-support/iotools/iotools_git.bb
@@ -3,7 +3,10 @@ DESCRIPTION = "The iotools package provides a set of simple command line tools \
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-SRC_URI = "git://github.com/adurbin/iotools;protocol=https;branch=master"
+SRC_URI = " \
+    git://github.com/adurbin/iotools;protocol=https;branch=master \
+    file://0001-Makefile-allow-overriding-CC.patch \
+    "
 
 PV = "1.0+git${SRCPV}"
 SRCREV = "18949fdc4dedb1da3f51ee83a582b112fb9f2c71"

From d7f4fbdd43ca2608e214fcfa5f476812bffdf268 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Tue, 14 May 2024 21:53:38 +0200
Subject: [PATCH 26/99] kas/common.yml: enable buildstats class

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 kas/common.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kas/common.yml b/kas/common.yml
index 7895d4a0..d71eadda 100644
--- a/kas/common.yml
+++ b/kas/common.yml
@@ -50,3 +50,5 @@ local_conf_header:
         HALT,/tmp,10M,1K"
   skip_linux_firmware: |
     MACHINE_EXTRA_RRECOMMENDS:remove ="linux-firmware"
+  build_stats: |
+    USER_CLASSES += "buildstats"

From b85771ebf87503d6820412c8001b9b019a518259 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Tue, 14 May 2024 21:54:24 +0200
Subject: [PATCH 27/99] acpi-call-dkms: fix kernel module installation on
 scarthgap

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 .../recipes-kernel/kernel/acpi-call-dkms_git.bb   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/meta-dts-distro/recipes-kernel/kernel/acpi-call-dkms_git.bb b/meta-dts-distro/recipes-kernel/kernel/acpi-call-dkms_git.bb
index d920008a..f7a9d973 100644
--- a/meta-dts-distro/recipes-kernel/kernel/acpi-call-dkms_git.bb
+++ b/meta-dts-distro/recipes-kernel/kernel/acpi-call-dkms_git.bb
@@ -15,14 +15,11 @@ SRCREV = "fe9dc95a83a95e4826c1a7c809d41c2f16de40a6"
 
 S = "${WORKDIR}/git"
 
-# The inherit of module.bbclass will automatically name module packages with
-# "kernel-module-" prefix as required by the oe-core build environment.
-
-RPROVIDES:${PN} += "acpi_call"
+# On scarthgap, the kernel-module prefix was not added automatically anymore.
+# The module was not packaged at all by default.
+# PACKAGES += "kernel-module-acpi-call"
+# FILES:kernel-module-acpi-call = "/${nonarch_base_libdir}/modules"
 
+RPROVIDES:${PN} += "kernel-module-mdio-netlink"
+MODULES_INSTALL_TARGET = "install"
 KERNEL_MODULE_AUTOLOAD += "acpi_call"
-
-do_install() {
-    install -d ${D}/lib/modules/${KERNEL_VERSION}
-    install ${S}/acpi_call.ko ${D}/lib/modules/${KERNEL_VERSION}
-}

From 0fe17c61a02e762f3462cae14ab4edf76c4f6bc3 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Tue, 14 May 2024 21:54:55 +0200
Subject: [PATCH 28/99] iotools: disable DEBUG by default

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 meta-dts-distro/recipes-support/iotools/iotools_git.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-dts-distro/recipes-support/iotools/iotools_git.bb b/meta-dts-distro/recipes-support/iotools/iotools_git.bb
index 77733377..4f107f8b 100644
--- a/meta-dts-distro/recipes-support/iotools/iotools_git.bb
+++ b/meta-dts-distro/recipes-support/iotools/iotools_git.bb
@@ -14,6 +14,8 @@ SRCREV = "18949fdc4dedb1da3f51ee83a582b112fb9f2c71"
 S = "${WORKDIR}/git"
 
 do_compile () {
+    # By default, iotolls is build with DEBUG=1 (-O0 breaks _FORTIFY_SOURCE)
+    export DEBUG=0
     oe_runmake
 }
 

From 32cda90a14dd34ef8294ba995fbf79029f450cc3 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Tue, 14 May 2024 22:02:01 +0200
Subject: [PATCH 29/99] dts-scripts: update SRCREV

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index ebaef7c8..94e1cb11 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/Dasharo/dts-scripts"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded4771514fcc  "
 
-SRCREV = "6718d85302bf0422dbc969c816e78394044ac744"
+SRCREV = "e59da61c2d8f1da39f5cb4138dddb0277b95a614"
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
 
 PV = "0.1+git${SRCPV}"

From bb1d25e2be2133e8f558d4a7cb6bc2a71f1435ac Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Mon, 20 May 2024 16:19:05 +0200
Subject: [PATCH 30/99] dts-scripts: update SRCREV

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 94e1cb11..b613e233 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/Dasharo/dts-scripts"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded4771514fcc  "
 
-SRCREV = "e59da61c2d8f1da39f5cb4138dddb0277b95a614"
+SRCREV = "019212bf44a5fade576e4d02c9f093cffda6af8e"
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
 
 PV = "0.1+git${SRCPV}"

From 805dbe92f1be07a1d8bbae6dc733c451a6e0bfaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Fri, 24 May 2024 21:07:26 +0200
Subject: [PATCH 31/99] openssh: fix scp not working
 (Dasharo/dasharo-issues#840)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 .../recipes-connectivity/openssh/openssh_%.bbappend          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-dts-distro/recipes-connectivity/openssh/openssh_%.bbappend b/meta-dts-distro/recipes-connectivity/openssh/openssh_%.bbappend
index 0defc513..51a273a5 100644
--- a/meta-dts-distro/recipes-connectivity/openssh/openssh_%.bbappend
+++ b/meta-dts-distro/recipes-connectivity/openssh/openssh_%.bbappend
@@ -1 +1,6 @@
 SYSTEMD_AUTO_ENABLE:${PN}-sshd = "disable"
+
+do_install:append() {
+    # replace /usr/libexec/sftp-server with internal-sftp.
+    sed -i -r -e "s|^(Subsystem[[:space:]]*sftp[[:space:]]*)/usr/libexec/sftp-server|\1internal-sftp|" ${D}${sysconfdir}/ssh/sshd_config
+}

From 4ff0c6b13922af4847fd48e36c980ebb822d8688 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Wed, 5 Jun 2024 14:52:42 +0200
Subject: [PATCH 32/99] README: Add section about cukinia tests

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 README.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/README.md b/README.md
index ef6f772d..987a2964 100644
--- a/README.md
+++ b/README.md
@@ -100,6 +100,32 @@ Actions. Whole pipeline of creating `DTS` release consists of two steps.
   [dts-rc.ipxe](http://boot.dasharo.com/dts/dts-rc.ipxe) is created so the
   newest rc release is available over iPXE.
 
+## Cukinia tests
+
+`DTS` utilizes the [cukinia](https://github.com/savoirfairelinux/cukinia)
+framework to test various features and tools integrated into the system. You can
+execute the tests using the following command in the `DTS` shell:
+
+```bash
+cukinia
+```
+
+It is recommended that you run the tests when developing `DTS` to make sure that
+the features are still working after your changes.
+
+### Developing cukinia tests
+
+When integrating new features into `DTS`, one should add tests to check whether
+the changes work. The test cases are located in
+[meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf](./meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf).
+The following example shows test cases that could be added after adding a new
+binary/script to `DTS`.
+
+```conf
+as "Check if script X exists" cukinia_test -x $(which <script_name>)
+as "Check if script X can be executed" cukinia_cmd <script_name> --help
+```
+
 ## Testing Dasharo firmware updates from local sources
 
 <!--

From 95385e1d8664cbfcd55f77207c531725e894125a Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Mon, 3 Jun 2024 14:48:01 +0200
Subject: [PATCH 33/99] meta-dts-distro: Add txesbmantool

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 .../coreboot-utils/coreboot-utils.inc         |  2 +-
 .../coreboot-utils/intelp2m_git.bb            |  2 +-
 .../txe-secure-boot/txesbmantool_git.bb       | 29 +++++++++++++++++++
 .../packagegroups/packagegroup-dts.bb         |  1 +
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb

diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/coreboot-utils.inc b/meta-dts-distro/recipes-bsp/coreboot-utils/coreboot-utils.inc
index ba3a3f24..d48f8d8e 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/coreboot-utils.inc
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/coreboot-utils.inc
@@ -6,7 +6,7 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 SRC_URI = " \
-    git://github.com/Dasharo/coreboot.git;protocol=https;branch=dasharo\
+    git://github.com/Dasharo/coreboot.git;protocol=https;branch=dasharo-4.21\
     "
 
 SRCREV = "d08d5eaa98b1204b5e665d3ae4f63fb6f84a0d77"
diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb b/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb
index 2b4e569f..b1a84bb4 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb
@@ -7,7 +7,7 @@ GO_IMPORT = "github.com/dasharo/coreboot/"
 # we need to override SRC_URI from coreboot-utils.inc so it's unpacked in the
 # directory as expected by the go bbclass
 SRC_URI = " \
-    git://github.com/dasharo/coreboot.git;protocol=https;branch=dasharo;destsuffix=${GO_IMPORT} \
+    git://github.com/dasharo/coreboot.git;protocol=https;branch=dasharo-4.21;destsuffix=${GO_IMPORT} \
     "
 
 S = "${WORKDIR}/${GO_IMPORT}/util/intelp2m"
diff --git a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
new file mode 100644
index 00000000..afd1e514
--- /dev/null
+++ b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Utility for generating TXE Secure Boot manifests"
+LICENSE = "GPL-2.0-only"
+
+SRC_URI = " \
+git://github.com/Dasharo/coreboot.git;branch=txe_sb_tool;protocol=https \
+"
+
+SRCREV = "295c158e577400025d01e7ca8ad3beb64e1614a0"
+
+LIC_FILES_CHKSUM = " \
+file://${WORKDIR}/git/LICENSES/GPL-2.0-only.txt;md5=5430828348d2cf7d4b5e8395f774a68e \
+"
+
+S = "${WORKDIR}/git/util/txesbmantool"
+
+inherit pkgconfig
+
+DEPENDS = "wolfssl"
+
+
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install
+}
+
+INSANE_SKIP:${PN} += "ldflags"
+
+FILES:${PN} += " \
+   /usr/local/bin/txesbmantool \
+"
diff --git a/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb b/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
index 323ae225..62e22fc1 100644
--- a/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
+++ b/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
@@ -38,6 +38,7 @@ RDEPENDS:${PN}-tools-base = " \
     fwupd \
     me-cleaner \
     iperf3 \
+    txesbmantool \
 "
 
 RDEPENDS:${PN}-tools-dts = " \

From 09143082d0ac03b13249f613a13f7b0e4e60d584 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Wed, 5 Jun 2024 14:18:46 +0200
Subject: [PATCH 34/99] meta-dts-distro/recipes-tests/dts-tests: cukinia.conf:
 Add txesbmantool check

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf b/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf
index a856bf6e..9122623d 100644
--- a/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf
+++ b/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf
@@ -19,4 +19,6 @@ as "Check if flashrom supports ite_ec programmer" cukinia_cmd /bin/sh -c "flashr
 as "Check if dasharo-hcl-report script exists" cukinia_test -x $(which dasharo-hcl-report)
 # as "Check if dasharo-hcl-report script can be executed" cukinia_cmd dasharo-hcl-report
 
+as "Check if txesbmantool binary exists" cukinia_test -x $(which txesbmantool)
+
 cukinia_log "result: $cukinia_failures failure(s)"

From cbbcf16b95c7d8ff5ca4263fe534b67fea7d87cd Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Thu, 6 Jun 2024 11:46:38 +0200
Subject: [PATCH 35/99] recipes-bsp/txe-secure-boot/txe-secure-boot_git.bb: Use
 bindir in FILES

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 .../recipes-bsp/txe-secure-boot/txesbmantool_git.bb          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
index afd1e514..db940bd8 100644
--- a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
+++ b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
@@ -24,6 +24,9 @@ do_install() {
 
 INSANE_SKIP:${PN} += "ldflags"
 
+prefix = "/usr/local"
+bindir = "${prefix}/bin"
+
 FILES:${PN} += " \
-   /usr/local/bin/txesbmantool \
+   ${bindir}/txesbmantool \
 "

From 204baecbd80f945b2f7000e5e8c4dc527fd76f95 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Fri, 7 Jun 2024 10:55:54 +0200
Subject: [PATCH 36/99] recipes-bsp/txe-secure-boot/txesbmantool_git: Adjust
 PKG_CONFIG_PATH

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 .../recipes-bsp/txe-secure-boot/txesbmantool_git.bb      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
index db940bd8..d9791caf 100644
--- a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
+++ b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
@@ -15,8 +15,15 @@ S = "${WORKDIR}/git/util/txesbmantool"
 
 inherit pkgconfig
 
-DEPENDS = "wolfssl"
+DEPENDS += "wolfssl"
 
+do_configure:prepend(){
+    export PKG_CONFIG_PATH="${STAGING_LIBDIR}/pkgconfig:${STAGING_DIR_HOST}/usr/lib/pkgconfig"
+}
+
+do_compile:prepend() {
+    export PKG_CONFIG_PATH="${STAGING_LIBDIR}/pkgconfig:${STAGING_DIR_HOST}/usr/lib/pkgconfig"
+}
 
 do_install() {
     oe_runmake 'DESTDIR=${D}' install

From 5ec69c090041ac71a292f4b251f63363049f2845 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Tue, 11 Jun 2024 08:59:39 +0200
Subject: [PATCH 37/99] recipes-bsp/txe-secure-boot/txesbmantool_git: Specify
 EXTRA_OEMAKE + fix style

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 .../recipes-bsp/txe-secure-boot/txesbmantool_git.bb  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
index d9791caf..aafc41e9 100644
--- a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
+++ b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "Utility for generating TXE Secure Boot manifests"
 LICENSE = "GPL-2.0-only"
 
 SRC_URI = " \
-git://github.com/Dasharo/coreboot.git;branch=txe_sb_tool;protocol=https \
+    git://github.com/Dasharo/coreboot.git;branch=txe_sb_tool;protocol=https \
 "
 
 SRCREV = "295c158e577400025d01e7ca8ad3beb64e1614a0"
 
 LIC_FILES_CHKSUM = " \
-file://${WORKDIR}/git/LICENSES/GPL-2.0-only.txt;md5=5430828348d2cf7d4b5e8395f774a68e \
+    file://${WORKDIR}/git/LICENSES/GPL-2.0-only.txt;md5=5430828348d2cf7d4b5e8395f774a68e \
 "
 
 S = "${WORKDIR}/git/util/txesbmantool"
@@ -17,6 +17,11 @@ inherit pkgconfig
 
 DEPENDS += "wolfssl"
 
+EXTRA_OEMAKE = ' \
+  DESTDIR="${D}" \
+  PREFIX="${prefix}" \
+'
+
 do_configure:prepend(){
     export PKG_CONFIG_PATH="${STAGING_LIBDIR}/pkgconfig:${STAGING_DIR_HOST}/usr/lib/pkgconfig"
 }
@@ -31,9 +36,6 @@ do_install() {
 
 INSANE_SKIP:${PN} += "ldflags"
 
-prefix = "/usr/local"
-bindir = "${prefix}/bin"
-
 FILES:${PN} += " \
    ${bindir}/txesbmantool \
 "

From 51672c574dbc50b041434cf7617584ba8ff58744 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Tue, 4 Jun 2024 12:31:44 +0200
Subject: [PATCH 38/99] meta-dts-distro/recipes Add smmstore tool

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 .../txe-secure-boot/files/a5df001.diff        | 41 +++++++++++++++++++
 .../txe-secure-boot/smmstoretool_git.bb       | 25 +++++++++++
 .../packagegroups/packagegroup-dts.bb         |  1 +
 3 files changed, 67 insertions(+)
 create mode 100644 meta-dts-distro/recipes-bsp/txe-secure-boot/files/a5df001.diff
 create mode 100644 meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb

diff --git a/meta-dts-distro/recipes-bsp/txe-secure-boot/files/a5df001.diff b/meta-dts-distro/recipes-bsp/txe-secure-boot/files/a5df001.diff
new file mode 100644
index 00000000..925eff27
--- /dev/null
+++ b/meta-dts-distro/recipes-bsp/txe-secure-boot/files/a5df001.diff
@@ -0,0 +1,41 @@
+From a5df001f258be5536b7ad9f234546330d5f3ca66 Mon Sep 17 00:00:00 2001
+From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
+Date: Wed, 29 May 2024 13:28:14 +0200
+Subject: [PATCH] util/smmstoretool: explain what happens when no store is found
+
+We are going to expose ths tool to end users, and want to take
+care that the presented information can be consumed by them.
+
+The current code simply prints below warnings if we use release
+binary available for end-user to download:
+
+No firmware volume header present
+No valid firmware volume was found
+
+It will be concerning and not clear to end users, they might not
+understant why it happens, what are the implications, and whether
+it is something that they should worry about.
+
+This commit tries to explain what actually happens here.
+
+Change-Id: Iaa2678f5ae7c243811484c0567ced97ae0b3fc0a
+Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
+---
+
+diff --git a/util/smmstoretool/storage.c b/util/smmstoretool/storage.c
+index 8a02384..87284f7 100644
+--- a/util/smmstoretool/storage.c
++++ b/util/smmstoretool/storage.c
+@@ -50,6 +50,12 @@
+ 			goto error;
+ 		}
+ 
++		fprintf(stderr,
++			"\nThe variable store has not been found in the ROM image\n"
++			"and is about to be initialized. This situation is normal\n"
++			"for a release image, as the variable store is usually\n"
++			"initialized on the first boot of the platform.\n\n");
++
+ 		if (!fv_init(storage->region)) {
+ 			fprintf(stderr,
+ 				"Failed to create variable store in \"%s\"\n",
diff --git a/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb b/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
new file mode 100644
index 00000000..1ad8bdfa
--- /dev/null
+++ b/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Offline SMMSTORE variable modification too"
+LICENSE = "GPL-2.0-or-later"
+
+SRC_URI = " \
+git://github.com/coreboot/coreboot.git;branch=main;protocol=https \
+file://a5df001.diff;patchdir=${WORKDIR}/git \
+"
+
+SRCREV = "602653abed391ae1b1445ad86d0f05b8b5b678cb"
+
+LIC_FILES_CHKSUM = " \
+file://${WORKDIR}/git/LICENSES/GPL-2.0-or-later.txt;md5=261bea1168c0bdfa73232ee90df11eb6 \
+"
+
+inherit pkgconfig
+
+S = "${WORKDIR}/git/util/smmstoretool"
+
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install
+}
+
+FILES:${PN} += " \
+   /usr/local/bin/smmstoretool \
+"
diff --git a/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb b/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
index 62e22fc1..5f619a98 100644
--- a/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
+++ b/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
@@ -39,6 +39,7 @@ RDEPENDS:${PN}-tools-base = " \
     me-cleaner \
     iperf3 \
     txesbmantool \
+    smmstoretool \
 "
 
 RDEPENDS:${PN}-tools-dts = " \

From 9a9cec91206729722d793e174d1d761b13deaebe Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Wed, 5 Jun 2024 12:43:40 +0200
Subject: [PATCH 39/99] 
 meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git: Refactor file

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 .../recipes-bsp/txe-secure-boot/smmstoretool_git.bb    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb b/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
index 1ad8bdfa..f72691d2 100644
--- a/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
+++ b/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
@@ -1,15 +1,15 @@
-DESCRIPTION = "Offline SMMSTORE variable modification too"
+DESCRIPTION = "Offline SMMSTORE variable modification tool"
 LICENSE = "GPL-2.0-or-later"
 
 SRC_URI = " \
-git://github.com/coreboot/coreboot.git;branch=main;protocol=https \
-file://a5df001.diff;patchdir=${WORKDIR}/git \
+    git://github.com/coreboot/coreboot.git;branch=main;protocol=https \
+    file://a5df001.diff;patchdir=${WORKDIR}/git \
 "
 
 SRCREV = "602653abed391ae1b1445ad86d0f05b8b5b678cb"
 
 LIC_FILES_CHKSUM = " \
-file://${WORKDIR}/git/LICENSES/GPL-2.0-or-later.txt;md5=261bea1168c0bdfa73232ee90df11eb6 \
+    file://${WORKDIR}/git/LICENSES/GPL-2.0-or-later.txt;md5=261bea1168c0bdfa73232ee90df11eb6 \
 "
 
 inherit pkgconfig
@@ -20,6 +20,6 @@ do_install() {
     oe_runmake 'DESTDIR=${D}' install
 }
 
-FILES:${PN} += " \
+FILES:${PN} = " \
    /usr/local/bin/smmstoretool \
 "

From f289cf808adc691f73d91b69eede5a3859f60364 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Wed, 5 Jun 2024 13:53:33 +0200
Subject: [PATCH 40/99] meta-dts-distro/recipes-tests/dts-tests: cukinia.conf:
 Add smmstoretool test

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf b/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf
index 9122623d..d44c4859 100644
--- a/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf
+++ b/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf
@@ -20,5 +20,6 @@ as "Check if dasharo-hcl-report script exists" cukinia_test -x $(which dasharo-h
 # as "Check if dasharo-hcl-report script can be executed" cukinia_cmd dasharo-hcl-report
 
 as "Check if txesbmantool binary exists" cukinia_test -x $(which txesbmantool)
+as "Check if smmstoretool package can be started" cukinia_cmd smmstoretool -h
 
 cukinia_log "result: $cukinia_failures failure(s)"

From 3e58f2eab74940927928344ea55ce0d11549d5ab Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Thu, 6 Jun 2024 11:44:06 +0200
Subject: [PATCH 41/99] recipes-bsp/txe-secure-boot/smmstoretool_git.bb:
 Specify EXTRA_OEMAKE

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 .../recipes-bsp/txe-secure-boot/smmstoretool_git.bb      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb b/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
index f72691d2..11a4e895 100644
--- a/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
+++ b/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
@@ -16,10 +16,15 @@ inherit pkgconfig
 
 S = "${WORKDIR}/git/util/smmstoretool"
 
+EXTRA_OEMAKE = ' \
+  DESTDIR="${D}" \
+  PREFIX="${prefix}" \
+'
+
 do_install() {
-    oe_runmake 'DESTDIR=${D}' install
+    oe_runmake install
 }
 
 FILES:${PN} = " \
-   /usr/local/bin/smmstoretool \
+   ${bindir}/smmstoretool \
 "

From 8577b5036b4945ed16f5e1cf4372bb8c678f3ac0 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Wed, 5 Jun 2024 15:41:30 +0200
Subject: [PATCH 42/99] Add basic pre-commit configuration

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 .codespellrc                                |   3 +
 .codespellx                                 |   0
 .conform.yaml                               |  16 ++
 .markdownlint.yaml                          | 196 ++++++++++++++++++++
 .yamllint                                   |  16 ++
 CHANGELOG.md                                |   8 +-
 meta-dts-distro/conf/distro/dts-distro.conf |   2 +-
 scripts/generate-ipxe-menu.sh               |   2 +-
 unit_tests/.shellcheckrc                    |   1 +
 unit_tests/README.md                        |   2 +-
 10 files changed, 239 insertions(+), 7 deletions(-)
 create mode 100644 .codespellrc
 create mode 100644 .codespellx
 create mode 100644 .conform.yaml
 create mode 100644 .markdownlint.yaml
 create mode 100644 .yamllint
 create mode 100644 unit_tests/.shellcheckrc

diff --git a/.codespellrc b/.codespellrc
new file mode 100644
index 00000000..ea589058
--- /dev/null
+++ b/.codespellrc
@@ -0,0 +1,3 @@
+[codespell]
+exclude-file = .codespellx
+ignore-words-list = crate, hsi
diff --git a/.codespellx b/.codespellx
new file mode 100644
index 00000000..e69de29b
diff --git a/.conform.yaml b/.conform.yaml
new file mode 100644
index 00000000..f96e4e09
--- /dev/null
+++ b/.conform.yaml
@@ -0,0 +1,16 @@
+---
+policies:
+  - type: commit
+    spec:
+      header:
+        length: 80
+        imperative: false
+        invalidLastCharacters: .
+      body:
+        required: false
+      dco: true
+      gpg:
+        required: true
+      spellcheck:
+        locale: US
+      maximumOfOneCommit: false
diff --git a/.markdownlint.yaml b/.markdownlint.yaml
new file mode 100644
index 00000000..a17a36bb
--- /dev/null
+++ b/.markdownlint.yaml
@@ -0,0 +1,196 @@
+---
+# Documentation:
+# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md
+
+# Default state for all rules
+default: false
+
+# MD001/heading-increment/header-increment - Heading levels should only increment by one level at a time
+MD001: true
+
+# MD002/first-heading-h1/first-header-h1 - First heading should be a top-level heading
+MD002:
+  # Heading level
+  level: 1
+
+# MD003/heading-style/header-style - Heading style
+
+MD003:
+  # Heading style
+  # # ATX style H1
+  style: "atx"
+
+# MD004/ul-style - Unordered list style
+MD004:
+  # List style
+  style: "sublist"
+
+# MD005/list-indent - Inconsistent indentation for list items at the same level
+MD005: true
+
+# MD006/ul-start-left - Consider starting bulleted lists at the beginning of the line
+MD006: true
+
+# MD007/ul-indent - Unordered list indentation
+MD007:
+  # Spaces for indent
+  indent: 4
+  # Whether to indent the first level of the list
+  start_indented: false
+
+# MD009/no-trailing-spaces - Trailing spaces
+MD009:
+  # Spaces for line break
+  br_spaces: 2
+  # Allow spaces for empty lines in list items
+  list_item_empty_lines: false
+  # Include unnecessary breaks
+  strict: false
+
+# MD010/no-hard-tabs - Hard tabs
+MD010:
+  # Include code blocks
+  code_blocks: false
+  # Number of spaces for each hard tab
+  spaces_per_tab: 1
+
+# MD011/no-reversed-links - Reversed link syntax
+MD011: true
+
+# MD012/no-multiple-blanks - Multiple consecutive blank lines
+MD012:
+  # Consecutive blank lines
+  maximum: 1
+# MD013/line-length - Line length
+#
+MD013:
+  # Number of characters
+  line_length: 80
+  # Number of characters for headings
+  heading_line_length: 80
+  # Number of characters for code blocks
+  code_block_line_length: 160
+  # Include code blocks
+  code_blocks: false
+  # Include tables
+  tables: false
+  # Include headings
+  headings: true
+  # Strict length checking (e.g. allow for longer URLs)
+  strict: false
+  # Stern length checking
+  stern: false
+
+# MD014/commands-show-output - Dollar signs used before commands without showing output
+# TODO: set false for now but we should consider enabling it
+# https://cirosantilli.com/markdown-style-guide#dollar-signs-in-shell-code
+MD014: false
+
+# MD018/no-missing-space-atx - No space after hash on atx style heading
+MD018: true
+
+# MD019/no-multiple-space-atx - Multiple spaces after hash on atx style heading
+MD019: true
+
+# MD022/blanks-around-headings/blanks-around-headers - Headings should be surrounded by blank lines
+MD022:
+  # Blank lines above heading
+  lines_above: 1
+  # Blank lines below heading
+  lines_below: 1
+
+# MD023/heading-start-left/header-start-left - Headings must start at the beginning of the line
+MD023: true
+
+# MD025/single-title/single-h1 - Multiple top-level headings in the same document
+# TODO: consider enabling it
+
+# MD026/no-trailing-punctuation - Trailing punctuation in heading
+MD026:
+  # Punctuation characters
+  punctuation: ".,;:!。，；：！"
+
+# MD027/no-multiple-space-blockquote - Multiple spaces after blockquote symbol
+MD027: true
+
+# MD028/no-blanks-blockquote - Blank line inside blockquote
+MD028: true
+
+# MD029/ol-prefix - Ordered list item prefix
+MD029:
+  # List style
+  style: "one_or_ordered"
+
+# MD030/list-marker-space - Spaces after list markers
+MD030:
+  # Spaces for single-line unordered list items
+  ul_single: 1
+  # Spaces for single-line ordered list items
+  ol_single: 1
+  # Spaces for multi-line unordered list items
+  ul_multi: 1
+  # Spaces for multi-line ordered list items
+  ol_multi: 1
+
+# MD031/blanks-around-fences - Fenced code blocks should be surrounded by blank lines
+MD031:
+  # Include list items
+  list_items: true
+
+# MD033/no-inline-html - Inline HTML
+MD033:
+  # Allowed elements
+  allowed_elements: ["br", "center", "img", "script", "form", "input"]
+
+# MD034/no-bare-urls - Bare URL used
+MD034: true
+
+# MD035/hr-style - Horizontal rule style
+MD035:
+  # Horizontal rule style
+  style: "---"
+
+# MD037/no-space-in-emphasis - Spaces inside emphasis markers
+MD037: true
+
+# MD038/no-space-in-code - Spaces inside code span elements
+MD038: true
+
+# MD039/no-space-in-links - Spaces inside link text
+MD039: true
+
+# MD040/fenced-code-language - Fenced code blocks should have a language specified
+MD040: true
+
+# MD041/first-line-heading/first-line-h1 - First line in a file should be a top-level heading
+MD041:
+  # Heading level
+  level: 1
+  # RegExp for matching title in front matter
+  front_matter_title: "^\\s*title\\s*[:=]"
+
+# MD042/no-empty-links - No empty links
+MD042: true
+
+# MD046/code-block-style - Code block style
+MD046:
+  # Block style
+  style: "fenced"
+
+# MD047/single-trailing-newline - Files should end with a single newline character
+MD047: true
+
+# MD048/code-fence-style - Code fence style
+MD048:
+  # Code fence style
+  style: "backtick"
+
+# MD049/emphasis-style - Emphasis style should be consistent
+MD049:
+  # Emphasis style should be consistent
+  style: "underscore"
+
+# MD050/strong-style - Strong style should be consistent
+MD050:
+  # Strong style should be consistent
+  style: "asterisk"
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 00000000..1a23bc1c
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,16 @@
+---
+extends: default
+
+rules:
+  comments:
+    require-starting-space: true
+    ignore-shebangs: true
+    min-spaces-from-content: 2
+  document-start:
+    present: true
+    level: error
+  indentation:
+    spaces: 2
+  line-length: disable
+  truthy:
+    check-keys: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e5c0c60..057c3a92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,10 +103,10 @@ All notable changes to the DTS project will be documented in this file.
   a tool designed to configure Dasharo firmware binary images. It includes task
   such as customizing the boot logo, and setting unique UUIDs or Serial Numbers
   in SMBIOS tables.
-* Added support fot exFAT and NTFS file systems.
+* Added support for exFAT and NTFS file systems.
 * Added ACPI BGRT support in kernel.
 * Added signature verification of Dasharo firmware binaries.
-* Added posibility to run updates from [local server](./README.md#testing-dasharo-firmware-updates-from-local-sources).
+* Added possibility to run updates from [local server](./README.md#testing-dasharo-firmware-updates-from-local-sources).
 * Added check if charger is connected before update on laptops.
 * Added bootsplash migration to preserve logo while updating Dasharo firmware.
 * Fixed network failure errors and added waiting for network to be up before
@@ -188,7 +188,7 @@ All notable changes to the DTS project will be documented in this file.
   option for [supported
   platforms](https://docs.dasharo.com/dasharo-tools-suite/documentation/#supported-hardware).
 * Disabled SSH server by default and added menu option to start/stop SSH server.
-* Improved versions comparision so update from any `rc` or `dev` version of
+* Improved versions comparison so update from any `rc` or `dev` version of
   Dasharo firmware is possible.
 * Improved UX a little by saving flashrom logs to file.
 * Fixed CI workflows.
@@ -241,7 +241,7 @@ All notable changes to the DTS project will be documented in this file.
 * Added new vendor specific menu entry which is displayed only on supported
   platforms, for now NovaCustom menu was added for NV4x and NS50 70MU laptops.
 * DTS version is now printed in the main menu.
-* `ec_transition` script now supports NV4XMB,ME,MZ laptops and automaticaly
+* `ec_transition` script now supports NV4XMB,ME,MZ laptops and automatically
   download firmware used for transition both for NV4x and NS5x laptopts,
   [firmware transition](https://docs.dasharo.com/common-coreboot-docs/dasharo_tools_suite/#dasharo-ec-transition)
   documentation is updated.
diff --git a/meta-dts-distro/conf/distro/dts-distro.conf b/meta-dts-distro/conf/distro/dts-distro.conf
index 7cbc3868..348208e9 100644
--- a/meta-dts-distro/conf/distro/dts-distro.conf
+++ b/meta-dts-distro/conf/distro/dts-distro.conf
@@ -16,7 +16,7 @@ TARGET_VENDOR = "-dts"
 # POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan"
 DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} systemd usrmerge tpm tpm2"
 
-# explictely use systemd and disable sysvinit completely
+# explicitly use systemd and disable sysvinit completely
 VIRTUAL-RUNTIME_init_manager = "systemd"
 VIRTUAL-RUNTIME_initscripts = ""
 VIRTUAL-RUNTIME_syslog = ""
diff --git a/scripts/generate-ipxe-menu.sh b/scripts/generate-ipxe-menu.sh
index b3f0466c..8226d4e2 100755
--- a/scripts/generate-ipxe-menu.sh
+++ b/scripts/generate-ipxe-menu.sh
@@ -17,7 +17,7 @@ fi
 
 # imgverify can be enabled as a next step on top of the HTTPS. The imgtrust
 # should already be executed in the embedded script on the device. Also, we
-# should gracefuly handle older firmware versions, where imgtrust and imgverify
+# should gracefully handle older firmware versions, where imgtrust and imgverify
 # command could not be yet available.
 # imgtrust --permanent
 #
diff --git a/unit_tests/.shellcheckrc b/unit_tests/.shellcheckrc
new file mode 100644
index 00000000..d5a471e7
--- /dev/null
+++ b/unit_tests/.shellcheckrc
@@ -0,0 +1 @@
+disable=SC2034
diff --git a/unit_tests/README.md b/unit_tests/README.md
index 932a68c9..ed45dd9b 100644
--- a/unit_tests/README.md
+++ b/unit_tests/README.md
@@ -3,7 +3,7 @@
 This directory contains stub scripts for testing DTS update and deploy logic
 in complex scenarios.
 
-##  Running on host
+## Prerequisites
 
 Running test on the host may result in unpredictable results because of the
 missing programs and different version of certain tools. It is advised to run

From 7cb2381e3b20ad6f68ccd00cab1b435f4e5cd3fd Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Thu, 6 Jun 2024 11:33:01 +0200
Subject: [PATCH 43/99] recipes-dts: Remove dts-functions.sh

The script was moved to the
dts-scripts repo
(https://github.com/Dasharo/dts-scripts/blob/main/include/dts-functions.sh)
and is not used here anymore.

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 .../recipes-dts/dts/dts/dts-functions.sh      | 1234 -----------------
 1 file changed, 1234 deletions(-)
 delete mode 100644 meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh

diff --git a/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh b/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh
deleted file mode 100644
index 757c9ac8..00000000
--- a/meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh
+++ /dev/null
@@ -1,1234 +0,0 @@
-#!/usr/bin/env bash
-
-source $DTS_ENV
-
-### Color functions
-print_warning() {
-  echo -e "$YELLOW""$1""$COLOR_OFF"
-}
-
-print_error() {
-  echo -e "$RED""$1""$COLOR_OFF"
-}
-
-print_green() {
-  echo -e "$GREEN""$1""$COLOR_OFF"
-}
-
-check_if_dasharo() {
-  if [[ $BIOS_VENDOR == *$DASHARO_VENDOR* && $BIOS_VERSION == *$DASHARO_NAME* ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-check_if_ac() {
-  local _ac_file="/sys/class/power_supply/AC/online"
-
-  if [ ! -e "${_ac_file}" ]; then
-    # We want to silently skip if AC file is not there. Most likely this is
-    # not battery-powered device then.
-    return 0
-  fi
-
-  while true; do
-    ac_status=$(cat ${_ac_file})
-
-    if [ "$ac_status" -eq 1 ]; then
-      echo "AC adapter is connected. Continuing with firmware update."
-      return
-    else
-      print_warning "Warning: AC adapter must be connected before performing firmware update."
-      print_warning "Please connect the AC adapter and press 'C' to continue, or 'Q' to quit."
-
-      read -n 1 -r input
-      case $input in
-       [Cc])
-          echo "Checking AC status again..."
-          ;;
-        [Qq])
-          echo "Quitting firmware update."
-          return 1
-          ;;
-        *)
-          echo "Invalid input. Press 'C' to continue, or 'Q' to quit."
-          continue
-          ;;
-      esac
-    fi
-  done
-}
-
-### Error checks
-
-# instead of error exit in dasharo-deploy exit we need to reboot the platform
-# in cases where there would be some problem with updating the platform
-fum_exit() {
-    if [ "$FUM" == "fum" ]; then
-      print_error "Update cannot be performed"
-      print_warning "Starting bash session - please make sure you get logs from\r
-      \r$ERR_LOG_FILE and $FLASHROM_LOG_FILE; then you can poweroff the platform"
-      /bin/bash
-    fi
-}
-
-error_exit() {
-  _error_msg="$1"
-  if [ -n "$_error_msg" ]; then
-    # Avoid printing empty line if no message was passed
-    print_error "$_error_msg"
-  fi
-  fum_exit
-  exit 1
-}
-
-error_check() {
-  _error_code=$?
-  _error_msg="$1"
-  [ "$_error_code" -ne 0 ] && error_exit "$_error_msg : ($_error_code)"
-}
-
-function error_file_check {
-  if [ ! -f "$1" ]; then
-    print_error "$2"
-  fi
-}
-
-### Clevo-specific functions
-# Method to access IT5570 IO Depth 2 registers
-it5570_i2ec() {
-  # TODO: Use /dev/port instead of iotools
-
-  # Address high byte
-  iotools io_write8 0x2e 0x2e
-  iotools io_write8 0x2f 0x11
-  iotools io_write8 0x2e 0x2f
-  iotools io_write8 0x2f $(($2>>8 & 0xff))
-
-  # Address low byte
-  iotools io_write8 0x2e 0x2e
-  iotools io_write8 0x2f 0x10
-  iotools io_write8 0x2e 0x2f
-  iotools io_write8 0x2f $(($2 & 0xff))
-
-  # Data
-  iotools io_write8 0x2e 0x2e
-  iotools io_write8 0x2f 0x12
-  iotools io_write8 0x2e 0x2f
-
-  case $1 in
-    "r")
-      iotools io_read8 0x2f
-      ;;
-    "w")
-      iotools io_write8 0x2f "$3"
-      ;;
-  esac
-}
-
-it5570_shutdown() {
-  # shut down using EC external watchdog reset
-  it5570_i2ec w 0x1f01 0x20
-  it5570_i2ec w 0x1f07 0x01
-}
-
-check_network_connection() {
-  echo 'Waiting for network connection ...'
-  n="10"
-  while : ; do
-    if wget --spider cloud.3mdeb.com > /dev/null 2>&1; then
-      echo 'Network connection established.'
-      return 0
-    fi
-    n=$((n-1))
-    if [ "${n}" == "0" ]; then
-      echo 'No network connection to 3mdeb cloud, please recheck Ethernet connection'
-      return 1
-    fi
-    sleep 1
-  done
-}
-
-## Supported boards configuration
-
-board_config() {
-  # We download firmwares via network. At this point, the network connection
-  # must be up already.
-  check_network_connection
-
-  echo "Checking if board is Dasharo compatible."
-  case "$BOARD_VENDOR" in
-    "Notebook")
-      case "$SYSTEM_MODEL" in
-        "NV4XMB,ME,MZ")
-          DASHARO_REL_NAME="novacustom_nv4x_tgl"
-          DASHARO_REL_VER="1.5.2"
-          BIOS_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER/${DASHARO_REL_NAME}_v${DASHARO_REL_VER}.rom"
-          EC_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER/${DASHARO_REL_NAME}_ec_v${DASHARO_REL_VER}.rom"
-          HAVE_EC="true"
-          NEED_EC_RESET="true"
-          COMPATIBLE_EC_FW_VERSION="2022-10-07_c662165"
-          EC_HASH_LINK_COMM="$EC_LINK_COMM.sha256"
-          BIOS_HASH_LINK_COMM="$BIOS_LINK_COMM.sha256"
-          EC_SIGN_LINK_COMM="$EC_LINK_COMM.sha256.sig"
-          BIOS_SIGN_LINK_COMM="$BIOS_LINK_COMM.sha256.sig"
-          PLATFORM_SIGN_KEY="customer-keys/novacustom/novacustom-open-source-firmware-release-1.x-key.asc \
-             customer-keys/novacustom/dasharo-release-0.9.x-for-novacustom-signing-key.asc"
-          NEED_SMBIOS_MIGRATION="false"
-          NEED_SMMSTORE_MIGRATION="true"
-          NEED_BOOTSPLASH_MIGRATION="false"
-          NEED_BLOB_TRANSMISSION="false"
-          PROGRAMMER_BIOS="internal"
-          PROGRAMMER_EC="ite_ec:boardmismatch=force,romsize=128K,autoload=disable"
-          if check_if_dasharo; then
-          # if v1.5.1 or older, flash the whole bios region
-          # TODO: Let DTS determine which parameters are suitable.
-          # FIXME: Can we ever get rid of that? We change so much in each release,
-          # that we almost always need to flash whole BIOS regions
-          # because of non-backward compatbile or breaking changes.
-            compare_versions $DASHARO_VERSION 1.5.2
-            if [ $? -eq 1 ]; then
-              # For Dasharo version lesser than 1.5.2
-              NEED_BOOTSPLASH_MIGRATION="true"
-              FLASHROM_ADD_OPT_UPDATE_OVERRIDE="--ifd -i bios"
-            fi
-          fi
-          ;;
-        "NS50_70MU")
-          DASHARO_REL_NAME="novacustom_ns5x_tgl"
-          DASHARO_REL_VER="1.5.2"
-          BIOS_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER/${DASHARO_REL_NAME}_v${DASHARO_REL_VER}.rom"
-          EC_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER/${DASHARO_REL_NAME}_ec_v${DASHARO_REL_VER}.rom"
-          HAVE_EC="true"
-          NEED_EC_RESET="true"
-          COMPATIBLE_EC_FW_VERSION="2022-08-31_cbff21b"
-          EC_HASH_LINK_COMM="$EC_LINK_COMM.sha256"
-          BIOS_HASH_LINK_COMM="$BIOS_LINK_COMM.sha256"
-          EC_SIGN_LINK_COMM="$EC_LINK_COMM.sha256.sig"
-          BIOS_SIGN_LINK_COMM="$BIOS_LINK_COMM.sha256.sig"
-          PLATFORM_SIGN_KEY="customer-keys/novacustom/novacustom-open-source-firmware-release-1.x-key.asc \
-             customer-keys/novacustom/dasharo-release-0.9.x-for-novacustom-signing-key.asc"
-          NEED_SMBIOS_MIGRATION="false"
-          NEED_SMMSTORE_MIGRATION="true"
-          NEED_BOOTSPLASH_MIGRATION="false"
-          NEED_BLOB_TRANSMISSION="false"
-          PROGRAMMER_BIOS="internal"
-          PROGRAMMER_EC="ite_ec:boardmismatch=force,romsize=128K,autoload=disable"
-          if check_if_dasharo; then
-          # if v1.5.1 or older, flash the whole bios region
-          # TODO: Let DTS determine which parameters are suitable.
-          # FIXME: Can we ever get rid of that? We change so much in each release,
-          # that we almost always need to flash whole BIOS regions
-          # because of non-backward compatbile or breaking changes.
-            compare_versions $DASHARO_VERSION 1.5.2
-            if [ $? -eq 1 ]; then
-              # For Dasharo version lesser than 1.5.2
-              NEED_BOOTSPLASH_MIGRATION="true"
-              FLASHROM_ADD_OPT_UPDATE_OVERRIDE="--ifd -i bios"
-            fi
-          fi
-          ;;
-        "NS5x_NS7xPU")
-          DASHARO_REL_NAME="novacustom_ns5x_adl"
-          DASHARO_REL_VER="1.7.2"
-          BIOS_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER/${DASHARO_REL_NAME}_v${DASHARO_REL_VER}.rom"
-          EC_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER/${DASHARO_REL_NAME}_ec_v${DASHARO_REL_VER}.rom"
-          HAVE_EC="true"
-          NEED_EC_RESET="true"
-          COMPATIBLE_EC_FW_VERSION="2022-08-31_cbff21b"
-          EC_HASH_LINK_COMM="$EC_LINK_COMM.sha256"
-          BIOS_HASH_LINK_COMM="$BIOS_LINK_COMM.sha256"
-          EC_SIGN_LINK_COMM="$EC_LINK_COMM.sha256.sig"
-          BIOS_SIGN_LINK_COMM="$BIOS_LINK_COMM.sha256.sig"
-          PLATFORM_SIGN_KEY="customer-keys/novacustom/novacustom-open-source-firmware-release-1.x-key.asc \
-             customer-keys/novacustom/dasharo-release-0.9.x-for-novacustom-signing-key.asc"
-          NEED_SMBIOS_MIGRATION="false"
-          NEED_SMMSTORE_MIGRATION="true"
-          NEED_BLOB_TRANSMISSION="false"
-          PROGRAMMER_BIOS="internal"
-          PROGRAMMER_EC="ite_ec:boardmismatch=force,romsize=128K,autoload=disable"
-          if check_if_dasharo; then
-          # if v1.7.2 or older, flash the whole bios region
-          # TODO: Let DTS determine which parameters are suitable.
-          # FIXME: Can we ever get rid of that? We change so much in each release,
-          # that we almost always need to flash whole BIOS regions
-          # because of non-backward compatbile or breaking changes.
-            compare_versions $DASHARO_VERSION 1.7.2
-            if [ $? -eq 1 ]; then
-              # For Dasharo version lesser than 1.7.2
-              NEED_BOOTSPLASH_MIGRATION="true"
-              FLASHROM_ADD_OPT_UPDATE_OVERRIDE="--ifd -i bios"
-            fi
-          fi
-          ;;
-        "NV4xPZ")
-          DASHARO_REL_NAME="novacustom_nv4x_adl"
-          DASHARO_REL_VER="1.7.2"
-          HEADS_REL_VER_DES="0.9.1"
-          HEADS_LINK_DES="${FW_STORE_URL_DES}/${DASHARO_REL_NAME}/v${HEADS_REL_VER_DES}/${DASHARO_REL_NAME}_v${HEADS_REL_VER_DES}_heads.rom"
-          HEADS_SWITCH_FLASHROM_OPT_OVERRIDE="--ifd -i bios"
-          BIOS_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER/${DASHARO_REL_NAME}_v${DASHARO_REL_VER}.rom"
-          EC_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER/${DASHARO_REL_NAME}_ec_v${DASHARO_REL_VER}.rom"
-          HAVE_EC="true"
-          NEED_EC_RESET="true"
-          COMPATIBLE_EC_FW_VERSION="2022-08-31_cbff21b"
-          EC_HASH_LINK_COMM="$EC_LINK_COMM.sha256"
-          BIOS_HASH_LINK_COMM="$BIOS_LINK_COMM.sha256"
-          EC_SIGN_LINK_COMM="$EC_LINK_COMM.sha256.sig"
-          BIOS_SIGN_LINK_COMM="$BIOS_LINK_COMM.sha256.sig"
-          PLATFORM_SIGN_KEY="customer-keys/novacustom/novacustom-open-source-firmware-release-1.x-key.asc \
-             customer-keys/novacustom/dasharo-release-0.9.x-for-novacustom-signing-key.asc"
-          NEED_SMBIOS_MIGRATION="false"
-          NEED_SMMSTORE_MIGRATION="true"
-          NEED_BOOTSPLASH_MIGRATION="false"
-          NEED_BLOB_TRANSMISSION="false"
-          PROGRAMMER_BIOS="internal"
-          PROGRAMMER_EC="ite_ec:boardmismatch=force,romsize=128K,autoload=disable"
-          if check_if_dasharo; then
-          # if v1.7.2 or older, flash the whole bios region
-          # TODO: Let DTS determine which parameters are suitable.
-          # FIXME: Can we ever get rid of that? We change so much in each release,
-          # that we almost always need to flash whole BIOS regions
-          # because of non-backward compatbile or breaking changes.
-            compare_versions $DASHARO_VERSION 1.7.2
-            if [ $? -eq 1 ]; then
-              # For Dasharo version lesser than 1.7.2
-              NEED_BOOTSPLASH_MIGRATION="true"
-              FLASHROM_ADD_OPT_UPDATE_OVERRIDE="--ifd -i bios"
-            else
-              HAVE_HEADS_FW="true"
-            fi
-            if [ "$DASHARO_FLAVOR" == "Dasharo (coreboot+heads)" ]; then
-              HAVE_HEADS_FW="true"
-            fi
-          fi
-          ;;
-        *)
-          error_exit "Board model $SYSTEM_MODEL is currently not supported"
-          ;;
-      esac
-      ;;
-    "Micro-Star International Co., Ltd.")
-      case "$SYSTEM_MODEL" in
-        "MS-7D25")
-          case "$BOARD_MODEL" in
-            "PRO Z690-A WIFI DDR4(MS-7D25)" | "PRO Z690-A DDR4(MS-7D25)")
-              DASHARO_REL_NAME="msi_ms7d25"
-              DASHARO_REL_VER="1.1.1"
-              DASHARO_REL_VER_DES="1.1.3"
-              BIOS_LINK_COMM="${FW_STORE_URL}/${DASHARO_REL_NAME}/v${DASHARO_REL_VER}/${DASHARO_REL_NAME}_v${DASHARO_REL_VER}_ddr4.rom"
-              BIOS_LINK_DES="${FW_STORE_URL_DES}/MS-7D25/v${DASHARO_REL_VER_DES}/${DASHARO_REL_NAME}_v${DASHARO_REL_VER_DES}_ddr4.rom"
-              HAVE_HEADS_FW="true"
-              HEADS_REL_VER_DES="0.9.0"
-              HEADS_LINK_DES="${FW_STORE_URL_DES}/MS-7D25/v${HEADS_REL_VER_DES}/${DASHARO_REL_NAME}_v${HEADS_REL_VER_DES}_ddr4_heads.rom"
-              HEADS_SWITCH_FLASHROM_OPT_OVERRIDE="--ifd -i bios"
-              HAVE_EC="false"
-              NEED_EC_RESET="false"
-              BIOS_HASH_LINK_COMM="${BIOS_LINK_COMM}.sha256"
-              BIOS_HASH_LINK_DES="${BIOS_LINK_DES}.sha256"
-              BIOS_SIGN_LINK_COMM="${BIOS_LINK_COMM}.sha256.sig"
-              BIOS_SIGN_LINK_DES="${BIOS_LINK_DES}.sha256.sig"
-              PLATFORM_SIGN_KEY="dasharo/msi_ms7d25/dasharo-release-1.x-compatible-with-msi-ms-7d25-signing-key.asc \
-                 dasharo/msi_ms7d25/dasharo-release-0.x-compatible-with-msi-ms-7d25-signing-key.asc"
-              NEED_SMBIOS_MIGRATION="true"
-              NEED_SMMSTORE_MIGRATION="true"
-              NEED_BOOTSPLASH_MIGRATION="false"
-              NEED_BLOB_TRANSMISSION="false"
-              PROGRAMMER_BIOS="internal"
-              PROGRAMMER_EC=""
-              NEED_ROMHOLE_MIGRATION="true"
-              if check_if_dasharo; then
-                # if v1.1.3 or older, flash the whole bios region
-                # TODO: Let DTS determine which parameters are suitable.
-                # FIXME: Can we ever get rid of that? We change so much in each release,
-                # that we almost always need to flash whole BIOS region
-                # because of non-backward compatbile or breaking changes.
-                compare_versions $DASHARO_VERSION 1.1.3
-                if [ $? -eq 1 ]; then
-                  # For Dasharo version lesser than 1.1.3
-                  NEED_BOOTSPLASH_MIGRATION="true"
-                  FLASHROM_ADD_OPT_UPDATE_OVERRIDE="--ifd -i bios"
-                fi
-              fi
-              ;;
-            "PRO Z690-A WIFI (MS-7D25)" | "PRO Z690-A (MS-7D25)")
-              DASHARO_REL_NAME="msi_ms7d25"
-              DASHARO_REL_VER="1.1.1"
-              DASHARO_REL_VER_DES="1.1.3"
-              BIOS_LINK_COMM="${FW_STORE_URL}/${DASHARO_REL_NAME}/v${DASHARO_REL_VER}/${DASHARO_REL_NAME}_v${DASHARO_REL_VER}_ddr5.rom"
-              BIOS_LINK_DES="${FW_STORE_URL_DES}/MS-7D25/v${DASHARO_REL_VER_DES}/${DASHARO_REL_NAME}_v${DASHARO_REL_VER_DES}_ddr5.rom"
-              HAVE_HEADS_FW="true"
-              HEADS_REL_VER_DES="0.9.0"
-              HEADS_LINK_DES="${FW_STORE_URL_DES}/MS-7D25/v${HEADS_REL_VER_DES}/${DASHARO_REL_NAME}_v${HEADS_REL_VER_DES}_ddr5_heads.rom"
-              HEADS_SWITCH_FLASHROM_OPT_OVERRIDE="--ifd -i bios"
-              HAVE_EC="false"
-              NEED_EC_RESET="false"
-              BIOS_HASH_LINK_COMM="${BIOS_LINK_COMM}.sha256"
-              BIOS_HASH_LINK_DES="${BIOS_LINK_DES}.sha256"
-              BIOS_SIGN_LINK_COMM="${BIOS_LINK_COMM}.sha256.sig"
-              BIOS_SIGN_LINK_DES="${BIOS_LINK_DES}.sha256.sig"
-              PLATFORM_SIGN_KEY="dasharo/msi_ms7d25/dasharo-release-1.x-compatible-with-msi-ms-7d25-signing-key.asc \
-                 dasharo/msi_ms7d25/dasharo-release-0.x-compatible-with-msi-ms-7d25-signing-key.asc"
-              NEED_SMBIOS_MIGRATION="true"
-              NEED_SMMSTORE_MIGRATION="true"
-              NEED_BOOTSPLASH_MIGRATION="false"
-              NEED_BLOB_TRANSMISSION="false"
-              PROGRAMMER_BIOS="internal"
-              PROGRAMMER_EC=""
-              NEED_ROMHOLE_MIGRATION="true"
-              if check_if_dasharo; then
-                # if v1.1.3 or older, flash the whole bios region
-                # TODO: Let DTS determine which parameters are suitable.
-                # FIXME: Can we ever get rid of that? We change so much in each release,
-                # that we almost always need to flash whole BIOS region
-                # because of non-backward compatbile or breaking changes.
-                compare_versions $DASHARO_VERSION 1.1.3
-                if [ $? -eq 1 ]; then
-                  # For Dasharo version lesser than 1.1.3
-                  NEED_BOOTSPLASH_MIGRATION="true"
-                  FLASHROM_ADD_OPT_UPDATE_OVERRIDE="--ifd -i bios"
-                fi
-              fi
-              ;;
-            *)
-              error_exit "Board model $BOARD_MODEL is currently not supported"
-              ;;
-          esac
-          ;;
-        "MS-7E06")
-          case "$BOARD_MODEL" in
-            "PRO Z790-P WIFI DDR4(MS-7E06)" | "PRO Z790-P DDR4(MS-7E06)" | "PRO Z790-P WIFI DDR4 (MS-7E06)" | "PRO Z790-P DDR4 (MS-7E06)")
-              DASHARO_REL_NAME="msi_ms7e06"
-              #DASHARO_REL_VER=""
-              DASHARO_REL_VER_DES="0.9.1"
-              #BIOS_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER/${DASHARO_REL_NAME}_v${DASHARO_REL_VER}_ddr4.rom"
-              BIOS_LINK_DES="${FW_STORE_URL_DES}/MS-7E06/v${DASHARO_REL_VER_DES}/${DASHARO_REL_NAME}_v${DASHARO_REL_VER_DES}_ddr4.rom"
-              HAVE_HEADS_FW="true"
-              HEADS_REL_VER_DES="0.9.0"
-              HEADS_LINK_DES="${FW_STORE_URL_DES}/MS-7E06/v${HEADS_REL_VER_DES}/${DASHARO_REL_NAME}_v${HEADS_REL_VER_DES}_ddr4_heads.rom"
-              HEADS_SWITCH_FLASHROM_OPT_OVERRIDE="--ifd -i bios"
-              HAVE_EC="false"
-              NEED_EC_RESET="false"
-              #BIOS_HASH_LINK_COMM="${BIOS_LINK_COMM}.sha256"
-              BIOS_HASH_LINK_DES="${BIOS_LINK_DES}.sha256"
-              #BIOS_SIGN_LINK_COMM="${BIOS_LINK_COMM}.sha256.sig"
-              BIOS_SIGN_LINK_DES="${BIOS_LINK_DES}.sha256.sig"
-              PLATFORM_SIGN_KEY="dasharo/msi_ms7e06/dasharo-release-0.x-compatible-with-msi-ms-7e06-signing-key.asc"
-              NEED_SMBIOS_MIGRATION="false"
-              NEED_SMMSTORE_MIGRATION="true"
-              NEED_BOOTSPLASH_MIGRATION="false"
-              NEED_BLOB_TRANSMISSION="false"
-              PROGRAMMER_BIOS="internal:boardmismatch=force"
-              PROGRAMMER_EC=""
-              NEED_ROMHOLE_MIGRATION="true"
-              if check_if_dasharo; then
-                # if v0.9.1 or older, flash the whole bios region
-                # TODO: Let DTS determine which parameters are suitable.
-                # FIXME: Can we ever get rid of that? We change so much in each release,
-                # that we almost always need to flash whole BIOS region
-                # because of non-backward compatbile or breaking changes.
-                compare_versions $DASHARO_VERSION 0.9.1
-                if [ $? -eq 1 ]; then
-                  # For Dasharo version lesser than 0.9.1
-                  NEED_BOOTSPLASH_MIGRATION="true"
-                  FLASHROM_ADD_OPT_UPDATE_OVERRIDE="--ifd -i bios"
-                fi
-              fi
-              ;;
-            "PRO Z790-P WIFI (MS-7E06)" | "PRO Z790-P (MS-7E06)")
-              DASHARO_REL_NAME="msi_ms7e06"
-              #DASHARO_REL_VER=""
-              DASHARO_REL_VER_DES="0.9.1"
-              #BIOS_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER/${DASHARO_REL_NAME}_v${DASHARO_REL_VER}_ddr5.rom"
-              BIOS_LINK_DES="${FW_STORE_URL_DES}/MS-7E06/v${DASHARO_REL_VER_DES}/${DASHARO_REL_NAME}_v${DASHARO_REL_VER_DES}_ddr5.rom"
-              HAVE_HEADS_FW="true"
-              HEADS_REL_VER_DES="0.9.0"
-              HEADS_LINK_DES="${FW_STORE_URL_DES}/MS-7E06/v${HEADS_REL_VER_DES}/${DASHARO_REL_NAME}_v${HEADS_REL_VER_DES}_ddr5_heads.rom"
-              HEADS_SWITCH_FLASHROM_OPT_OVERRIDE="--ifd -i bios"
-              HAVE_EC="false"
-              NEED_EC_RESET="false"
-              #BIOS_HASH_LINK_COMM="${BIOS_LINK_COMM}.sha256"
-              BIOS_HASH_LINK_DES="${BIOS_LINK_DES}.sha256"
-              #BIOS_SIGN_LINK_COMM="${BIOS_LINK_COMM}.sha256.sig"
-              BIOS_SIGN_LINK_DES="${BIOS_LINK_DES}.sha256.sig"
-              PLATFORM_SIGN_KEY="dasharo/msi_ms7e06/dasharo-release-0.x-compatible-with-msi-ms-7e06-signing-key.asc"
-              NEED_SMBIOS_MIGRATION="false"
-              NEED_SMMSTORE_MIGRATION="true"
-              NEED_BOOTSPLASH_MIGRATION="false"
-              NEED_BLOB_TRANSMISSION="false"
-              PROGRAMMER_BIOS="internal"
-              PROGRAMMER_EC=""
-              NEED_ROMHOLE_MIGRATION="true"
-              if check_if_dasharo; then
-                # if v0.9.1 or older, flash the whole bios region
-                # TODO: Let DTS determine which parameters are suitable.
-                # FIXME: Can we ever get rid of that? We change so much in each release,
-                # that we almost always need to flash whole BIOS region
-                # because of non-backward compatbile or breaking changes.
-                compare_versions $DASHARO_VERSION 0.9.1
-                if [ $? -eq 1 ]; then
-                  # For Dasharo version lesser than 0.9.1
-                  NEED_BOOTSPLASH_MIGRATION="true"
-                  FLASHROM_ADD_OPT_UPDATE_OVERRIDE="--ifd -i bios"
-                fi
-              fi
-              ;;
-            *)
-              error_exit "Board model $BOARD_MODEL is currently not supported"
-              ;;
-          esac
-          ;;
-        *)
-          error_exit "Board model $SYSTEM_MODEL is currently not supported"
-          ;;
-      esac
-      ;;
-    "Dell Inc.")
-      DASHARO_REL_NAME="dell_optiplex_9010"
-      DASHARO_REL_VER="0.1.0"
-      BIOS_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER.rom"
-      HAVE_EC="false"
-      NEED_EC_RESET="false"
-      BIOS_HASH_LINK_COMM="${BIOS_LINK_COMM}.sha256"
-      BIOS_SIGN_LINK_COMM="${BIOS_LINK_COMM}.sha256.sig"
-      NEED_SMBIOS_MIGRATION="true"
-      NEED_BLOB_TRANSMISSION="true"
-      PROGRAMMER_BIOS="internal"
-      SINIT_ACM_FILENAME="/tmp/630744_003.zip"
-      SINIT_ACM_URL="https://cdrdv2.intel.com/v1/dl/getContent/630744"
-      SINIT_ACM_HASH="0b412c1832bd504d4b8f5fa01b32449c344fe0019e5e4da6bb5d80d393df5e8b $SINIT_ACM_FILENAME"
-      SINIT_ACM="/tmp/630744_003/SNB_IVB_SINIT_20190708_PW.bin"
-      FLASHROM_ADD_OPT_DEPLOY="--ifd -i bios"
-      FLASHROM_ADD_OPT_UPDATE="--fmap -i RW_SECTION_A"
-      case "$SYSTEM_MODEL" in
-        "OptiPlex 7010")
-          DBT_BIOS_UPDATE_FILENAME="/tmp/O7010A29.exe"
-          DBT_BIOS_UPDATE_URL="https://dl.dell.com/FOLDER05066036M/1/O7010A29.exe"
-          DBT_BIOS_UPDATE_HASH="ceb82586c67cd8d5933ac858c12e0cb52f6e0e4cb3249f964f1c0cfc06d16f52  $DBT_BIOS_UPDATE_FILENAME"
-          DBT_UEFI_IMAGE="/tmp/_O7010A29.exe.extracted/65C10"
-          SCH5545_FW="/tmp/_O7010A29.exe.extracted/65C10_output/pfsobject/section-7ec6c2b0-3fe3-42a0-a316-22dd0517c1e8/volume-0x50000/file-d386beb8-4b54-4e69-94f5-06091f67e0d3/section0.raw"
-          ACM_BIN="/tmp/_O7010A29.exe.extracted/65C10_output/pfsobject/section-7ec6c2b0-3fe3-42a0-a316-22dd0517c1e8/volume-0x500000/file-2d27c618-7dcd-41f5-bb10-21166be7e143/object-0.raw"
-          ;;
-        "OptiPlex 9010")
-          DBT_BIOS_UPDATE_FILENAME="/tmp/O9010A30.exe"
-          DBT_BIOS_UPDATE_URL="https://dl.dell.com/FOLDER05066009M/1/O9010A30.exe"
-          DBT_BIOS_UPDATE_HASH="b11952f43d0ad66f3ce79558b8c5dd43f30866158ed8348e3b2dae1bbb07701b  $DBT_BIOS_UPDATE_FILENAME"
-          DBT_UEFI_IMAGE="/tmp/_O9010A30.exe.extracted/65C10"
-          SCH5545_FW="/tmp/_O9010A30.exe.extracted/65C10_output/pfsobject/section-7ec6c2b0-3fe3-42a0-a316-22dd0517c1e8/volume-0x50000/file-d386beb8-4b54-4e69-94f5-06091f67e0d3/section0.raw"
-          ACM_BIN="/tmp/_O9010A30.exe.extracted/65C10_output/pfsobject/section-7ec6c2b0-3fe3-42a0-a316-22dd0517c1e8/volume-0x500000/file-2d27c618-7dcd-41f5-bb10-21166be7e143/object-0.raw"
-          ;;
-        "Precision T1650")
-          # tested on Dasharo Firmware for OptiPlex 9010, will need to be
-          # enabled when build for T1650 exists
-          #
-          # DBT_BIOS_UPDATE_FILENAME="/tmp/T1650A28.exe"
-          # DBT_BIOS_UPDATE_URL="https://dl.dell.com/FOLDER05065992M/1/T1650A28.exe"
-          # DBT_BIOS_UPDATE_HASH="40a66210b8882f523885849c1d879e726dc58aa14718168b1e75f3e2caaa523b  $DBT_BIOS_UPDATE_FILENAME"
-          # DBT_UEFI_IMAGE="/tmp/_T1650A28.exe.extracted/65C10"
-          # SCH5545_FW="/tmp/_T1650A28.exe.extracted/65C10_output/pfsobject/section-7ec6c2b0-3fe3-42a0-a316-22dd0517c1e8/volume-0x60000/file-d386beb8-4b54-4e69-94f5-06091f67e0d3/section0.raw"
-          # ACM_BIN="/tmp/_T1650A28.exe.extracted/65C10_output/pfsobject/section-7ec6c2b0-3fe3-42a0-a316-22dd0517c1e8/volume-0x500000/file-2d27c618-7dcd-41f5-bb10-21166be7e143/object-0.raw"
-          print_warning "Dasharo Firmware for Precision T1650 not available yet!"
-          error_exit "Board model $SYSTEM_MODEL is currently not supported"
-          ;;
-        *)
-          error_exit "Board model $SYSTEM_MODEL is currently not supported"
-          ;;
-      esac
-      ;;
-    "ASUS")
-      case "$SYSTEM_MODEL" in
-        "KGPE-D16")
-          DASHARO_REL_NAME="asus_kgpe-d16"
-          DASHARO_REL_VER="0.4.0"
-          HAVE_EC="false"
-          NEED_EC_RESET="false"
-          case "$FLASH_CHIP_SIZE" in
-          "2")
-            BIOS_HASH_LINK_COMM="65e5370e9ea6b8ae7cd6cc878a031a4ff3a8f5d36830ef39656b8e5a6e37e889  $BIOS_UPDATE_FILE"
-            BIOS_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER/${DASHARO_REL_NAME}_v${DASHARO_REL_VER}_vboot_notpm.rom"
-            ;;
-          "8")
-            BIOS_HASH_LINK_COMM="da4e6217d50f2ac199dcb9a927a0bc02aa4e792ed73c8c9bac8ba74fc787dbef  $BIOS_UPDATE_FILE"
-            BIOS_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER/${DASHARO_REL_NAME}_v${DASHARO_REL_VER}_${FLASH_CHIP_SIZE}M_vboot_notpm.rom"
-            ;;
-          "16")
-            BIOS_HASH_LINK_COMM="20055cf57185f149259706f58d5e9552a1589259c6617999c1ac7d8d3c960020  $BIOS_UPDATE_FILE"
-            BIOS_LINK_COMM="$FW_STORE_URL/$DASHARO_REL_NAME/v$DASHARO_REL_VER/${DASHARO_REL_NAME}_v${DASHARO_REL_VER}_${FLASH_CHIP_SIZE}M_vboot_notpm.rom"
-            ;;
-          *)
-            error_exit "Platform uses chipset with not supported size"
-            ;;
-          esac
-          NEED_SMBIOS_MIGRATION="true"
-          NEED_BLOB_TRANSMISSION="false"
-          PROGRAMMER_BIOS="internal"
-          ;;
-        *)
-          error_exit "Board model $SYSTEM_MODEL is currently not supported"
-          ;;
-      esac
-      ;;
-    "PC Engines")
-      FLASH_CHIP_LIST="W25Q64JV-.Q"
-      shopt -s nocasematch
-      case "$SYSTEM_MODEL" in
-        "APU2")
-          DASHARO_REL_NAME="pcengines_apu2"
-          DASHARO_REL_VER_DES="0.9.0"
-          HAVE_EC="false"
-          NEED_EC_RESET="false"
-          BIOS_LINK_DES="${FW_STORE_URL_DES}/pcengines_apu2/v${DASHARO_REL_VER_DES}/${DASHARO_REL_NAME}_v${DASHARO_REL_VER_DES}.rom"
-          BIOS_HASH_LINK_DES="${BIOS_LINK_DES}.sha256"
-          BIOS_SIGN_LINK_DES="${BIOS_LINK_DES}.sha256.sig"
-          DASHARO_REL_VER_DES_SEABIOS="24.05.00.01"
-          BIOS_LINK_DES_SEABIOS="${FW_STORE_URL_DES}/pcengines_apu2/v${DASHARO_REL_VER_DES_SEABIOS}/${DASHARO_REL_NAME}_seabios_v${DASHARO_REL_VER_DES_SEABIOS}.rom"
-          BIOS_HASH_LINK_DES_SEABIOS="${BIOS_LINK_DES_SEABIOS}.sha256"
-          BIOS_SIGN_LINK_DES_SEABIOS="${BIOS_LINK_DES_SEABIOS}.sha256.sig"
-          PROGRAMMER_BIOS="internal:boardmismatch=force"
-          NEED_SMMSTORE_MIGRATION="true"
-          NEED_BOOTSPLASH_MIGRATION="true"
-          ;;
-        "APU3")
-          DASHARO_REL_NAME="pcengines_apu3"
-          DASHARO_REL_VER_DES="0.9.0"
-          HAVE_EC="false"
-          NEED_EC_RESET="false"
-          BIOS_LINK_DES="${FW_STORE_URL_DES}/pcengines_apu2/v${DASHARO_REL_VER_DES}/${DASHARO_REL_NAME}_v${DASHARO_REL_VER_DES}.rom"
-          BIOS_HASH_LINK_DES="${BIOS_LINK_DES}.sha256"
-          BIOS_SIGN_LINK_DES="${BIOS_LINK_DES}.sha256.sig"
-          DASHARO_REL_VER_DES_SEABIOS="24.05.00.01"
-          BIOS_LINK_DES_SEABIOS="${FW_STORE_URL_DES}/pcengines_apu2/v${DASHARO_REL_VER_DES_SEABIOS}/${DASHARO_REL_NAME}_seabios_v${DASHARO_REL_VER_DES_SEABIOS}.rom"
-          BIOS_HASH_LINK_DES_SEABIOS="${BIOS_LINK_DES_SEABIOS}.sha256"
-          BIOS_SIGN_LINK_DES_SEABIOS="${BIOS_LINK_DES_SEABIOS}.sha256.sig"
-          PROGRAMMER_BIOS="internal:boardmismatch=force"
-          NEED_SMMSTORE_MIGRATION="true"
-          NEED_BOOTSPLASH_MIGRATION="true"
-          ;;
-        "APU4")
-          DASHARO_REL_NAME="pcengines_apu4"
-          DASHARO_REL_VER_DES="0.9.0"
-          HAVE_EC="false"
-          NEED_EC_RESET="false"
-          BIOS_LINK_DES="${FW_STORE_URL_DES}/pcengines_apu2/v${DASHARO_REL_VER_DES}/${DASHARO_REL_NAME}_v${DASHARO_REL_VER_DES}.rom"
-          BIOS_HASH_LINK_DES="${BIOS_LINK_DES}.sha256"
-          BIOS_SIGN_LINK_DES="${BIOS_LINK_DES}.sha256.sig"
-          DASHARO_REL_VER_DES_SEABIOS="24.05.00.01"
-          BIOS_LINK_DES_SEABIOS="${FW_STORE_URL_DES}/pcengines_apu2/v${DASHARO_REL_VER_DES_SEABIOS}/${DASHARO_REL_NAME}_seabios_v${DASHARO_REL_VER_DES_SEABIOS}.rom"
-          BIOS_HASH_LINK_DES_SEABIOS="${BIOS_LINK_DES_SEABIOS}.sha256"
-          BIOS_SIGN_LINK_DES_SEABIOS="${BIOS_LINK_DES_SEABIOS}.sha256.sig"
-          PROGRAMMER_BIOS="internal:boardmismatch=force"
-          NEED_SMMSTORE_MIGRATION="true"
-          NEED_BOOTSPLASH_MIGRATION="true"
-          ;;
-        "APU6")
-          DASHARO_REL_NAME="pcengines_apu6"
-          DASHARO_REL_VER_DES="0.9.0"
-          HAVE_EC="false"
-          NEED_EC_RESET="false"
-          BIOS_LINK_DES="${FW_STORE_URL_DES}/pcengines_apu2/v${DASHARO_REL_VER_DES}/${DASHARO_REL_NAME}_v${DASHARO_REL_VER_DES}.rom"
-          BIOS_HASH_LINK_DES="${BIOS_LINK_DES}.sha256"
-          BIOS_SIGN_LINK_DES="${BIOS_LINK_DES}.sha256.sig"
-          DASHARO_REL_VER_DES_SEABIOS="24.05.00.01"
-          BIOS_LINK_DES_SEABIOS="${FW_STORE_URL_DES}/pcengines_apu2/v${DASHARO_REL_VER_DES_SEABIOS}/${DASHARO_REL_NAME}_seabios_v${DASHARO_REL_VER_DES_SEABIOS}.rom"
-          BIOS_HASH_LINK_DES_SEABIOS="${BIOS_LINK_DES_SEABIOS}.sha256"
-          BIOS_SIGN_LINK_DES_SEABIOS="${BIOS_LINK_DES_SEABIOS}.sha256.sig"
-          PROGRAMMER_BIOS="internal:boardmismatch=force"
-          NEED_SMMSTORE_MIGRATION="true"
-          NEED_BOOTSPLASH_MIGRATION="true"
-          ;;
-        *)
-          error_exit "Board model $SYSTEM_MODEL is currently not supported"
-          ;;
-      esac
-      shopt -u nocasematch
-      ;;
-    *)
-      error_exit "Board vendor: $BOARD_VENDOR is currently not supported"
-      ;;
-  esac
-}
-
-check_flash_lock() {
-    $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} > /tmp/check_flash_lock 2> /tmp/check_flash_lock.err
-    # Check in flashrom output if lock is enabled
-    grep -q 'PR0: Warning:.* is read-only\|SMM protection is enabled' /tmp/check_flash_lock.err
-    if [ $? -eq 0 ]; then
-        print_warning "Flash lock enabled, please go into BIOS setup / Dasharo System Features / Dasharo\r
-        \rSecurity Options and enable access to flash with flashrom.\r\n
-        \rYou can learn more about this on: https://docs.dasharo.com/dasharo-menu-docs/dasharo-system-features/#dasharo-security-options"
-        exit 1
-    fi
-}
-
-check_flash_chip() {
-  echo "Gathering flash chip and chipset information..."
-  $FLASHROM -p "$PROGRAMMER_BIOS" --flash-name >> "$FLASH_INFO_FILE" 2>> "$ERR_LOG_FILE"
-  if [ $? -eq 0 ]; then
-    echo -n "Flash information: "
-    tail -n1 "$FLASH_INFO_FILE"
-    FLASH_CHIP_SIZE=$(($($FLASHROM -p "$PROGRAMMER_BIOS" --flash-size 2>> /dev/null | tail -n1) / 1024 / 1024))
-    echo -n "Flash size: "
-    echo ${FLASH_CHIP_SIZE}M
-  else
-    for flash_name in $FLASH_CHIP_LIST
-    do
-      $FLASHROM -p "$PROGRAMMER_BIOS" -c "$flash_name" --flash-name >> "$FLASH_INFO_FILE" 2>> "$ERR_LOG_FILE"
-      if [ $? -eq 0 ]; then
-        echo "Chipset found"
-        tail -n1 "$FLASH_INFO_FILE"
-        FLASH_CHIP_SELECT="-c ${flash_name}"
-        FLASH_CHIP_SIZE=$(($($FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} --flash-size 2>> /dev/null | tail -n1) / 1024 / 1024))
-        echo "Chipset size"
-        echo ${FLASH_CHIP_SIZE}M
-        break
-      fi
-    done
-    if [ -z "$FLASH_CHIP_SELECT" ]; then
-      error_exit "No supported chipset found, exit."
-    fi
-  fi
-}
-
-check_se_creds() {
-  local _check_dwn_req_resp_uefi="0"
-  local _check_dwn_req_resp_heads="0"
-  local _check_dwn_req_resp_seabios="0"
-  local _check_logs_req_resp="0"
-  CLOUDSEND_LOGS_URL=$(sed -n '1p' < ${SE_credential_file} | tr -d '\n')
-  CLOUDSEND_DOWNLOAD_URL=$(sed -n '2p' < ${SE_credential_file} | tr -d '\n')
-  CLOUDSEND_PASSWORD=$(sed -n '3p' < ${SE_credential_file} | tr -d '\n')
-  USER_DETAILS="$CLOUDSEND_DOWNLOAD_URL:$CLOUDSEND_PASSWORD"
-  board_config
-  TEST_LOGS_URL="https://cloud.3mdeb.com/index.php/s/${CLOUDSEND_LOGS_URL}/authenticate/showShare"
-
-  if [ ! -v BIOS_LINK_DES ] && [ ! -v HEADS_LINK_DES ] && [ ! -v BIOS_LINK_DES_SEABIOS ]; then
-    error_exit "There is no Dasharo Entry Subscription available for your platform!"
-  fi
-
-  if check_network_connection; then
-    if [ -v BIOS_LINK_DES ]; then
-      _check_dwn_req_resp_uefi=$(curl -L -I -s -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$BIOS_LINK_DES" -o /dev/null -w "%{http_code}")
-    fi
-    if [ -v HEADS_LINK_DES ]; then
-      _check_dwn_req_resp_heads=$(curl -L -I -s -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$HEADS_LINK_DES" -o /dev/null -w "%{http_code}")
-    fi
-    if [ -v BIOS_LINK_DES_SEABIOS ]; then
-      _check_dwn_req_resp_seabios=$(curl -L -I -s -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$BIOS_LINK_DES_SEABIOS" -o /dev/null -w "%{http_code}")
-    fi
-
-    _check_logs_req_resp=$(curl -L -I -s -f -H "$CLOUD_REQUEST" "$TEST_LOGS_URL" -o /dev/null -w "%{http_code}")
-    if [ ${_check_dwn_req_resp_uefi} -eq 200 ] || [ ${_check_dwn_req_resp_heads} -eq 200 ] || [ ${_check_dwn_req_resp_seabios} -eq 200 ]; then
-      if [ ${_check_logs_req_resp} -eq 200 ]; then
-        return 0
-      else
-        echo ""
-        return 1
-      fi
-    else
-      echo ""
-      return 1
-    fi
-  fi
-}
-
-compare_versions() {
-    # return 1 if ver2 > ver1
-    # return 0 otherwise
-
-    # Use awk to drop any suffixes (-devX or -rcY) from the version strings, so
-    # that only the major, minor, and patch versions are compared. If the
-    # resulting versions are the same (ver1 equals ver2), then the one without
-    # any suffix is considered to be the newer version.
-    local ver1="$(echo $1 | awk -F '-' '{print $1}')"
-    local ver2="$(echo $2 | awk -F '-' '{print $1}')"
-    local suffix1="$(echo $1 | sed 's/^[0-9]*\.[0-9]*\.[0-9]*-*//')"
-    local suffix2="$(echo $2 | sed 's/^[0-9]*\.[0-9]*\.[0-9]*-*//')"
-
-    if [[ $ver1 =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && [[ $ver2 =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-      IFS='.' read -r -a arr_ver1 <<< "$ver1"
-      IFS='.' read -r -a arr_ver2 <<< "$ver2"
-
-      if [ ${arr_ver2[0]} -lt ${arr_ver1[0]} ]; then
-          return 0
-      fi
-
-      if [ ${arr_ver2[0]} -gt ${arr_ver1[0]} ]; then
-          return 1
-      fi
-
-      if [ ${arr_ver2[0]} -eq ${arr_ver1[0]} ]; then
-          if [ ${arr_ver2[1]} -lt ${arr_ver1[1]} ]; then
-              return 0
-          fi
-
-          if [ ${arr_ver2[1]} -gt ${arr_ver1[1]} ]; then
-              return 1
-          fi
-
-          if [ ${arr_ver2[1]} -eq ${arr_ver1[1]} ]; then
-              if [ ${arr_ver2[2]} -lt ${arr_ver1[2]} ]; then
-                return 0
-              fi
-
-              if [ ${arr_ver2[2]} -gt ${arr_ver1[2]} ]; then
-                return 1
-              fi
-
-              # check suffixes
-              if [ ! -z "$suffix2" ] && [ -z "$suffix1" ]; then
-                return 0
-              fi
-
-              if [ -z "$suffix2" ] && [ ! -z "$suffix1" ]; then
-                return 1
-              fi
-          fi
-      fi
-    else
-      error_exit "Incorrect version format"
-    fi
-}
-
-download_artifacts() {
-  echo -n "Downloading Dasharo firmware..."
-  if [ -v BIOS_LINK_COMM ] && [ ${BIOS_LINK} == ${BIOS_LINK_COMM} ]; then
-    curl -s -L -f "$BIOS_LINK" -o $BIOS_UPDATE_FILE
-    error_check "Cannot access $FW_STORE_URL while downloading binary. Please
-   check your internet connection"
-    curl -s -L -f "$BIOS_HASH_LINK" -o $BIOS_HASH_FILE
-    error_check "Cannot access $FW_STORE_URL while downloading signature. Please
-   check your internet connection"
-    curl -s -L -f "$BIOS_SIGN_LINK" -o $BIOS_SIGN_FILE
-    error_check "Cannot access $FW_STORE_URL while downloading signature. Please
-   check your internet connection"
-    if [ "$HAVE_EC" == "true" ]; then
-      curl -s -L -f "$EC_LINK" -o "$EC_UPDATE_FILE"
-      error_check "Cannot access $FW_STORE_URL while downloading binary. Please
-     check your internet connection"
-      curl -s -L -f "$EC_HASH_LINK" -o $EC_HASH_FILE
-      error_check "Cannot access $FW_STORE_URL while downloading signature. Please
-     check your internet connection"
-      curl -s -L -f "$EC_SIGN_LINK" -o $EC_SIGN_FILE
-      error_check "Cannot access $FW_STORE_URL while downloading signature. Please
-     check your internet connection"
-    fi
-  else
-    USER_DETAILS="$CLOUDSEND_DOWNLOAD_URL:$CLOUDSEND_PASSWORD"
-    curl -s -L -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$BIOS_LINK" -o $BIOS_UPDATE_FILE
-    error_check "Cannot access $FW_STORE_URL_DES while downloading binary.
-   Please check your internet connection and credentials"
-    curl -s -L -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$BIOS_HASH_LINK" -o $BIOS_HASH_FILE
-    error_check "Cannot access $FW_STORE_URL_DES while downloading signature.
-   Please check your internet connection and credentials"
-    curl -s -L -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$BIOS_SIGN_LINK" -o $BIOS_SIGN_FILE
-    error_check "Cannot access $FW_STORE_URL_DES while downloading signature.
-   Please check your internet connection and credentials"
-    if [ "$HAVE_EC" == "true" ]; then
-      if [ -v EC_LINK_COMM ] && [ ${EC_LINK} == ${EC_LINK_COMM} ]; then
-        curl -s -L -f "$EC_LINK" -o "$EC_UPDATE_FILE"
-        error_check "Cannot access $FW_STORE_URL while downloading binary. Please
-          check your internet connection"
-        curl -s -L -f "$EC_HASH_LINK" -o $EC_HASH_FILE
-        error_check "Cannot access $FW_STORE_URL while downloading signature. Please
-          check your internet connection"
-        curl -s -L -f "$EC_SIGN_LINK" -o $EC_SIGN_FILE
-        error_check "Cannot access $FW_STORE_URL while downloading signature. Please
-          check your internet connection"
-      else
-        curl -s -L -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$EC_LINK" -o $EC_UPDATE_FILE
-        error_check "Cannot access $FW_STORE_URL while downloading binary. Please
-          check your internet connection and credentials"
-        curl -s -L -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$EC_HASH_LINK" -o $EC_HASH_FILE
-        error_check "Cannot access $FW_STORE_URL while downloading signature. Please
-          check your internet connection and credentials"
-        curl -s -L -f -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$EC_SIGN_LINK" -o $EC_SIGN_FILE
-        error_check "Cannot access $FW_STORE_URL while downloading signature. Please
-          check your internet connection and credentials"
-     fi
-    fi
-  fi
-  print_green "Done"
-}
-
-download_keys() {
-  mkdir $KEYS_DIR
-  wget -O $KEYS_DIR/recovery_key.vbpubk https://github.com/Dasharo/vboot/raw/dasharo/tests/devkeys/recovery_key.vbpubk >> $ERR_LOG_FILE 2>&1
-  wget -O $KEYS_DIR/firmware.keyblock https://github.com/Dasharo/vboot/raw/dasharo/tests/devkeys/firmware.keyblock >> $ERR_LOG_FILE 2>&1
-  wget -O $KEYS_DIR/firmware_data_key.vbprivk https://github.com/Dasharo/vboot/raw/dasharo/tests/devkeys/firmware_data_key.vbprivk >> $ERR_LOG_FILE 2>&1
-  wget -O $KEYS_DIR/kernel_subkey.vbpubk https://github.com/Dasharo/vboot/raw/dasharo/tests/devkeys/kernel_subkey.vbpubk >> $ERR_LOG_FILE 2>&1
-  wget -O $KEYS_DIR/root_key.vbpubk https://github.com/Dasharo/vboot/raw/dasharo/tests/devkeys/root_key.vbpubk >> $ERR_LOG_FILE 2>&1
-}
-
-get_signing_keys() {
-    local platform_keys=$PLATFORM_SIGN_KEY
-    echo -n "Getting platform specific GPG key... "
-    for key in $platform_keys; do
-        wget -q https://raw.githubusercontent.com/3mdeb/3mdeb-secpack/master/$key -O - | gpg --import - >> $ERR_LOG_FILE 2>&1
-        error_check "Cannot get $key key to verify signatures."
-    done
-    print_green "Done"
-}
-
-verify_artifacts() {
-  local _type="$1"
-  local _update_file=""
-  local _hash_file=""
-  local _sign_file=""
-  local _name=""
-  local _sig_result=""
-
-  case ${_type} in
-    ec)
-    _update_file=$EC_UPDATE_FILE
-    _hash_file=$EC_HASH_FILE
-    _sign_file=$EC_SIGN_FILE
-    _name="Dasharo EC"
-    ;;
-    bios)
-    _update_file=$BIOS_UPDATE_FILE
-    _hash_file=$BIOS_HASH_FILE
-    _sign_file=$BIOS_SIGN_FILE
-    _name="Dasharo"
-    ;;
-    *)
-    ;;
-  esac
-  echo -n "Checking $_name firmware checksum... "
-  sha256sum --check <(echo $(cat $_hash_file | cut -d ' ' -f 1) $_update_file) >> $ERR_LOG_FILE 2>&1
-  error_check "Failed to verify $_name firmware checksum"
-  print_green "Verified."
-  if [ -v PLATFORM_SIGN_KEY ]; then
-    echo -n "Checking $_name firmware signature... "
-    _sig_result="$(cat $_hash_file | gpg --verify $_sign_file - >> $ERR_LOG_FILE 2>&1)"
-    error_check "Failed to verify $_name firmware signature.$'\n'$_sig_result"
-    print_green "Verified."
-  fi
-  echo "$_sig_result"
-}
-
-check_intel_regions() {
-
-  FLASH_REGIONS=$($FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} 2>&1)
-  BOARD_HAS_FD_REGION=0
-  BOARD_FD_REGION_RW=0
-  BOARD_HAS_ME_REGION=0
-  BOARD_ME_REGION_RW=0
-  BOARD_ME_REGION_LOCKED=0
-  BOARD_HAS_GBE_REGION=0
-  BOARD_GBE_REGION_RW=0
-  BOARD_GBE_REGION_LOCKED=0
-
-  grep -q "Flash Descriptor region" <<< "$FLASH_REGIONS" && BOARD_HAS_FD_REGION=1
-  grep -qE "Flash Descriptor region.*read-write" <<< "$FLASH_REGIONS" && BOARD_FD_REGION_RW=1
-
-  grep -q "Management Engine region" <<< "$FLASH_REGIONS" && BOARD_HAS_ME_REGION=1
-  grep -qE "Management Engine region.*read-write" <<< "$FLASH_REGIONS" && BOARD_ME_REGION_RW=1
-  grep -qE "Management Engine region.*locked" <<<  "$FLASH_REGIONS" && BOARD_ME_REGION_LOCKED=1
-
-  grep -q "Gigabit Ethernet region" <<<  "$FLASH_REGIONS" && BOARD_HAS_GBE_REGION=1
-  grep -qE "Gigabit Ethernet region.*read-write" <<<  "$FLASH_REGIONS" && BOARD_GBE_REGION_RW=1
-  grep -qE "Gigabit Ethernet region.*locked" <<< "$FLASH_REGIONS" && BOARD_GBE_REGION_LOCKED=1
-}
-
-check_blobs_in_binary() {
-  BINARY_HAS_FD=0
-  BINARY_HAS_ME=0
-
-  # If there is no descriptor, there is no ME as well, so skip the check
-  if [ $BOARD_HAS_FD_REGION -ne 0 ]; then
-    ME_OFFSET=$(ifdtool -d $1 2> /dev/null | grep "Flash Region 2 (Intel ME):" | sed 's/Flash Region 2 (Intel ME)\://' |awk '{print $1;}')
-    # Check for IFD signature at offset 0 (old descriptors)
-    if [ $(tail -c +0 $1|head -c 4|xxd -ps) == "5aa5f00f" ]; then
-      BINARY_HAS_FD=1
-    fi
-    # Check for IFD signature at offset 16 (new descriptors)
-    if [ $(tail -c +17 $1|head -c 4|xxd -ps) == "5aa5f00f" ]; then
-      BINARY_HAS_FD=1
-    fi
-    # Check for ME FPT signature at ME offset + 16 (old ME)
-    if [ $(tail -c +$((0x$ME_OFFSET + 17)) $1|head -c 4|tr -d '\0') == "\$FPT" ]; then
-      BINARY_HAS_ME=1
-    fi
-    # Check for aa55 signature at ME offset + 4096 (new ME)
-    if [ $(tail -c +$((0x$ME_OFFSET + 4097)) $1|head -c 2|xxd -ps) == "aa55" ]; then
-      BINARY_HAS_ME=1
-    fi
-  fi
-}
-
-check_if_me_disabled() {
-
-  ME_DISABLED=0
-
-  if [ $BOARD_HAS_ME_REGION -eq 0 ]; then
-    # No ME region
-    ME_DISABLED=1
-    return
-  fi
-
-  # Check if HECI present
-  # FIXME: what if HECI is not device 16.0?
-  if [ -d /sys/class/pci_bus/0000:00/device/0000:00:16.0 ]; then
-    # Check ME Current Operation Mode at offset 0x40 bits 19:16
-    ME_OPMODE="$(setpci -s 00:16.0 42.B 2> /dev/null | cut -c2-)"
-    if [ $ME_OPMODE == "0" ]; then
-      echo "ME is not disabled"  >> $ERR_LOG_FILE
-      return
-    elif [ $ME_OPMODE == "2" ]; then
-      echo "ME is disabled (HAP/Debug Mode)"  >> $ERR_LOG_FILE
-      ME_DISABLED=1
-      return
-    elif [ $ME_OPMODE == "3" ]; then
-      echo "ME is soft disabled (HECI)"  >> $ERR_LOG_FILE
-      ME_DISABLED=1
-      return
-    elif [ $ME_OPMODE == "4" ]; then
-      echo "ME disabled by Security Override Jumper/FDOPS"  >> $ERR_LOG_FILE
-      ME_DISABLED=1
-      return
-    elif [ $ME_OPMODE == "5" ]; then
-      echo "ME disabled by Security Override MEI Message/HMRFPO"  >> $ERR_LOG_FILE
-      ME_DISABLED=1
-      return
-    elif [ $ME_OPMODE == "6" ]; then
-      echo "ME disabled by Security Override MEI Message/HMRFPO"  >> $ERR_LOG_FILE
-      ME_DISABLED=1
-      return
-    elif [ $ME_OPMODE == "7" ]; then
-      echo "ME disabled (Enhanced Debug Mode) or runs Ignition FW"  >> $ERR_LOG_FILE
-      ME_DISABLED=1
-      return
-    else
-      print_warning "Unknown ME operation mode, assuming enabled."
-      echo "Unknown ME operation mode, assuming enabled."  >> $ERR_LOG_FILE
-      return
-    fi
-  else
-    # If we are running coreboot, check for status in logs
-    cbmem -1 | grep -q "ME is disabled" && ME_DISABLED=1 && return # HECI (soft) disabled
-    cbmem -1 | grep -q "ME is HAP disabled" && ME_DISABLED=1 && return # HAP disabled
-    # TODO: If proprietary BIOS, then also try to check SMBIOS for ME FWSTS
-    # BTW we could do the same in coreboot, expose FWSTS in SMBIOS before it
-    # gets disabled
-    print_warning "Can not determine if ME is disabled, assuming enabled."
-    echo "Can not determine if ME is disabled, assuming enabled."  >> $ERR_LOG_FILE
-  fi
-}
-
-force_me_update() {
-    echo
-    print_warning "Flashing ME when not in disabled state may cause unexpected power management issues."
-    print_warning "Recovering from such state may require removal of AC power supply and resetting CMOS battery."
-    print_warning "Keeping an older version of ME may cause a CPU to perform less efficient, e.g. if upgraded the CPU to a newer generation."
-    print_warning "You have been warned."
-  while : ; do
-    echo
-    read -r -p "Skip ME flashing and proceed with BIOS/firmware flashing/udpating? (Y|n) " OPTION
-    echo
-
-    case ${OPTION} in
-      yes|y|Y|Yes|YES)
-        print_warning "Proceeding without ME flashing, because we were asked to."
-        break
-        ;;
-      n|N)
-        error_exit "Cancelling flashing process..."
-        ;;
-      *)
-        ;;
-    esac
-  done
-}
-
-set_flashrom_update_params() {
-  # Safe defaults which should always work
-  if [ $BOARD_HAS_FD_REGION -eq 0 ]; then
-    FLASHROM_ADD_OPT_UPDATE=""
-  else
-    FLASHROM_ADD_OPT_UPDATE="-N --ifd -i bios"
-  fi
-  BINARY_HAS_RW_B=1
-  # We need to read whole binary (or BIOS region), otherwise cbfstool will
-  # return different attributes for CBFS regions
-  echo "Checking flash layout."
-  $FLASHROM -p "$PROGRAMMER_BIOS" ${FLASH_CHIP_SELECT} ${FLASHROM_ADD_OPT_UPDATE} -r /tmp/bios.bin > /dev/null 2>&1
-  if [ $? -eq 0 ] && [ -f "/tmp/bios.bin" ]; then
-    BOARD_FMAP_LAYOUT=$(cbfstool /tmp/bios.bin layout -w 2> /dev/null)
-    BINARY_FMAP_LAYOUT=$(cbfstool $1 layout -w 2> /dev/null)
-    diff <(echo "$BOARD_FMAP_LAYOUT") <(echo "$BINARY_FMAP_LAYOUT") > /dev/null 2>&1
-    # If layout is identical, perform standard update using FMAP only
-    if [ $? -eq 0 ]; then
-      # Simply update RW_A fmap region if exists
-      grep -q "RW_SECTION_A" <<< $BINARY_FMAP_LAYOUT
-      if [ $? -eq 0 ]; then
-        FLASHROM_ADD_OPT_UPDATE="-N --fmap -i RW_SECTION_A"
-      else
-        # RW_A does not exists, it means no vboot. Update COREBOOT region only
-        FLASHROM_ADD_OPT_UPDATE="-N --fmap -i COREBOOT"
-      fi
-      # If RW_B present, use this variable later to perform 2-step update
-      grep -q "RW_SECTION_B" <<< $BINARY_FMAP_LAYOUT && BINARY_HAS_RW_B=0
-    fi
-  else
-    print_warning "Could not read the FMAP region"
-    echo "Could not read the FMAP region" >> $ERR_LOG_FILE
-  fi
-}
-
-set_intel_regions_update_params() {
-  if [ $BOARD_HAS_FD_REGION -eq 0 ]; then
-    # No FD on board, so no further flashing
-    FLASHROM_ADD_OPT_REGIONS=""
-  else
-    # Safe defaults, only BIOS region and do not verify all regions,
-    # as some of them may not be readable. First argument is the initial
-    # params.
-    FLASHROM_ADD_OPT_REGIONS=$1
-
-    if [ $BINARY_HAS_FD -ne 0 ]; then
-      if [ $BOARD_FD_REGION_RW -ne 0 ]; then
-        # FD writable and the binary provides FD, safe to flash
-        FLASHROM_ADD_OPT_REGIONS+=" -i fd"
-      else
-        print_error "The firmware binary to be flashed contains Flash Descriptor (FD), but FD is not writable!"
-        print_warning "Proceeding without FD flashing, as it is not critical."
-        echo "The firmware binary contains Flash Descriptor (FD), but FD is not writable!"  >> $ERR_LOG_FILE
-      fi
-    fi
-
-    if [ $BINARY_HAS_ME -ne 0 ]; then
-      if [ $BOARD_ME_REGION_RW -ne 0 ]; then
-        # ME writable and the binary provides ME, safe to flash if ME disabled
-        if [ $ME_DISABLED -eq 1 ]; then
-          FLASHROM_ADD_OPT_REGIONS+=" -i me"
-        else
-          echo "The firmware binary to be flashed contains Management Engine (ME), but ME is not disabled!"  >> $ERR_LOG_FILE
-          print_error "The firmware binary contains Management Engine (ME), but ME is not disabled!"
-          force_me_update
-        fi
-      else
-        echo "The firmware binary to be flashed contains Management Engine (ME), but ME is not writable!"  >> $ERR_LOG_FILE
-        print_error "The firmware binary contains Management Engine (ME), but ME is not writable!"
-      fi
-    fi
-  fi
-}
-
-handle_fw_switching() {
-  local _can_switch_to_heads=$1
-
-  if [ "$_can_switch_to_heads" == "true" ] && [ "$DASHARO_FLAVOR" != "Dasharo (coreboot+heads)" ]; then
-    while : ; do
-      echo
-      read -r -p "Would you like to switch to Dasharo heads firmware? (Y|n) " OPTION
-      echo
-
-      case ${OPTION} in
-        yes|y|Y|Yes|YES)
-          UPDATE_VERSION=$HEADS_REL_VER_DES
-          FLASHROM_ADD_OPT_UPDATE_OVERRIDE=$HEADS_SWITCH_FLASHROM_OPT_OVERRIDE
-          BIOS_HASH_LINK="${HEADS_LINK_DES}.sha256"
-          BIOS_SIGN_LINK="${HEADS_LINK_DES}.sha256.sig"
-          BIOS_LINK=$HEADS_LINK_DES
-          export SWITCHING_TO="heads"
-          echo
-          echo "Switching to Dasharo heads firmware v$UPDATE_VERSION"
-          break
-          ;;
-        n|N)
-          compare_versions $DASHARO_VERSION $UPDATE_VERSION
-          if [ $? -ne 1 ]; then
-            error_exit "No update available for your machine"
-          fi
-          echo "Will not install Dasharo heads firmware. Proceeding with regular Dasharo firmware update."
-          break
-          ;;
-        *)
-          ;;
-      esac
-    done
-  elif [ -v DES_IS_LOGGED ] && [ -v HEADS_LINK_DES ]; then
-    local _heads_des=1
-    curl -sfI -u "$USER_DETAILS" -H "$CLOUD_REQUEST" "$HEADS_LINK_DES" -o /dev/null
-    _heads_des=$?
-    # We are on heads, offer switch back or perform update if DES gives access to heads
-    if [ "$DASHARO_FLAVOR" == "Dasharo (coreboot+heads)" ]; then
-      while : ; do
-        echo
-        print_warning 'If you are running heads firmware variant and want to update, say "n" here.'
-        print_warning 'You will be asked for heads udpate confirmation in a moment.'
-        print_warning 'Say "Y" only if you want to migrate from heads to UEFI firmware variant.'
-        read -r -p "Would you like to switch back to the regular (UEFI) Dasharo firmware variant? (Y|n) " OPTION
-        echo
-
-        case ${OPTION} in
-          yes|y|Y|Yes|YES)
-            echo
-            echo "Switching back to regular Dasharo firmware v$UPDATE_VERSION"
-            echo
-            FLASHROM_ADD_OPT_UPDATE_OVERRIDE=$HEADS_SWITCH_FLASHROM_OPT_OVERRIDE
-            export SWITCHING_TO="uefi"
-            break
-            ;;
-          n|N)
-            if [ $_heads_des -ne 0 ]; then
-              error_exit "No update available for your machine"
-            fi
-            UPDATE_VERSION=$HEADS_REL_VER_DES
-            compare_versions $DASHARO_VERSION $UPDATE_VERSION
-            if [ $? -ne 1 ]; then
-              error_exit "No update available for your machine"
-            fi
-            echo "Will not switch back to regular Dasharo firmware. Proceeding with Dasharo heads firmware update to $UPDATE_VERSION."
-            FLASHROM_ADD_OPT_UPDATE_OVERRIDE="--ifd -i bios"
-            BIOS_HASH_LINK="${HEADS_LINK_DES}.sha256"
-            BIOS_SIGN_LINK="${HEADS_LINK_DES}.sha256.sig"
-            BIOS_LINK=$HEADS_LINK_DES
-            break
-            ;;
-          *)
-            ;;
-        esac
-      done
-    fi
-  elif [ ! -v DES_IS_LOGGED ] && [ "$DASHARO_FLAVOR" == "Dasharo (coreboot+heads)" ]; then
-    # Not logged with DES and we are on heads, offer switch back
-    compare_versions $DASHARO_VERSION $HEADS_REL_VER_DES
-    if [ $? -eq 1 ]; then
-      print_warning "You are running heads firmware, but did not provide DES credentials."
-      print_warning "There are updates available if you provide DES credentials in main DTS menu."
-    fi
-    echo
-    echo "Latest available Dasharo version: $HEADS_REL_VER_DES"
-    echo
-    while : ; do
-      echo
-      read -r -p "Would you like to switch back to the regular Dasharo firmware? (Y|n) " OPTION
-      echo
-
-      case ${OPTION} in
-        yes|y|Y|Yes|YES)
-          echo
-          echo "Switching back to regular Dasharo firmware v$UPDATE_VERSION"
-          echo
-          FLASHROM_ADD_OPT_UPDATE_OVERRIDE=$HEADS_SWITCH_FLASHROM_OPT_OVERRIDE
-          export SWITCHING_TO="uefi"
-          break
-          ;;
-        n|N)
-          print_warning "No update currently possible. Aborting update process..."
-          exit 0
-          break;
-          ;;
-        *)
-          ;;
-      esac
-    done
-  else
-    compare_versions $DASHARO_VERSION $UPDATE_VERSION
-    if [ $? -ne 1 ]; then
-      error_exit "No update available for your machine"
-    fi
-  fi
-}

From d8fb69ba413621ae95bc6d9479af8b7f4d2f4039 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Mon, 10 Jun 2024 15:46:48 +0200
Subject: [PATCH 44/99] recipes-support/cloudsend: Fetch script from git and
 add `--fail-with-body` flag

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 ...cloudsend.sh-Add-fail-with-body-flag.patch |  31 +
 .../cloudsend/cloudsend/cloudsend.sh          | 627 ------------------
 .../{cloudsend_local.bb => cloudsend_git.bb}  |  11 +-
 3 files changed, 38 insertions(+), 631 deletions(-)
 create mode 100644 meta-dts-distro/recipes-support/cloudsend/cloudsend/0001-cloudsend.sh-Add-fail-with-body-flag.patch
 delete mode 100644 meta-dts-distro/recipes-support/cloudsend/cloudsend/cloudsend.sh
 rename meta-dts-distro/recipes-support/cloudsend/{cloudsend_local.bb => cloudsend_git.bb} (65%)

diff --git a/meta-dts-distro/recipes-support/cloudsend/cloudsend/0001-cloudsend.sh-Add-fail-with-body-flag.patch b/meta-dts-distro/recipes-support/cloudsend/cloudsend/0001-cloudsend.sh-Add-fail-with-body-flag.patch
new file mode 100644
index 00000000..f2eb967f
--- /dev/null
+++ b/meta-dts-distro/recipes-support/cloudsend/cloudsend/0001-cloudsend.sh-Add-fail-with-body-flag.patch
@@ -0,0 +1,31 @@
+From 43d010459e8266daaf868a27a63799b3d09ea9d7 Mon Sep 17 00:00:00 2001
+From: Pawel Langowski <pawel.langowski@3mdeb.com>
+Date: Tue, 11 Jun 2024 11:53:42 +0200
+Subject: [PATCH] cloudsend.sh: Add --fail-with-body flag
+
+From curl man page:
+In normal cases when an HTTP server fails to deliver a document, it returns an
+HTML document stating so (which often also describes why and more). This flag
+will still allow curl to output and save that  content but also to return error
+22.
+
+Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
+---
+ cloudsend.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cloudsend.sh b/cloudsend.sh
+index 71892acd1cbb..644b2114a460 100755
+--- a/cloudsend.sh
++++ b/cloudsend.sh
+@@ -658,7 +658,7 @@ sendFile() {
+         # Send file
+         #echo "$CURLBIN"$INSECURE$VERBOSE -T \""$1"\" -u \""$FOLDERTOKEN":"$PASSWORD"\" -H \""$HEADER"\" \""$CLOUDURL/$PUBSUFFIX$INNERPATH/$eout"\"
+         #"$CURLBIN"$LIMITCMD$INSECURE$VERBOSE$GLOBCMD -T "$1" -u "$FOLDERTOKEN":"$PASSWORD" -H "$HEADER" "$CLOUDURL/$PUBSUFFIX$INNERPATH/$eout" | cat ; test ${PIPESTATUS[0]} -eq 0
+-        resp="$("$CURLBIN"$LIMITCMD$INSECURE$VERBOSE$GLOBCMD -T "$1" -u "$FOLDERTOKEN":"$PASSWORD" -H "$HEADER" "$CLOUDURL/$PUBSUFFIX$INNERPATH/$eout")"
++        resp="$("$CURLBIN"$LIMITCMD$INSECURE$VERBOSE$GLOBCMD --fail-with-body -T "$1" -u "$FOLDERTOKEN":"$PASSWORD" -H "$HEADER" "$CLOUDURL/$PUBSUFFIX$INNERPATH/$eout")"
+         stat=$?
+         curlAddResponse "$resp" "Send File: \"$eout\""
+         curlAddExitCode $stat
+--
+2.45.0
diff --git a/meta-dts-distro/recipes-support/cloudsend/cloudsend/cloudsend.sh b/meta-dts-distro/recipes-support/cloudsend/cloudsend/cloudsend.sh
deleted file mode 100644
index f9376c4b..00000000
--- a/meta-dts-distro/recipes-support/cloudsend/cloudsend/cloudsend.sh
+++ /dev/null
@@ -1,627 +0,0 @@
-#!/usr/bin/env bash
-
-############################################################
-#
-# Tavinus Cloud Sender 2
-# cloudsend.sh
-# https://github.com/tavinus/cloudsend.sh
-#
-# Uses curl to send files to a shared
-# Nextcloud/Owncloud folder
-#
-# Usage: ./cloudsend.sh <file> <folderLink>
-# Help:  ./cloudsend.sh -h
-#
-# Gustavo Arnosti Neves
-# https://github.com/tavinus
-#
-# Contributors:
-# @MG2R @gessel
-#
-# Get this script to current folder with:
-# curl -O 'https://raw.githubusercontent.com/tavinus/cloudsend.sh/master/cloudsend.sh' && chmod +x cloudsend.sh
-#
-# NOTE: Cloudsend 2 changed the way password is handled and
-# is NOT compatible with cloudsend 1 calls. The -e parameter
-# now does what -p parameter did (environment passwords),
-# while the -p parameter receives the password directly.
-#
-############################################################
-
-
-
-
-
-CS_VERSION="2.2.1"
-
-TRUE=0
-FALSE=1
-
-CLOUDURL=""
-FOLDERTOKEN=""
-
-PUBSUFFIX="public.php/webdav"
-HEADER='X-Requested-With: XMLHttpRequest'
-
-CLOUDSEND_PARAMS=()
-INSECURE=''
-OUTFILE=''
-
-RENAMING=$FALSE
-QUIETMODE=$FALSE
-GLOBBING=$FALSE
-GLOBCMD=' -g'
-VERBOSE=' --progress-bar'
-
-STTYBIN="$(command -v stty 2>/dev/null)"
-BASENAMEBIN="$(command -v basename 2>/dev/null)"
-FINDBIN="$(command -v find 2>/dev/null)"
-SCREENSIZE="40  80"
-
-DIRLIST=()
-FILELIST=()
-
-CURLEXIT=0
-
-
-
-
-
-################################################################
-#### CURL CALL EXAMPLE
-
-# https://cloud.mydomain.net/s/fLDzToZF4MLvG28
-# curl -k -T myFile.ext -u "fLDzToZF4MLvG28:" -H 'X-Requested-With: XMLHttpRequest' https://cloud.mydomain.net/public.php/webdav/myFile.ext
-
-
-
-
-
-################################################################
-#### MESSAGES
-################################################################
-
-
-# Logs message to stdout
-log() {
-	isQuietMode || printf "%s\n" "$@"
-}
-
-
-# Logs message to stdout
-logSameLine() {
-	isQuietMode || printf "%s" "$@"
-}
-
-
-# Prints program name and version
-printVersion() {
-        printf "%s\n" "Tavinus Cloud Sender v$CS_VERSION"
-}
-
-
-# Prints error messages and exits
-initError() {
-        printVersion >&2
-        printf "%s\n" "Init Error! $1" >&2
-        printf "%s\n" "Try: $0 --help" >&2
-        exit 5
-}
-
-
-# Curl summed exit codes
-# Will be 0 if no curl call had errors
-curlAddExitCode() {
-        ((CURLEXIT=CURLEXIT+$1))
-}
-
-
-# Prints usage information (help)
-usage() {
-        printVersion
-        printf "%s" "
-Parameters:
-  -h | --help              Print this help and exits
-  -q | --quiet             Disables verbose messages
-  -V | --version           Prints version and exits
-  -r | --rename <file.xxx> Change the destination file name
-  -g | --glob              Disable input file checking to use curl globs
-  -k | --insecure          Uses curl with -k option (https insecure)
-  -p | --password <pass>   Uses <pass> as shared folder password
-  -e | --envpass           Uses env var \$CLOUDSEND_PASSWORD as share password
-                           You can 'export CLOUDSEND_PASSWORD' at your system, or set it at the call
-                           Please remeber to also call -e to use the password set
-
-Use:
-  ./cloudsend.sh [options] <inputPath> <folderLink>
-  CLOUDSEND_PASSWORD='MySecretPass' ./cloudsend.sh -e [options] <inputPath> <folderLink>
-
-Passwords:
-  Cloudsend 2 changed the way password works
-  Cloudsend 0.x.x used the '-p' parameter for the Environment password (changed to -e in v2+)
-  Please use EITHER -e OR -p, but not both. The last to be called will be used
-
-    Env Pass > Set the variable CLOUDSEND_PASSWORD='MySecretPass' and use the option '-e'
-  Param Pass > Send the password as a parameter with '-p <password>'
-
-Folders:
-  Cloudsend 2.2.0 introduces folder tree sending. Just use a directory as <inputPath>.
-  It will traverse all files and folders, create the needed folders and send all files.
-  Each folder creation and file sending will require a curl call.
-
-Input Globbing:
-  You can use input globbing (wildcards) by setting the -g option
-  This will ignore input file checking and pass the glob to curl to be used
-  You MUST NOT rename files when globbing, input file names will be used
-  You MUST NOT send folders when globbing, only files are allowed
-  Glob examples: '{file1.txt,file2.txt,file3.txt}'
-                 'img[1-100].png'
-
-Send from stdin (pipe):
-  You can send piped content by using - or . as the input file name (curl specs)
-  You MUST set a destination file name to use stdin as input (-r <name>)
-
-  Use the file name '-' (a single dash) to use stdin instead of a given file
-  Alternately, the file name '.' (a single period) may be specified instead of '-' to use
-  stdin in non-blocking mode to allow reading server output while stdin is being uploaded
-
-Examples:
-  CLOUDSEND_PASSWORD='MySecretPass' ./cloudsend.sh -e './myfile.txt' 'https://cloud.mydomain.net/s/fLDzToZF4MLvG28'
-  ./cloudsend.sh './myfile.txt' 'https://cloud.mydomain.net/s/fLDzToZF4MLvG28'
-  ./cloudsend.sh 'my Folder' 'https://cloud.mydomain.net/s/fLDzToZF4MLvG28'
-  ./cloudsend.sh -r 'RenamedFile.txt' './myfile.txt' 'https://cloud.mydomain.net/s/fLDzToZF4MLvG28'
-  ./cloudsend.sh -p 'MySecretPass' './myfile.txt' 'https://cloud.mydomain.net/s/fLDzToZF4MLvG28'
-  ./cloudsend.sh -p 'MySecretPass' -r 'RenamedFile.txt' './myfile.txt' 'https://cloud.mydomain.net/s/fLDzToZF4MLvG28'
-  ./cloudsend.sh -g -p 'MySecretPass' '{file1,file2,file3}' 'https://cloud.mydomain.net/s/fLDzToZF4MLvG28'
-  cat file | ./cloudsend.sh - 'https://cloud.mydomain.net/s/fLDzToZF4MLvG28' -r destFileName
-
-"
-}
-
-
-
-
-
-################################################################
-#### GET OPTIONS
-################################################################
-
-
-# Checks only for quiet/verbose mode and ignores all else
-parseQuietMode(){
-        while :; do
-                case "$1" in
-                        -h|--help)
-                                usage ; exit 0 ;;
-                        -V|--version)
-                                printVersion ; exit 0 ;;
-                        -q|--quiet)
-                                QUIETMODE=$TRUE
-                                VERBOSE=" -s" ; break ;;
-                        *)
-                                isEmpty "$1" && break || shift ;;
-                esac
-        done
-
-}
-
-
-# Parses CLI options and parameters
-parseOptions() {
-        log "Tavinus Cloud Sender v$CS_VERSION"$'\n'
-        while :; do
-                case "$1" in
-                        -q|--quiet)
-                                shift ;; # already checked
-                        -k|--insecure)
-                                INSECURE=' -k'
-                                log "> Insecure mode ON"
-                                shift ;;
-                        -e|--envpass|--environment)
-                                loadPassword "${CLOUDSEND_PASSWORD}"
-                                log "> Using password from environment"
-                                shift ;;
-                        -p|--password)
-                                loadPassword "$2"
-                                log "> Using password from parameter"
-                                shift ; shift ;;
-                        -r|--rename)
-                                loadOutFile "${2}"
-                                log "> Destination file will be renamed to \"$OUTFILE\""
-                                RENAMING=$TRUE
-                                shift ; shift ;;
-                        -g|--glob)
-                                GLOBBING=$TRUE
-                                GLOBCMD=''
-                                log "> Glob mode on, input file checkings disabled"
-                                shift ;;
-                        *)
-                                if isEmpty "$1"; then
-                                        break ;
-                                else
-                                        CLOUDSEND_PARAMS=("${CLOUDSEND_PARAMS[@]}" "$1")
-                                        shift ;
-                                fi
-
-                esac
-        done
-
-        CLOUDURL=''
-        FILENAME="${CLOUDSEND_PARAMS[0]}"
-        CLOUDSHARE="${CLOUDSEND_PARAMS[1]}"
-
-        # if we have index.php in the URL, process accordingly
-        if [[ "$CLOUDSHARE" == *"index.php"* ]]; then
-                CLOUDURL="${CLOUDSHARE%/index.php/s/*}"
-        else
-                CLOUDURL="${CLOUDSHARE%/s/*}"
-        fi
-
-        FOLDERTOKEN="${CLOUDSHARE##*/s/}"
-
-        if isGlobbing; then
-                if isRenaming; then
-                        initError $'Cannot rename output files when using globbing on input.\nAll files would get the same output name and then be overwritten.\nSend individual files if you need renaming.'
-                elif isPiped "$FILENAME"; then
-                        initError $'Cannot use globbing and send piped input at the same time.\nDo either one or the other.'
-                fi
-        else
-                if ! isFile "$FILENAME" && ! isDir "$FILENAME" && ! isPiped "$FILENAME"; then
-                        initError "Invalid input file/folder: $FILENAME"
-                fi
-
-                if isPiped "$FILENAME" && ! isRenaming; then
-                        initError $'No output file name!\nYou need to set a destination name when reading from a pipe!\nPlease add -r <filename.ext> to your call.'
-                fi
-        fi
-
-        if isEmpty "$CLOUDURL"; then
-                initError "Empty URL! Nowhere to send..."
-        fi
-
-        if isEmpty "$FOLDERTOKEN"; then
-                initError "Empty Folder Token! Nowhere to send..."
-        fi
-        log ''
-}
-
-
-# Parses password to var or exits
-loadPassword() {
-        if [ -z "$@" ]; then
-                initError "Trying to set an empty password"
-        fi
-        PASSWORD="$@"
-}
-
-
-# Parses destination file name to var or exits
-loadOutFile() {
-        if [ -z "$@" ]; then
-                initError "Trying to set an empty destination file name"
-        fi
-        OUTFILE="$@"
-}
-
-
-
-
-
-################################################################
-#### VALIDATORS
-################################################################
-
-
-# Dependency check
-checkCurl() {
-        CURLBIN="$(command -v curl 2>/dev/null)"
-        isExecutable "$CURLBIN" && return $TRUE
-        CURLBIN='/usr/bin/curl'
-        isExecutable "$CURLBIN" && return $TRUE
-        CURLBIN='/usr/local/bin/curl'
-        isExecutable "$CURLBIN" && return $TRUE
-        CURLBIN='/usr/share/curl'
-        isExecutable "$CURLBIN" && return $TRUE
-        initError "No curl found on system! Please install curl and try again!"
-        exit 6
-}
-
-
-# Adjust Columns so the progess bar shows correctly
-# Curl "space bar" has bugs that only show in special cases,
-# depending on the column size of the terminal. I had lots
-# of problems with this spanning multiple lines, so I fixed it
-# with a max of 80 columns if it is bigger (seems to solve).
-# https://github.com/curl/curl/issues/4849
-getScreenSize() {
-        if isExecutable "$STTYBIN"; then
-                SCREENSIZE="$($STTYBIN size)"
-        fi
-        #export LINES=${SCREENSIZE% *}
-        #export COLUMNS=$((${SCREENSIZE#* } - 1))
-        COLUMNS=${SCREENSIZE#* }
-        ((COLUMNS=COLUMNS-1))
-        [[ $COLUMNS -gt 80 ]] && COLUMNS=80
-        export COLUMNS
-        #export COLUMNS=50
-        #echo "LINES..: $LINES"
-        #echo "COLUMNS: $COLUMNS"
-}
-
-
-# Returns $TRUE if $1 is a file, $FALSE otherwise
-isFile() {
-        [[ -f "$1" ]] && return $TRUE
-        return $FALSE
-}
-
-
-# Returns $TRUE if $1 is a directory, $FALSE otherwise
-isDir() {
-        [[ -d "$1" ]] && return $TRUE
-        return $FALSE
-}
-
-
-# Returns $TRUE if $1 is executable, $FALSE otherwise
-isExecutable() {
-        [[ -x "$1" ]] && return $TRUE
-        return $FALSE
-}
-
-
-# Returns $TRUE if $1 is empty, $FALSE otherwise
-isEmpty() {
-        [[ -z "$1" ]] && return $TRUE
-        return $FALSE
-}
-
-
-# Returns $TRUE if $1 is not empty, $FALSE otherwise
-isNotEmpty() {
-        [[ -z "$1" ]] && return $FALSE
-        return $TRUE
-}
-
-
-# Checks if the input file is stdin (either - or .)
-isPiped() {
-        if [ "$1" = '-' ] || [ "$1" = '.' ] ; then
-                return $TRUE
-        fi
-        return $FALSE
-}
-
-
-
-
-
-################################################################
-#### FLAG CHECKERS
-################################################################
-
-
-# If we are renaming the output, return $TRUE, else $FALSE
-isRenaming() {
-        return $RENAMING
-}
-
-
-# If we are running in Quiet Mode, return $TRUE, else $FALSE
-isQuietMode() {
-        return $QUIETMODE
-}
-
-
-# If we are globbing the input, return $TRUE, else $FALSE
-isGlobbing() {
-        return $GLOBBING
-}
-
-
-
-
-
-################################################################
-#### HELPER FUNCTIONS
-
-
-# encode URL escaping
-rawUrlEncode() {
-        local string="${1}"
-        local strlen=${#string}
-        local encoded=""
-        local pos c o
-
-        for (( pos=0 ; pos<strlen ; pos++ )); do
-                c=${string:$pos:1}
-                case "$c" in
-                        [-_.~a-zA-Z0-9] ) o="${c}" ;;
-                        * )               printf -v o '%%%02x' "'$c"
-                esac
-                encoded+="${o}"
-        done
-        echo "${encoded}"    # You can either set a return variable (FASTER)
-        REPLY="${encoded}"   #+or echo the result (EASIER)... or both... :p
-}
-
-
-escapeWhitespaces() {
-        local string="${1}"
-        local strlen=${#string}
-        local encoded=""
-        local pos c o
-
-        for (( pos=0 ; pos<strlen ; pos++ )); do
-                c=${string:$pos:1}
-                case "$c" in
-                        " " ) o='%20' ;;
-                        * ) o="${c}" ;;
-                esac
-                encoded+="${o}"
-        done
-        echo "${encoded}"    # You can either set a return variable (FASTER)
-        REPLY="${encoded}"   #+or echo the result (EASIER)... or both... :p
-
-}
-
-
-
-
-
-################################################################
-#### RUNNERS
-################################################################
-
-
-# Create a directory with -X MKCOL
-# PROBABLY NEED TO ESCAPE WHITE SPACES OR ESCAPE ALL TO HTML CHARS
-createDir() {
-        isEmpty "$1" && initError 'Error! Cannot create folder with empty name.'
-        getScreenSize
-        logSameLine "$1 > "
-        eout="$(escapeWhitespaces "$1")"
-        #echo "$CURLBIN"$INSECURE --silent -X MKCOL -u "$FOLDERTOKEN":"$PASSWORD" -H "$HEADER" "$CLOUDURL/$PUBSUFFIX/$1"
-        #"$CURLBIN"$INSECURE --silent -X MKCOL -u "$FOLDERTOKEN":"$PASSWORD" -H "$HEADER" "$CLOUDURL/$PUBSUFFIX/$eout" | cat ; test ${PIPESTATUS[0]} -eq 0
-        cstat="$(createDirRun "$eout" 2>&1)"
-        #echo " -- $cstat"
-        if ! isEmpty "$cstat"; then
-                msg="$(echo "$cstat" | grep '<s:message>' | sed -e 's/<[^>]*>//g' -e 's/^[[:space:]]*//')"
-                isEmpty "$msg" && msg="$(echo "$cstat" | grep '<s:exception>' | sed -e 's/<[^>]*>//g' -e 's/^[[:space:]]*//')"
-                log "$msg"
-        else
-                log 'OK'
-        fi
-}
-
-
-# Create a directory with -X MKCOL
-createDirRun() {
-        "$CURLBIN"$INSECURE --silent -X MKCOL -u "$FOLDERTOKEN":"$PASSWORD" -H "$HEADER" "$CLOUDURL/$PUBSUFFIX/$1" | cat ; test ${PIPESTATUS[0]} -eq 0
-        ecode=$?
-        curlAddExitCode $ecode
-        return $ecode
-}
-
-
-# Traverse a folder and send its files and subfolders
-sendDir() {
-        isEmpty "$FILENAME" && initError 'Error! Cannot send folder with empty name.'
-        isDir "$FILENAME" || initError 'Error! sendFolder() > "'"$FILENAME"'" is not a Folder.'
-
-        # Load lists of folders and files to be sent
-        DIRLIST=()
-        FILELIST=()
-        readarray -t DIRLIST < <(find "$FILENAME" -type d -printf '%P\n')
-        readarray -t FILELIST < <(find "$FILENAME" -type f -printf '%P\n')
-        #echo '<<DIRLIST>>' ; echo "${DIRLIST[@]}" ; echo '<<FILELIST>>' ; echo "${FILELIST[@]}"
-
-        fbn="$("$BASENAMEBIN" "$FILENAME")"
-
-        # MacOS / BSD readlink does not have the -f option
-        # Get bash implementation from pdfScale.sh if needed
-        # For now PWD seems to be enough
-        if [[ "$fbn" == '.' ]]; then
-                fbn="$PWD"
-                fbn="$("$BASENAMEBIN" "$fbn")"
-        fi
-
-        log "CREATING FOLDER TREE AT DESTINATION"$'\n'"==================================="$'\n'
-
-        # Create main/root folder that is being sent
-        createDir "$fbn"
-
-        # Create whole directory tree at destination
-        for d in "${DIRLIST[@]}"; do
-                if ! isEmpty "$d"; then
-                        createDir "$fbn/$d"
-                fi
-        done
-
-        log $'\n'"SENDING ALL FILES FROM FOLDER TREE"$'\n'"=================================="$'\n'
-
-        # Send all files to their destinations
-        for f in "${FILELIST[@]}"; do
-                if ! isEmpty "$f"; then
-                        OUTFILE="$fbn/$f"
-                        log "$OUTFILE > "
-                        sendFile "$FILENAME/$f"
-                fi
-        done
-
-}
-
-
-# Logs succes or failure from curl
-logResult() {
-        #echo "LOGRESULT: $1"
-        local fileString="$("$BASENAMEBIN" "$FILENAME")"
-        isRenaming && fileString="$("$BASENAMEBIN" "$FILENAME") (renamed as $OUTFILE)"
-        log $'\n'"SUMMARY"$'\n'"======="$'\n'
-
-        if [ $CURLEXIT -eq 0 ]; then
-                log " > All Curl calls exited without errors"$'\n'" > Attempt to send completed > $fileString"
-                exit 0
-        fi
-        log " > Curl errors detected when sending > $fileString"$'\n'" > Summed Curl exit codes: $CURLEXIT"
-        exit $CURLEXIT
-}
-
-
-# Execute curl send
-sendFile() {
-        if isGlobbing; then
-                OUTFILE=''
-        elif isEmpty "$OUTFILE"; then # If we are not renaming, use the input file name
-                OUTFILE="$("$BASENAMEBIN" "$1")"
-        fi
-
-        getScreenSize
-        eout="$(escapeWhitespaces "$OUTFILE")"
-        # Send file
-        #echo "$CURLBIN"$INSECURE$VERBOSE -T "$1" -u "$FOLDERTOKEN":"$PASSWORD" -H "$HEADER" "$CLOUDURL/$PUBSUFFIX/$eout"
-        "$CURLBIN"$INSECURE$VERBOSE$GLOBCMD -f -T "$1" -u "$FOLDERTOKEN":"$PASSWORD" -H "$HEADER" "$CLOUDURL/$PUBSUFFIX/$eout" | cat ; test ${PIPESTATUS[0]} -eq 0
-        curlAddExitCode $?
-}
-
-
-# Send Files and Folders
-sendItems() {
-        if ! isGlobbing && isDir "$FILENAME"; then
-                sendDir
-        else
-                if isGlobbing; then
-                        log "SENDING CURL GLOB"$'\n'"================="$'\n'
-                        log "$FILENAME > "
-                else
-                        log "SENDING SINGLE FILE"$'\n'"==================="$'\n'
-                        log "$("$BASENAMEBIN" "$FILENAME") > "
-                fi
-                sendFile "$FILENAME"
-        fi
-}
-
-
-
-
-
-################################################################
-#### RUN #######################################################
-################################################################
-parseQuietMode "${@}"
-parseOptions "${@}"
-checkCurl
-sendItems
-logResult
-################################################################
-#### RUN #######################################################
-################################################################
-
-
-
-
-
-
-################################################################
-exit 88 ; # should never get here
-################################################################
diff --git a/meta-dts-distro/recipes-support/cloudsend/cloudsend_local.bb b/meta-dts-distro/recipes-support/cloudsend/cloudsend_git.bb
similarity index 65%
rename from meta-dts-distro/recipes-support/cloudsend/cloudsend_local.bb
rename to meta-dts-distro/recipes-support/cloudsend/cloudsend_git.bb
index 2818f3f5..89fe6b6b 100644
--- a/meta-dts-distro/recipes-support/cloudsend/cloudsend_local.bb
+++ b/meta-dts-distro/recipes-support/cloudsend/cloudsend_git.bb
@@ -6,11 +6,14 @@ LICENSE = "MIT"
 
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-# we need to use local version of cloudsend.sh script as original does not
-# properly check if the curl command ends with error (missing -f flag)
-SRC_URI = "file://cloudsend.sh"
+SRC_URI ="\
+    git://github.com/tavinus/cloudsend.sh.git;protocol=https;branch=master \
+    file://0001-cloudsend.sh-Add-fail-with-body-flag.patch \
+    "
 
-S = "${WORKDIR}"
+SRCREV = "65abbc6d809bcce13870dc5ea07937d324283173"
+
+S = "${WORKDIR}/git"
 
 RDEPENDS:${PN} = " \
   bash \

From bf7399c90e3c916f043f17969b913fa9cb859ddb Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Thu, 6 Jun 2024 16:43:42 +0200
Subject: [PATCH 45/99] Fix files so that pre-commit passes

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 .github/workflows/ci.yml                      |   1 +
 .github/workflows/develop.yml                 |   1 +
 .github/workflows/weekly.yml                  |   1 +
 .oelint-ruleset.json                          | 248 ++++++++++++++++++
 .pre-commit-config.yaml                       |  71 +++++
 .shellcheckrc                                 |   1 +
 CHANGELOG.md                                  |  10 +-
 kas-uefi-sb.yml                               |   1 +
 kas.yml                                       |   1 +
 kas/cache.yml                                 |   1 +
 kas/common.yml                                |   1 +
 .../coreboot-utils/cbfstool_git.bb            |   2 +
 .../recipes-bsp/coreboot-utils/cbmem_git.bb   |   8 +-
 .../coreboot-utils/coreboot-utils.inc         |   6 +-
 .../recipes-bsp/coreboot-utils/ectool_git.bb  |   8 +-
 .../recipes-bsp/coreboot-utils/futil_git.bb   |  28 +-
 .../recipes-bsp/coreboot-utils/ifdtool_git.bb |   8 +-
 .../coreboot-utils/intelmetool_git.bb         |   8 +-
 .../coreboot-utils/intelp2m_git.bb            |   9 +-
 .../coreboot-utils/inteltool_git.bb           |  11 +-
 .../recipes-bsp/coreboot-utils/msrtool_git.bb |   6 +-
 .../coreboot-utils/nvramtool_git.bb           |   8 +-
 .../coreboot-utils/superiotool_git.bb         |   8 +-
 .../recipes-bsp/flashrom/flashrom_git.bb      |  10 +-
 .../recipes-bsp/fwupd/fwupd-efi_1.2.bb        |  11 +-
 .../recipes-bsp/fwupd/fwupd_%.bbappend        |  10 +-
 .../recipes-bsp/fwupd/fwupd_2.0.1.bb          |  20 +-
 .../recipes-bsp/grub/grub-efi-efi-custom.inc  |  18 +-
 .../3mdeb-secpack/3mdeb-secpack.sh            |   1 -
 .../3mdeb-secpack/3mdeb-secpack_git.bb        |   8 +-
 .../dasharo-configuration-utility_git.bb      |   4 +-
 .../me-cleaner/me-cleaner_git.bb              |   4 +-
 .../python/python3-binwalk_2.3.3.bb           |   4 +-
 .../python/python3-uefi-firmware_1.9.bb       |   2 +-
 .../dts-scripts/dts-scripts_git.bb            |   8 +-
 .../recipes-dts/images/dts-base-image.inc     |   2 +-
 .../recipes-dts/images/dts-base-sb-image.bb   |   2 +
 .../hw-probe/hw-probe_1.6.5.bb                |   9 +-
 .../recipes-extended/sbctl/sbctl_0.13.bb      |   3 +-
 .../kernel/acpi-call-dkms_git.bb              |   4 +-
 .../cloudsend/cloudsend_git.bb                |  14 +-
 .../dasharo-ectool/dasharo-ectool_0.3.8.bb    |  28 +-
 .../recipes-support/iotools/iotools_git.bb    |  17 +-
 .../ipxe-commands/ipxe-commands_local.bb      |   2 +-
 ...{mei-amt-check.bb => mei-amt-check_git.bb} |  15 +-
 .../bg-suite_2.7.0.bb                         |   4 +-
 .../txt-suite_2.6.0.bb                        |   4 +-
 .../{dts-tests.bb => dts-tests_1.0.bb}        |   2 +
 scripts/get_last_commit.sh                    |   3 +
 scripts/local-ipxe-server.sh                  |   2 +-
 scripts/update_components.sh                  |   4 +-
 51 files changed, 520 insertions(+), 142 deletions(-)
 create mode 100644 .oelint-ruleset.json
 create mode 100644 .pre-commit-config.yaml
 create mode 100644 .shellcheckrc
 rename meta-dts-distro/recipes-support/mei-amt-check/{mei-amt-check.bb => mei-amt-check_git.bb} (67%)
 rename meta-dts-distro/recipes-tests/dts-tests/{dts-tests.bb => dts-tests_1.0.bb} (79%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c22dcffe..b9877003 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,3 +1,4 @@
+---
 name: CI on push tag
 on:
   push:
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index 52ff0eae..04e6dd1d 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -1,3 +1,4 @@
+---
 name: CI on push to develop
 on:
   push:
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 207cb881..333e6942 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -1,3 +1,4 @@
+---
 name: Weekly clean & rebuild
 on:
   schedule:
diff --git a/.oelint-ruleset.json b/.oelint-ruleset.json
new file mode 100644
index 00000000..1337cefa
--- /dev/null
+++ b/.oelint-ruleset.json
@@ -0,0 +1,248 @@
+{
+  "oelint.append.protvars": "error",
+  "oelint.append.protvars.PV": "error",
+  "oelint.append.protvars.PR": "error",
+  "oelint.append.protvars.SRCREV": "error",
+  "oelint.append.protvars.LICENSE": "error",
+  "oelint.append.protvars.LIC_FILES_CHKSUM": "error",
+  "oelint.exportfunction.dash": "error",
+  "oelint.bbclass.underscores": "error",
+  "oelint.file.includenotfound": "warning",
+  "oelint.file.requireinclude": "warning",
+  "oelint.file.inlinesuppress_na": "info",
+  "oelint.file.nospaces": "error",
+  "oelint.file.inactiveupstreamdetails": "info",
+  "oelint.file.inappropriatemsg": "info",
+  "oelint.file.patchsignedoff": "info",
+  "oelint.file.upstreamstatus": "info",
+  "oelint.file.includerelpath": "warning",
+  "oelint.file.requirenotfound": "error",
+  "oelint.file.underscores": "error",
+  "oelint.func.specific": "error",
+  "oelint.newline.consecutive": "warning",
+  "oelint.newline.eof": "warning",
+  "oelint.spaces.linebeginning": "warning",
+  "oelint.spaces.linecont": "error",
+  "oelint.spaces.emptyline": "warning",
+  "oelint.spaces.lineend": "warning",
+  "oelint.tabs.notabs": "warning",
+  "oelint.task.addnotaskbody": "warning",
+  "oelint.task.noanonpython": "warning",
+  "oelint.task.customorder": "error",
+  "oelint.task.dash": "error",
+  "oelint.task.docstrings": "info",
+  "oelint.task.heredocs": "warning",
+  "oelint.task.multifragments": "info",
+  "oelint.task.nocopy": "error",
+  "oelint.task.nomkdir": "error",
+  "oelint.task.nopythonprefix": "warning",
+  "oelint.task.order": "warning",
+  "oelint.task.order.do_fetch": "warning",
+  "oelint.task.order.do_unpack": "warning",
+  "oelint.task.order.do_patch": "warning",
+  "oelint.task.order.do_configure": "warning",
+  "oelint.task.order.do_compile": "warning",
+  "oelint.task.order.do_install": "warning",
+  "oelint.task.order.do_populate_sysroot": "warning",
+  "oelint.task.order.do_build": "warning",
+  "oelint.task.order.do_package": "warning",
+  "oelint.task.pythonprefix": "warning",
+  "oelint.var.addpylib": "error",
+  "oelint.vars.appendop": "error",
+  "oelint.vars.autorev": "warning",
+  "oelint.vars.bbvars": "warning",
+  "oelint.vars.bbvars.BB_CONSOLELOG": "warning",
+  "oelint.vars.bbvars.BB_CURRENTTASK": "warning",
+  "oelint.vars.bbvars.BB_DANGLINGAPPENDS_WARNONLY": "warning",
+  "oelint.vars.bbvars.BB_DEFAULT_TASK": "warning",
+  "oelint.vars.bbvars.BB_DISKMON_DIRS": "warning",
+  "oelint.vars.bbvars.BB_DISKMON_WARNINTERVAL": "warning",
+  "oelint.vars.bbvars.BB_ENV_EXTRAWHITE": "warning",
+  "oelint.vars.bbvars.BB_ENV_WHITELIST": "warning",
+  "oelint.vars.bbvars.BB_FETCH_PREMIRRORONLY": "warning",
+  "oelint.vars.bbvars.BB_FILENAME": "warning",
+  "oelint.vars.bbvars.BB_GENERATE_MIRROR_TARBALLS": "warning",
+  "oelint.vars.bbvars.BB_HASHBASE_WHITELIST": "warning",
+  "oelint.vars.bbvars.BB_HASHCHECK_FUNCTION": "warning",
+  "oelint.vars.bbvars.BB_HASHCONFIG_WHITELIST": "warning",
+  "oelint.vars.bbvars.BB_INVALIDCONF": "warning",
+  "oelint.vars.bbvars.BB_LOGFMT": "warning",
+  "oelint.vars.bbvars.BB_NICE_LEVEL": "warning",
+  "oelint.vars.bbvars.BB_NO_NETWORK": "warning",
+  "oelint.vars.bbvars.BB_NUMBER_PARSE_THREADS": "warning",
+  "oelint.vars.bbvars.BB_NUMBER_THREADS": "warning",
+  "oelint.vars.bbvars.BB_ORIGENV": "warning",
+  "oelint.vars.bbvars.BB_PRESERVE_ENV": "warning",
+  "oelint.vars.bbvars.BB_RUNFMT": "warning",
+  "oelint.vars.bbvars.BB_RUNTASK": "warning",
+  "oelint.vars.bbvars.BB_SCHEDULER": "warning",
+  "oelint.vars.bbvars.BB_SCHEDULERS": "warning",
+  "oelint.vars.bbvars.BB_SETSCENE_DEPVALID": "warning",
+  "oelint.vars.bbvars.BB_SETSCENE_VERIFY_FUNCTION": "warning",
+  "oelint.vars.bbvars.BB_SIGNATURE_EXCLUDE_FLAGS": "warning",
+  "oelint.vars.bbvars.BB_SIGNATURE_HANDLER": "warning",
+  "oelint.vars.bbvars.BB_SRCREV_POLICY": "warning",
+  "oelint.vars.bbvars.BB_STAMP_POLICY": "warning",
+  "oelint.vars.bbvars.BB_STAMP_WHITELIST": "warning",
+  "oelint.vars.bbvars.BB_STRICT_CHECKSUM": "warning",
+  "oelint.vars.bbvars.BB_TASK_NICE_LEVEL": "warning",
+  "oelint.vars.bbvars.BB_TASKHASH": "warning",
+  "oelint.vars.bbvars.BB_VERBOSE_LOGS": "warning",
+  "oelint.vars.bbvars.BB_WORKERCONTEXT": "warning",
+  "oelint.vars.bbvars.BBDEBUG": "warning",
+  "oelint.vars.bbvars.BBFILE_COLLECTIONS": "warning",
+  "oelint.vars.bbvars.BBFILE_PATTERN": "warning",
+  "oelint.vars.bbvars.BBFILE_PRIORITY": "warning",
+  "oelint.vars.bbvars.BBFILES": "warning",
+  "oelint.vars.bbvars.BBINCLUDED": "warning",
+  "oelint.vars.bbvars.BBINCLUDELOGS": "warning",
+  "oelint.vars.bbvars.BBINCLUDELOGS_LINES": "warning",
+  "oelint.vars.bbvars.BBLAYERS": "warning",
+  "oelint.vars.bbvars.BBMASK": "warning",
+  "oelint.vars.bbvars.BBPATH": "warning",
+  "oelint.vars.bbvars.BBSERVER": "warning",
+  "oelint.vars.bbvars.BBVERSIONS": "warning",
+  "oelint.vars.bbvars.BITBAKE_UI": "warning",
+  "oelint.vars.bbvars.BUILDNAME": "warning",
+  "oelint.vars.bbvars.CACHE": "warning",
+  "oelint.vars.bbvars.DL_DIR": "warning",
+  "oelint.vars.bbvars.FILE": "warning",
+  "oelint.vars.bbvars.FILESDIR": "warning",
+  "oelint.vars.bbvars.FILESPATH": "warning",
+  "oelint.vars.bbvars.INHERIT": "warning",
+  "oelint.vars.bbvars.LAYERDEPENDS": "warning",
+  "oelint.vars.bbvars.LAYERDIR": "warning",
+  "oelint.vars.bbvars.LAYERVERSION": "warning",
+  "oelint.vars.bbvars.MIRRORS": "warning",
+  "oelint.vars.bbvars.MULTI_PROVIDER_WHITELIST": "warning",
+  "oelint.vars.bbvars.PERSISTENT_DIR": "warning",
+  "oelint.vars.bbvars.PREFERRED_PROVIDER": "warning",
+  "oelint.vars.bbvars.PREFERRED_PROVIDERS": "warning",
+  "oelint.vars.bbvars.PREFERRED_VERSION": "warning",
+  "oelint.vars.bbvars.PREMIRRORS": "warning",
+  "oelint.vars.bbvars.PRSERV_HOST": "warning",
+  "oelint.vars.bbvars.STAMP": "warning",
+  "oelint.vars.bbvars.TOPDIR": "warning",
+  "oelint.vars.bugtrackerisurl": "warning",
+  "oelint.vars.dependsappend": "error",
+  "oelint.vars.dependsclass": "error",
+  "oelint.vars.dependsordered": "info",
+  "oelint.vars.descriptiontoobrief": "info",
+  "oelint.vars.doublemodify": "error",
+  "oelint.vars.duplicate": "warning",
+  "oelint.vars.fileextrapaths": "info",
+  "oelint.vars.fileextrapathsop": "error",
+  "oelint.var.filesoverride": "warning",
+  "oelint.vars.homepageprefix": "warning",
+  "oelint.vars.homepageping": "warning",
+  "oelint.vars.insaneskip": "info",
+  "oelint.var.licenseremotefile": "info",
+  "oelint.vars.licensesdpx": "warning",
+  "oelint.vars.licfileprefix": "warning",
+  "oelint.vars.mispell": "warning",
+  "oelint.vars.multilineident": "warning",
+  "oelint.vars.overrideappend": "warning",
+  "oelint.vars.pbpusage": "error",
+  "oelint.vars.dusageinpkgfuncs": "error",
+  "oelint.vars.pkgspecific": "error",
+  "oelint.vars.pkgspecific.RDEPENDS": "error",
+  "oelint.vars.pkgspecific.RRECOMMENDS": "error",
+  "oelint.vars.pkgspecific.RSUGGESTS": "error",
+  "oelint.vars.pkgspecific.RCONFLICTS": "error",
+  "oelint.vars.pkgspecific.RPROVIDES": "error",
+  "oelint.vars.pkgspecific.RREPLACES": "error",
+  "oelint.vars.pkgspecific.FILES": "error",
+  "oelint.vars.pkgspecific.pkg_preinst": "error",
+  "oelint.vars.pkgspecific.pkg_postinst": "error",
+  "oelint.vars.pkgspecific.pkg_prerm": "error",
+  "oelint.vars.pkgspecific.pkg_postrm": "error",
+  "oelint.vars.pkgspecific.ALLOW_EMPTY": "error",
+  "oelint.vars.pnbpnusage": "error",
+  "oelint.vars.pnusagediscouraged": "warning",
+  "oelint.vars.pythonpnusage": "info",
+  "oelint.vars.valuequoted": "error",
+  "oelint.var.rootfspostcmd": "warning",
+  "oelint.vars.spacesassignment": "warning",
+  "oelint.vars.specific": "error",
+  "oelint.vars.srcurioptions": "warning",
+  "oelint.vars.srcuriappend": "error",
+  "oelint.vars.srcurichecksum": "error",
+  "oelint.vars.srcuridomains": "info",
+  "oelint.vars.srcurifile": "warning",
+  "oelint.vars.srcurigittag": "warning",
+  "oelint.vars.srcurisrcrevtag": "error",
+  "oelint.var.srcuriwildcard": "error",
+  "oelint.vars.summary80chars": "info",
+  "oelint.vars.summarylinebreaks": "warning",
+  "oelint.vars.notrailingslash": "error",
+  "oelint.vars.downloadfilename": "warning",
+  "oelint.vars.filessetting": "warning",
+  "oelint.vars.filessetting.hidden": "warning",
+  "oelint.vars.filessetting.double": "warning",
+  "oelint.var.improperinherit": "error",
+  "oelint.var.inherit": "warning",
+  "oelint.var.inherit.inherit": "warning",
+  "oelint.var.inherit.inherit_defer": "warning",
+  "oelint.var.inheritdevtool": "warning",
+  "oelint.var.inheritdevtool.native": "warning",
+  "oelint.var.inheritdevtool.nativesdk": "warning",
+  "oelint.var.inheritdevtool.cross": "warning",
+  "oelint.vars.listappend": "error",
+  "oelint.var.mandatoryvar": "error",
+  "oelint.var.mandatoryvar.SUMMARY": "error",
+  "oelint.var.mandatoryvar.DESCRIPTION": "info",
+  "oelint.var.mandatoryvar.HOMEPAGE": "error",
+  "oelint.var.mandatoryvar.LICENSE": "error",
+  "oelint.var.mandatoryvar.SRC_URI": "error",
+  "oelint.var.multiinclude": "warning",
+  "oelint.var.multiinherit": "warning",
+  "oelint.var.nativefilename": "warning",
+  "oelint.var.nativesdkfilename": "warning",
+  "oelint.var.order": "warning",
+  "oelint.var.order.SUMMARY": "warning",
+  "oelint.var.order.DESCRIPTION": "warning",
+  "oelint.var.order.AUTHOR": "warning",
+  "oelint.var.order.HOMEPAGE": "warning",
+  "oelint.var.order.BUGTRACKER": "warning",
+  "oelint.var.order.SECTION": "warning",
+  "oelint.var.order.LICENSE": "warning",
+  "oelint.var.order.LIC_FILES_CHKSUM": "warning",
+  "oelint.var.order.DEPENDS": "warning",
+  "oelint.var.order.PROVIDES": "warning",
+  "oelint.var.order.PV": "warning",
+  "oelint.var.order.SRC_URI": "warning",
+  "oelint.var.order.SRCREV": "warning",
+  "oelint.var.order.S": "warning",
+  "oelint.var.order.inherit": "warning",
+  "oelint.var.order.PACKAGECONFIG": "warning",
+  "oelint.var.order.EXTRA_QMAKEVARS_POST": "warning",
+  "oelint.var.order.EXTRA_OECONF": "warning",
+  "oelint.var.order.PACKAGE_ARCH": "warning",
+  "oelint.var.order.PACKAGES": "warning",
+  "oelint.var.order.FILES": "warning",
+  "oelint.var.order.RDEPENDS": "warning",
+  "oelint.var.order.RRECOMMENDS": "warning",
+  "oelint.var.order.RSUGGESTS": "warning",
+  "oelint.var.order.RPROVIDES": "warning",
+  "oelint.var.order.RCONFLICTS": "warning",
+  "oelint.var.order.BBCLASSEXTEND": "warning",
+  "oelint.vars.pathhardcode": "warning",
+  "oelint.vars.pathhardcode.systemd_user_unitdir": "warning",
+  "oelint.vars.pathhardcode.systemd_system_unitdir": "warning",
+  "oelint.vars.pathhardcode.docdir": "warning",
+  "oelint.vars.pathhardcode.infodir": "warning",
+  "oelint.vars.pathhardcode.mandir": "warning",
+  "oelint.vars.pathhardcode.libexecdir": "warning",
+  "oelint.vars.pathhardcode.systemd_unitdir": "warning",
+  "oelint.vars.pathhardcode.libdir": "warning",
+  "oelint.vars.pathhardcode.bindir": "warning",
+  "oelint.vars.pathhardcode.datadir": "warning",
+  "oelint.vars.pathhardcode.includedir": "warning",
+  "oelint.vars.pathhardcode.localstatedir": "warning",
+  "oelint.vars.pathhardcode.nonarch_base_libdir": "warning",
+  "oelint.vars.pathhardcode.sbindir": "warning",
+  "oelint.vars.pathhardcode.servicedir": "warning",
+  "oelint.vars.pathhardcode.sharedstatedir": "warning",
+  "oelint.vars.pathhardcode.sysconfdir": "warning",
+  "oelint.vars.virtual": "error"
+}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..a4d341d6
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,71 @@
+---
+default_stages: [pre-commit]
+
+default_install_hook_types: [pre-commit, commit-msg]
+exclude: .*\.patch$
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-merge-conflict
+      - id: check-symlinks
+      - id: detect-private-key
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: mixed-line-ending
+
+  - repo: https://github.com/adrienverge/yamllint
+    rev: v1.32.0
+    hooks:
+      - id: yamllint
+        args: [-c=.yamllint]
+
+  - repo: https://github.com/igorshubovych/markdownlint-cli
+    rev: v0.36.0
+    hooks:
+      - id: markdownlint
+      - id: markdownlint-fix
+
+  - repo: https://github.com/talos-systems/conform
+    rev: v0.1.0-alpha.27
+    hooks:
+      - id: conform
+        stages:
+          - commit-msg
+
+  - repo: https://github.com/koalaman/shellcheck-precommit
+    rev: v0.10.0
+    hooks:
+      - id: shellcheck
+        args: ["--severity=warning"]
+
+  - repo: https://github.com/zarhus/oelint-adv
+    rev: 949111ff4d256af759aa5d94db9d0fb444679b2c
+    hooks:
+      - id: oelint-adv
+        args: [--rulefile=.oelint-ruleset.json, --hide=info, --quiet, --fix]
+        name: Advanced oelint
+        description: Based on the OpenEmbedded Styleguide and work done by oe-stylize-tool this module offers a (nearly) complete linter for bitbake-recipes.
+        entry: oelint-adv
+        language: python
+        language_version: python3
+        files: .*\.(bb)|(bbappend)|(bbclass)$
+
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.5
+    hooks:
+      - id: codespell
+
+  - repo: https://github.com/3mdeb/pre-commit-hook-branding
+    rev: 57bba1549352401e8a1c3617384a22458973fa7b
+    hooks:
+      - id: namespell
+        args: [--fix]
+
+ci:
+  autoupdate_commit_msg: 'pre-commit: autoupdate hooks'
+  autofix_prs: false
+  # docker is not supported on pre-commit.ci
+  skip: [shellcheck]
diff --git a/.shellcheckrc b/.shellcheckrc
new file mode 100644
index 00000000..b24e8b05
--- /dev/null
+++ b/.shellcheckrc
@@ -0,0 +1 @@
+disable=SC2164
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 057c3a92..7b5a0722 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -255,9 +255,9 @@ All notable changes to the DTS project will be documented in this file.
 * Added system76_ectool to enable Embedded Controller [firmware
   updating](https://docs.dasharo.com/common-coreboot-docs/dasharo_tools_suite/#dasharo-ec-update).
 * Added ec_transition script which helps with full Dasharo/Embedded Controller
-  [firmware transition](https://docs.dasharo.com/common-coreboot-docs/dasharo_tools_suite/#dasharo-ec-transition) for
-  NS50 70MU and NS70 laptops.
-* First public release: https://github.com/Dasharo/meta-dts.
+  [firmware transition](https://docs.dasharo.com/common-coreboot-docs/dasharo_tools_suite/#dasharo-ec-transition)
+  for NS50 70MU and NS70 laptops.
+* First public release: <https://github.com/Dasharo/meta-dts>.
 
 ## v1.0.0 2022-08-09
 
@@ -265,8 +265,8 @@ All notable changes to the DTS project will be documented in this file.
 * Auto-login functionality.
 * User menu.
 * [Dasharo HCL
-  Report](https://docs.dasharo.com/common-coreboot-docs/dasharo_tools_suite/#dasharo-hcl-report) -
-  the ability to automatically dump device information and send it to 3mdeb
+  Report](https://docs.dasharo.com/common-coreboot-docs/dasharo_tools_suite/#dasharo-hcl-report)
+  \- the ability to automatically dump device information and send it to 3mdeb
   servers.
 * Possibility to manually [update the Dasharo
   firmware](https://docs.dasharo.com/common-coreboot-docs/dasharo_tools_suite/#dasharo-firmware-update).
diff --git a/kas-uefi-sb.yml b/kas-uefi-sb.yml
index 22a406b2..031351ee 100644
--- a/kas-uefi-sb.yml
+++ b/kas-uefi-sb.yml
@@ -1,3 +1,4 @@
+---
 header:
   version: 11
   includes:
diff --git a/kas.yml b/kas.yml
index 94f22c0c..56aec2c2 100644
--- a/kas.yml
+++ b/kas.yml
@@ -1,3 +1,4 @@
+---
 header:
   version: 11
   includes:
diff --git a/kas/cache.yml b/kas/cache.yml
index 1982a5ea..a327d674 100644
--- a/kas/cache.yml
+++ b/kas/cache.yml
@@ -1,3 +1,4 @@
+---
 header:
   version: 11
 
diff --git a/kas/common.yml b/kas/common.yml
index d71eadda..962e7e7c 100644
--- a/kas/common.yml
+++ b/kas/common.yml
@@ -1,3 +1,4 @@
+---
 header:
   version: 11
 
diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/cbfstool_git.bb b/meta-dts-distro/recipes-bsp/coreboot-utils/cbfstool_git.bb
index 5ad43b21..55b67e4b 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/cbfstool_git.bb
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/cbfstool_git.bb
@@ -1,5 +1,7 @@
 require coreboot-utils.inc
 
+SUMMARY = "Tool for manipulating CBFS file"
+
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 EXTRA_OEMAKE = " \
diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/cbmem_git.bb b/meta-dts-distro/recipes-bsp/coreboot-utils/cbmem_git.bb
index cc7b8d5d..68f4eb24 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/cbmem_git.bb
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/cbmem_git.bb
@@ -1,11 +1,13 @@
 require coreboot-utils.inc
 
+SUMMARY = "CBMEM parser to read e.g. timestamps and console log"
+
 DEPENDS += "pciutils zlib"
 
 EXTRA_OEMAKE = ' \
-  DESTDIR="${D}" \
-  PREFIX="${prefix}" \
-'
+                DESTDIR="${D}" \
+                PREFIX="${prefix}" \
+                '
 
 do_compile () {
   oe_runmake -C util/cbmem
diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/coreboot-utils.inc b/meta-dts-distro/recipes-bsp/coreboot-utils/coreboot-utils.inc
index d48f8d8e..c8b90205 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/coreboot-utils.inc
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/coreboot-utils.inc
@@ -1,13 +1,13 @@
 DESCRIPTION = "coreboot tools"
-SECTION = "coreboot"
 HOMEPAGE = "https://doc.coreboot.org/util.html"
+SECTION = "coreboot"
 
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 SRC_URI = " \
-    git://github.com/Dasharo/coreboot.git;protocol=https;branch=dasharo-4.21\
-    "
+          git://github.com/Dasharo/coreboot.git;protocol=https;branch=dasharo-4.21\
+          "
 
 SRCREV = "d08d5eaa98b1204b5e665d3ae4f63fb6f84a0d77"
 
diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/ectool_git.bb b/meta-dts-distro/recipes-bsp/coreboot-utils/ectool_git.bb
index 4f76b3a3..0dba1c45 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/ectool_git.bb
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/ectool_git.bb
@@ -1,9 +1,11 @@
 require coreboot-utils.inc
 
+SUMMARY = "Dumps the RAM of a laptop's Embedded/Environmental Controller (EC)."
+
 EXTRA_OEMAKE = ' \
-  DESTDIR="${D}" \
-  PREFIX="${prefix}" \
-'
+                DESTDIR="${D}" \
+                PREFIX="${prefix}" \
+                '
 
 do_compile () {
   oe_runmake -C util/ectool
diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/futil_git.bb b/meta-dts-distro/recipes-bsp/coreboot-utils/futil_git.bb
index b8646984..3fd547e5 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/futil_git.bb
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/futil_git.bb
@@ -1,29 +1,33 @@
-LICENSE = "MIT"
+SUMMARY = "\
+          Firmware utility tool, used to create, sign, and validate Chrome \
+          OS images."
 
-SRC_URI += " \
-    git://github.com/Dasharo/vboot.git;protocol=https;branch=dasharo \
-    file://0001-Makefile-disable-deprecated-warnigs-as-errors.patch \
-"
-
-S = "${WORKDIR}/git"
+HOMEPAGE = "https://github.com/Dasharo/vboot"
 
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=562c740877935f40b262db8af30bca36"
 
-SRCREV = "dc68f9f1b56d92f76026dca490e79493599ff4cf"
-TARGET_CC_ARCH += "${LDFLAGS}"
-
 DEPENDS += " \
     openssl \
     flashrom \
 "
 
+SRC_URI = " \
+          git://github.com/Dasharo/vboot.git;protocol=https;branch=dasharo \
+          file://0001-Makefile-disable-deprecated-warnigs-as-errors.patch \
+          "
+SRCREV = "dc68f9f1b56d92f76026dca490e79493599ff4cf"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
 RDEPENDS:${PN} += " \
     bash \
 "
 
-inherit pkgconfig
-
 EXTRA_OEMAKE = " \
     DESTDIR="${D}" \
     PREFIX="${prefix}" \
diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/ifdtool_git.bb b/meta-dts-distro/recipes-bsp/coreboot-utils/ifdtool_git.bb
index 17ea2b7e..92df4cd7 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/ifdtool_git.bb
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/ifdtool_git.bb
@@ -1,11 +1,13 @@
 require coreboot-utils.inc
 
+SUMMARY = "Extract and dump Intel Firmware Descriptor information"
+
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 EXTRA_OEMAKE = ' \
-  DESTDIR="${D}" \
-  PREFIX="${prefix}" \
-'
+                DESTDIR="${D}" \
+                PREFIX="${prefix}" \
+                '
 
 do_compile () {
   oe_runmake -C util/ifdtool
diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/intelmetool_git.bb b/meta-dts-distro/recipes-bsp/coreboot-utils/intelmetool_git.bb
index 9cf84aed..290039d9 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/intelmetool_git.bb
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/intelmetool_git.bb
@@ -1,11 +1,13 @@
 require coreboot-utils.inc
 
+SUMMARY = "Dump interesting things about Management Engine even if hidden"
+
 DEPENDS += "pciutils zlib"
 
 EXTRA_OEMAKE = ' \
-  DESTDIR="${D}" \
-  PREFIX="${prefix}" \
-'
+                DESTDIR="${D}" \
+                PREFIX="${prefix}" \
+                '
 
 TARGET_CFLAGS += "-I../../src/commonlib/bsd/include"
 
diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb b/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb
index b1a84bb4..f15979b1 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb
@@ -1,5 +1,10 @@
 require coreboot-utils.inc
 
+SUMMARY = "\
+          Converts the configuration DW0/1 registers value from an inteltool \
+          dump to coreboot macros.\
+          "
+
 LIC_FILES_CHKSUM = "file://../../COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 GO_IMPORT = "github.com/dasharo/coreboot/"
@@ -7,8 +12,8 @@ GO_IMPORT = "github.com/dasharo/coreboot/"
 # we need to override SRC_URI from coreboot-utils.inc so it's unpacked in the
 # directory as expected by the go bbclass
 SRC_URI = " \
-    git://github.com/dasharo/coreboot.git;protocol=https;branch=dasharo-4.21;destsuffix=${GO_IMPORT} \
-    "
+          git://github.com/dasharo/coreboot.git;protocol=https;branch=dasharo-4.21;destsuffix=${GO_IMPORT} \
+          "
 
 S = "${WORKDIR}/${GO_IMPORT}/util/intelp2m"
 
diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/inteltool_git.bb b/meta-dts-distro/recipes-bsp/coreboot-utils/inteltool_git.bb
index 72a339eb..4294a52c 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/inteltool_git.bb
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/inteltool_git.bb
@@ -1,11 +1,16 @@
 require coreboot-utils.inc
 
+SUMMARY = "\
+          Provides information about the Intel CPU/chipset hardware \
+          configuration (register contents, MSRs, etc).\
+          "
+
 DEPENDS += "pciutils zlib"
 
 EXTRA_OEMAKE = ' \
-  DESTDIR="${D}" \
-  PREFIX="${prefix}" \
-'
+                DESTDIR="${D}" \
+                PREFIX="${prefix}" \
+                '
 
 do_compile () {
   oe_runmake -C util/inteltool
diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/msrtool_git.bb b/meta-dts-distro/recipes-bsp/coreboot-utils/msrtool_git.bb
index 0d41ffe0..6736d2f5 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/msrtool_git.bb
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/msrtool_git.bb
@@ -1,9 +1,7 @@
 require coreboot-utils.inc
 
+SUMMARY = "Dumps chipset-specific MSR registers."
+DEPENDS += "pciutils"
 S = "${WORKDIR}/git/util/msrtool"
-
 export PREFIX = "${prefix}"
-
-DEPENDS += "pciutils"
-
 inherit autotools-brokensep
diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/nvramtool_git.bb b/meta-dts-distro/recipes-bsp/coreboot-utils/nvramtool_git.bb
index dca4b8ff..fab029fe 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/nvramtool_git.bb
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/nvramtool_git.bb
@@ -1,9 +1,11 @@
 require coreboot-utils.inc
 
+SUMMARY = "Reads and writes coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM. "
+
 EXTRA_OEMAKE = ' \
-  DESTDIR="${D}" \
-  PREFIX="${prefix}" \
-'
+                DESTDIR="${D}" \
+                PREFIX="${prefix}" \
+                '
 
 do_compile () {
   oe_runmake -C util/nvramtool
diff --git a/meta-dts-distro/recipes-bsp/coreboot-utils/superiotool_git.bb b/meta-dts-distro/recipes-bsp/coreboot-utils/superiotool_git.bb
index 07969417..4169f462 100644
--- a/meta-dts-distro/recipes-bsp/coreboot-utils/superiotool_git.bb
+++ b/meta-dts-distro/recipes-bsp/coreboot-utils/superiotool_git.bb
@@ -1,11 +1,13 @@
 require coreboot-utils.inc
 
+SUMMARY = "A user-space utility to detect Super I/O of a mainboard and provide detailed information about the register contents of the Super I/O. "
+
 DEPENDS += "pciutils zlib"
 
 EXTRA_OEMAKE = ' \
-  DESTDIR="${D}" \
-  PREFIX="${prefix}" \
-'
+                DESTDIR="${D}" \
+                PREFIX="${prefix}" \
+                '
 
 do_compile () {
   oe_runmake -C util/superiotool
diff --git a/meta-dts-distro/recipes-bsp/flashrom/flashrom_git.bb b/meta-dts-distro/recipes-bsp/flashrom/flashrom_git.bb
index 5d97fa87..f62a4010 100644
--- a/meta-dts-distro/recipes-bsp/flashrom/flashrom_git.bb
+++ b/meta-dts-distro/recipes-bsp/flashrom/flashrom_git.bb
@@ -1,15 +1,15 @@
-DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips"
-LICENSE = "GPL-2.0-or-later"
+SUMMARY = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips"
 HOMEPAGE = "http://flashrom.org"
 
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
+DEPENDS = "pciutils libusb libftdi"
+
 BRANCH = "dasharo-release"
-SRCREV = "f5a48aa6c67bd30603062bb4265419fd49f83870"
 SRC_URI = "git://github.com/Dasharo/flashrom.git;branch=${BRANCH};protocol=https"
+SRCREV = "f5a48aa6c67bd30603062bb4265419fd49f83870"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "pciutils libusb libftdi"
-
 inherit meson pkgconfig
diff --git a/meta-dts-distro/recipes-bsp/fwupd/fwupd-efi_1.2.bb b/meta-dts-distro/recipes-bsp/fwupd/fwupd-efi_1.2.bb
index bcad2416..e5636ccc 100644
--- a/meta-dts-distro/recipes-bsp/fwupd/fwupd-efi_1.2.bb
+++ b/meta-dts-distro/recipes-bsp/fwupd/fwupd-efi_1.2.bb
@@ -1,14 +1,16 @@
 SUMMARY = "EFI executable for fwupd"
+HOMEPAGE = "https://github.com/fwupd/fwupd-efi"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \
+DEPENDS = "gnu-efi"
+
+SRC_URI = "\
+           git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \
            file://cc.patch"
 SRCREV = "8de5918507dcc797e612aac688d6b60b90053f54"
 S = "${WORKDIR}/git"
 
-DEPENDS = "gnu-efi"
-
 COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
 
 inherit meson
@@ -18,7 +20,8 @@ SBAT_DISTRO_ID ?= "${DISTRO}"
 SBAT_DISTRO_SUMMARY ?= "${DISTRO_NAME}"
 SBAT_DISTRO_URL ?= ""
 
-EXTRA_OEMESON += "-Defi-cc="${@meson_array('CC', d)}" \
+EXTRA_OEMESON += "\
+                  -Defi-cc=${@meson_array('CC', d)}\
                   -Defi-ld='${HOST_PREFIX}ld' \
                   -Defi-includedir=${STAGING_INCDIR}/efi \
                   -Defi-libdir=${STAGING_LIBDIR} \
diff --git a/meta-dts-distro/recipes-bsp/fwupd/fwupd_%.bbappend b/meta-dts-distro/recipes-bsp/fwupd/fwupd_%.bbappend
index 7b57cde7..3020f1d3 100644
--- a/meta-dts-distro/recipes-bsp/fwupd/fwupd_%.bbappend
+++ b/meta-dts-distro/recipes-bsp/fwupd/fwupd_%.bbappend
@@ -1,6 +1,6 @@
 PACKAGECONFIG = " \
-  curl gnutls gudev gusb \
-  ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \
-  plugin_flashrom \
-  sqlite \
-"
+                curl gnutls gudev gusb \
+                ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \
+                plugin_flashrom \
+                sqlite \
+                "
diff --git a/meta-dts-distro/recipes-bsp/fwupd/fwupd_2.0.1.bb b/meta-dts-distro/recipes-bsp/fwupd/fwupd_2.0.1.bb
index 4307a103..4ccc1b76 100644
--- a/meta-dts-distro/recipes-bsp/fwupd/fwupd_2.0.1.bb
+++ b/meta-dts-distro/recipes-bsp/fwupd/fwupd_2.0.1.bb
@@ -1,4 +1,5 @@
 SUMMARY = "A simple daemon to allow session software to update firmware"
+HOMEPAGE = "https://github.com/Dasharo/fwupd"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
@@ -10,9 +11,6 @@ SRCREV = "1ad6f5156dae1d54963bd3999a89a86567216af2"
 
 S = "${WORKDIR}/git"
 
-# Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
 inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages
 
 GIDOCGEN_MESON_OPTION = 'docs'
@@ -23,7 +21,8 @@ GIDOCGEN_MESON_DISABLE_FLAG = 'none'
 # meta-oe) because of following build error
 # ../git/meson.build:1:0: ERROR: Unknown options: "plugin_gpio, plugin_scsi"
 
-PACKAGECONFIG ??= "curl gnutls gudev gusb \
+PACKAGECONFIG ??= "\
+                   curl gnutls gudev gusb \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \
                    ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \
@@ -73,7 +72,6 @@ PACKAGECONFIG[sqlite] = "-Dsqlite=true,-Dsqlite=false,sqlite3"
 PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
 PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native"
 
-
 # TODO plugins-all meta-option that expands to all plugin_*?
 PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=true,-Dplugin_acpi_phat=false"
 PACKAGECONFIG[plugin_amt] = "-Dplugin_amt=true,-Dplugin_amt=false"
@@ -113,7 +111,11 @@ DISABLE_NON_X86:x86 = ""
 DISABLE_NON_X86:x86-64 = ""
 PACKAGECONFIG:remove = "${DISABLE_NON_X86}"
 
-FILES:${PN} += "${libdir}/fwupd-plugins-* \
+# Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+FILES:${PN} += "\
+                ${libdir}/fwupd-plugins-* \
                 ${systemd_unitdir} \
                 ${datadir}/fish \
                 ${datadir}/metainfo \
@@ -122,6 +124,8 @@ FILES:${PN} += "${libdir}/fwupd-plugins-* \
                 ${datadir}/polkit-1 \
                 ${nonarch_libdir}/modules-load.d"
 
-FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \
-                      ${datadir}/installed-tests/"
+FILES:${PN}-ptest += "\
+                      ${libexecdir}/installed-tests/ \
+                      ${datadir}/installed-tests/ \
+                      "
 RDEPENDS:${PN}-ptest += "gnome-desktop-testing"
diff --git a/meta-dts-distro/recipes-bsp/grub/grub-efi-efi-custom.inc b/meta-dts-distro/recipes-bsp/grub/grub-efi-efi-custom.inc
index 9f30131a..f1827d2d 100644
--- a/meta-dts-distro/recipes-bsp/grub/grub-efi-efi-custom.inc
+++ b/meta-dts-distro/recipes-bsp/grub/grub-efi-efi-custom.inc
@@ -3,13 +3,13 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/grub-efi-custom:"
 RDEPENDS:${PN}:remove = " virtual-grub-bootconf"
 
 do_deploy:append () {
-	# deploy all UEFI SB related bootfiles to later use them with bootimg-efi
-	# wic plugin
-	install -d ${DEPLOY_DIR_IMAGE}/bootfiles
-	cp -r ${D}/boot/* ${DEPLOY_DIR_IMAGE}/bootfiles/
-	# remove default grub-efi-grubx64.efi file deployed by .bb from poky; when
-	# it is left in deploydir, bootimg-efi plugin picks it up after cloning
-	# files from IMAGE_EFI_BOOT_FILES list
-	# see: https://git.yoctoproject.org/poky/tree/scripts/lib/wic/plugins/source/bootimg-efi.py?id=00c04394cbc5ecaced7cc1bc8bc8787e621f987d#n360
-	rm -rf ${DEPLOYDIR}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE}
+    # deploy all UEFI SB related bootfiles to later use them with bootimg-efi
+    # wic plugin
+    install -d ${DEPLOY_DIR_IMAGE}/bootfiles
+    cp -r ${D}/boot/* ${DEPLOY_DIR_IMAGE}/bootfiles/
+    # remove default grub-efi-grubx64.efi file deployed by .bb from poky; when
+    # it is left in deploydir, bootimg-efi plugin picks it up after cloning
+    # files from IMAGE_EFI_BOOT_FILES list
+    # see: https://git.yoctoproject.org/poky/tree/scripts/lib/wic/plugins/source/bootimg-efi.py?id=00c04394cbc5ecaced7cc1bc8bc8787e621f987d#n360
+    rm -rf ${DEPLOYDIR}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE}
 }
diff --git a/meta-dts-distro/recipes-dasharo/3mdeb-secpack/3mdeb-secpack/3mdeb-secpack.sh b/meta-dts-distro/recipes-dasharo/3mdeb-secpack/3mdeb-secpack/3mdeb-secpack.sh
index 79a47e00..33bd4ad4 100644
--- a/meta-dts-distro/recipes-dasharo/3mdeb-secpack/3mdeb-secpack/3mdeb-secpack.sh
+++ b/meta-dts-distro/recipes-dasharo/3mdeb-secpack/3mdeb-secpack/3mdeb-secpack.sh
@@ -5,4 +5,3 @@ if [ -d /home/root/.dasharo-gnupg ]; then
 
     export GNUPGHOME
 fi
-
diff --git a/meta-dts-distro/recipes-dasharo/3mdeb-secpack/3mdeb-secpack_git.bb b/meta-dts-distro/recipes-dasharo/3mdeb-secpack/3mdeb-secpack_git.bb
index d882baca..e9f6473c 100644
--- a/meta-dts-distro/recipes-dasharo/3mdeb-secpack/3mdeb-secpack_git.bb
+++ b/meta-dts-distro/recipes-dasharo/3mdeb-secpack/3mdeb-secpack_git.bb
@@ -1,6 +1,7 @@
 SUMMARY = "A 3mdeb keyring used to verify releases created at 3mdeb"
-DESCRIPTION = "Provides a trusted keyring of keys that can be used to verify \
-signatures."
+DESCRIPTION = "\
+              Provides a trusted keyring of keys that can be used to verify \
+              signatures."
 HOMEPAGE = "https://github.com/3mdeb/3mdeb-secpack/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -38,7 +39,6 @@ do_install() {
 
 addtask prepare_keyring after do_compile before do_install
 
-FILES:${PN} = " \
+FILES:${PN} += " \
     ${ROOT_HOME} \
-    ${sysconfdir} \
 "
diff --git a/meta-dts-distro/recipes-dasharo/dasharo-configuration-utility/dasharo-configuration-utility_git.bb b/meta-dts-distro/recipes-dasharo/dasharo-configuration-utility/dasharo-configuration-utility_git.bb
index d8c4fe2c..01196fff 100644
--- a/meta-dts-distro/recipes-dasharo/dasharo-configuration-utility/dasharo-configuration-utility_git.bb
+++ b/meta-dts-distro/recipes-dasharo/dasharo-configuration-utility/dasharo-configuration-utility_git.bb
@@ -1,6 +1,6 @@
-DESCRIPTION = "Dasharo Configuration Utility (DCU)"
-SECTION = "tools"
+SUMMARY = "Dasharo Configuration Utility (DCU)"
 HOMEPAGE = "https://github.com/Dasharo/dcu"
+SECTION = "tools"
 
 LICENSE = "Apache-2.0"
 
diff --git a/meta-dts-distro/recipes-devtool/me-cleaner/me-cleaner_git.bb b/meta-dts-distro/recipes-devtool/me-cleaner/me-cleaner_git.bb
index 4f523c2e..9a191326 100644
--- a/meta-dts-distro/recipes-devtool/me-cleaner/me-cleaner_git.bb
+++ b/meta-dts-distro/recipes-devtool/me-cleaner/me-cleaner_git.bb
@@ -4,9 +4,9 @@ HOMEPAGE = "https://github.com/corna/me_cleaner"
 LICENSE = "GPL-3.0-only & GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "git://github.com/corna/me_cleaner;protocol=https;branch=master"
-
 PV = "1.2+git${SRCPV}"
+
+SRC_URI = "git://github.com/corna/me_cleaner;protocol=https;branch=master"
 SRCREV = "43612a630c79f3bc6f2653bfe90dfe0b7b137e08"
 
 S = "${WORKDIR}/git"
diff --git a/meta-dts-distro/recipes-devtool/python/python3-binwalk_2.3.3.bb b/meta-dts-distro/recipes-devtool/python/python3-binwalk_2.3.3.bb
index bf6dd856..fee131a4 100644
--- a/meta-dts-distro/recipes-devtool/python/python3-binwalk_2.3.3.bb
+++ b/meta-dts-distro/recipes-devtool/python/python3-binwalk_2.3.3.bb
@@ -3,15 +3,15 @@
 # (Feel free to remove these comments when editing.)
 
 SUMMARY = "Firmware analysis tool"
+HOMEPAGE = "https://github.com/ReFirmLabs/binwalk"
 # WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is
 # your responsibility to verify that the values are complete and correct.
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=65bbee055d3ea3bfc475f07aecf4de64"
 
+PV = "2.3.3+git${SRCPV}"
 SRC_URI = "git://github.com/ReFirmLabs/binwalk;protocol=https;branch=master"
-
 # Modify these as desired
-PV = "2.3.3+git${SRCPV}"
 SRCREV = "fa0c0bd59b8588814756942fe4cb5452e76c1dcd"
 
 S = "${WORKDIR}/git"
diff --git a/meta-dts-distro/recipes-devtool/python/python3-uefi-firmware_1.9.bb b/meta-dts-distro/recipes-devtool/python/python3-uefi-firmware_1.9.bb
index 2d62e7c5..80b44071 100644
--- a/meta-dts-distro/recipes-devtool/python/python3-uefi-firmware_1.9.bb
+++ b/meta-dts-distro/recipes-devtool/python/python3-uefi-firmware_1.9.bb
@@ -1,7 +1,7 @@
 
 SUMMARY = "Various data structures and parsing tools for UEFI firmware."
-HOMEPAGE = "https://github.com/theopolis/uefi-firmware-parser"
 AUTHOR = "Teddy Reed <teddy@prosauce.org>"
+HOMEPAGE = "https://github.com/theopolis/uefi-firmware-parser"
 LICENSE = "BSD-2-Clause & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://setup.py;md5=90fa5bae1547550f1c1993f651eda955"
 
diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index b613e233..b85e86eb 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -1,15 +1,15 @@
 SUMMARY = "Dasharo Tools Suite scripts."
-SECTION = "tools"
 HOMEPAGE = "https://github.com/Dasharo/dts-scripts"
+SECTION = "tools"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded4771514fcc  "
 
-SRCREV = "019212bf44a5fade576e4d02c9f093cffda6af8e"
-SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-
 PV = "0.1+git${SRCPV}"
 
+SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
+SRCREV = "019212bf44a5fade576e4d02c9f093cffda6af8e"
+
 S = "${WORKDIR}/git"
 
 RDEPENDS:${PN} = " \
diff --git a/meta-dts-distro/recipes-dts/images/dts-base-image.inc b/meta-dts-distro/recipes-dts/images/dts-base-image.inc
index 128fa6d9..eb833e6c 100644
--- a/meta-dts-distro/recipes-dts/images/dts-base-image.inc
+++ b/meta-dts-distro/recipes-dts/images/dts-base-image.inc
@@ -1,4 +1,4 @@
-DESCRIPTION = "dts image"
+SUMMARY = "DTS image"
 
 IMAGE_FEATURES += "ssh-server-openssh debug-tweaks"
 
diff --git a/meta-dts-distro/recipes-dts/images/dts-base-sb-image.bb b/meta-dts-distro/recipes-dts/images/dts-base-sb-image.bb
index de2a685b..450bc786 100644
--- a/meta-dts-distro/recipes-dts/images/dts-base-sb-image.bb
+++ b/meta-dts-distro/recipes-dts/images/dts-base-sb-image.bb
@@ -1,5 +1,7 @@
 require dts-base-image.inc
 
+SUMMARY = "DTS base Secure Boot image"
+
 IMAGE_INSTALL:append = " \
     util-linux \
     packagegroup-efi-secure-boot \
diff --git a/meta-dts-distro/recipes-extended/hw-probe/hw-probe_1.6.5.bb b/meta-dts-distro/recipes-extended/hw-probe/hw-probe_1.6.5.bb
index 65c51ebf..97b7efb7 100644
--- a/meta-dts-distro/recipes-extended/hw-probe/hw-probe_1.6.5.bb
+++ b/meta-dts-distro/recipes-extended/hw-probe/hw-probe_1.6.5.bb
@@ -1,9 +1,11 @@
-DESCRIPTION = "tool to probe for hardware, check operability and find drivers"
+SUMMARY = "Tool to probe for hardware, check operability and find drivers"
 HOMEPAGE = "https://github.com/linuxhw/hw-probe.git"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68"
 
-SRC_URI = "https://github.com/linuxhw/hw-probe/releases/download/1.6/hw-probe-1.6.5-189-x86_64.AppImage;sha256sum=dddec100c47b642c4bdd4f578b05bc8890c4f0ecbd0d5f15e965927590fad505"
+SRC_URI = "https://github.com/linuxhw/hw-probe/releases/download/1.6/hw-probe-1.6.5-189-x86_64.AppImage"
+
+SRC_URI[sha256sum] = "dddec100c47b642c4bdd4f578b05bc8890c4f0ecbd0d5f15e965927590fad505"
 
 S = "${WORKDIR}/${BPN}"
 
@@ -15,6 +17,5 @@ do_install () {
     install -d ${D}${bindir}
     install -m 0755 ${WORKDIR}/hw-probe-1.6.5-189-x86_64.AppImage ${D}${bindir}/hw-probe
     # make the link, since the appimage expects the libraries to be under /lib64
-    ln -sr ${D}/lib ${D}/lib64
+    ln -sr ${D}/${nonarch_base_libdir} ${D}/lib64
 }
-
diff --git a/meta-dts-distro/recipes-extended/sbctl/sbctl_0.13.bb b/meta-dts-distro/recipes-extended/sbctl/sbctl_0.13.bb
index 9e03ff76..078c6415 100644
--- a/meta-dts-distro/recipes-extended/sbctl/sbctl_0.13.bb
+++ b/meta-dts-distro/recipes-extended/sbctl/sbctl_0.13.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "sbctl - a simple tool"
+SUMMARY = "Secure Boot key manager"
 HOMEPAGE = "https://github.com/foxboron/sbctl.git"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=16d98588b73d8e0dcc069d319889da4c"
@@ -12,4 +12,3 @@ do_install () {
     install -d ${D}${bindir}
     install -m 0755 ${S}/sbctl ${D}${bindir}/
 }
-
diff --git a/meta-dts-distro/recipes-kernel/kernel/acpi-call-dkms_git.bb b/meta-dts-distro/recipes-kernel/kernel/acpi-call-dkms_git.bb
index f7a9d973..c543f57b 100644
--- a/meta-dts-distro/recipes-kernel/kernel/acpi-call-dkms_git.bb
+++ b/meta-dts-distro/recipes-kernel/kernel/acpi-call-dkms_git.bb
@@ -1,12 +1,14 @@
 SUMMARY = "A kernel simple module that enables you to call ACPI methods by writing the method name followed by arguments to /proc/acpi/call."
 DESCRIPTION = "${SUMMARY}"
+HOMEPAGE = "https://github.com/nix-community/acpi_call"
 
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=025e46592215127e8c98b397ff29a037"
 
 inherit module
 
-SRC_URI = "git://github.com/nix-community/acpi_call.git;branch=master;protocol=https \
+SRC_URI = "\
+           git://github.com/nix-community/acpi_call.git;branch=master;protocol=https \
            file://0001-Makefile-fixing-build-errrors.patch \
            file://0001-GPLv3-licence-file-added.patch \
            "
diff --git a/meta-dts-distro/recipes-support/cloudsend/cloudsend_git.bb b/meta-dts-distro/recipes-support/cloudsend/cloudsend_git.bb
index 89fe6b6b..90f4eec0 100644
--- a/meta-dts-distro/recipes-support/cloudsend/cloudsend_git.bb
+++ b/meta-dts-distro/recipes-support/cloudsend/cloudsend_git.bb
@@ -1,12 +1,16 @@
-DESCRIPTION = "Bash script that uses curl to send files and folders to a nextcloud / owncloud publicly shared folder."
-SECTION = "GPLv3"
+SUMMARY = "\
+           Bash script that uses curl to send files and folders to a \
+           nextcloud / owncloud publicly shared folder.\
+           "
+
 HOMEPAGE = "https://github.com/tavinus/cloudsend.sh"
+SECTION = "GPLv3"
 
 LICENSE = "MIT"
 
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-SRC_URI ="\
+SRC_URI = "\
     git://github.com/tavinus/cloudsend.sh.git;protocol=https;branch=master \
     file://0001-cloudsend.sh-Add-fail-with-body-flag.patch \
     "
@@ -16,8 +20,8 @@ SRCREV = "65abbc6d809bcce13870dc5ea07937d324283173"
 S = "${WORKDIR}/git"
 
 RDEPENDS:${PN} = " \
-  bash \
-  curl \
+    bash \
+    curl \
 "
 
 do_install () {
diff --git a/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb b/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
index 725cd618..843941b0 100644
--- a/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
+++ b/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
@@ -1,13 +1,21 @@
 inherit cargo
 inherit pkgconfig
 
-SRC_URI += "gitsm://github.com/Dasharo/ec.git;protocol=https;nobranch=1"
-SRCREV = "2b2c17ac6e61f45e0fc1bcf6b907a8289f37bcc4"
-S = "${WORKDIR}/git"
-CARGO_SRC_DIR = "/tool/"
+SUMMARY = "System76 Open Source Embedded Controller"
+HOMEPAGE = "https://github.com/Dasharo/ec"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = " \
+    file://tool/LICENSE;md5=af209eac18ec76ed06fb2839a906b1ad \
+"
+
+DEPENDS += "hidapi"
 PV:append = ".AUTOINC+411fab9b7c"
+SRC_URI = "gitsm://github.com/Dasharo/ec.git;protocol=https;nobranch=1"
 
-SRC_URI += " \
+CARGO_SRC_DIR = "/tool/"
+
+SRC_URI:append = " \
     crate://crates.io/atty/0.2.14 \
     crate://crates.io/autocfg/1.1.0 \
     crate://crates.io/bitflags/1.3.2 \
@@ -32,6 +40,8 @@ SRC_URI += " \
     crate://crates.io/winapi/0.3.9 \
 "
 
+SRCREV = "2b2c17ac6e61f45e0fc1bcf6b907a8289f37bcc4"
+
 SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
@@ -55,10 +65,4 @@ SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4
 SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 
-DEPENDS += "hidapi"
-LIC_FILES_CHKSUM = " \
-    file://tool/LICENSE;md5=af209eac18ec76ed06fb2839a906b1ad \
-"
-SUMMARY = "Dasharo EC tool"
-HOMEPAGE = "https://github.com/Dasharo/ec"
-LICENSE = "MIT"
+S = "${WORKDIR}/git"
diff --git a/meta-dts-distro/recipes-support/iotools/iotools_git.bb b/meta-dts-distro/recipes-support/iotools/iotools_git.bb
index 4f107f8b..cd8e482f 100644
--- a/meta-dts-distro/recipes-support/iotools/iotools_git.bb
+++ b/meta-dts-distro/recipes-support/iotools/iotools_git.bb
@@ -1,14 +1,19 @@
-DESCRIPTION = "The iotools package provides a set of simple command line tools \
-               which allow access to hardware device registers. "
+SUMMARY = "\
+          The iotools package provides a set of simple command line tools \
+          which allow access to hardware device registers.\
+          "
+
+HOMEPAGE = "https://github.com/adurbin/iotools"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
+PV = "1.0+git${SRCPV}"
+
 SRC_URI = " \
-    git://github.com/adurbin/iotools;protocol=https;branch=master \
-    file://0001-Makefile-allow-overriding-CC.patch \
-    "
+          git://github.com/adurbin/iotools;protocol=https;branch=master \
+          file://0001-Makefile-allow-overriding-CC.patch \
+          "
 
-PV = "1.0+git${SRCPV}"
 SRCREV = "18949fdc4dedb1da3f51ee83a582b112fb9f2c71"
 
 S = "${WORKDIR}/git"
diff --git a/meta-dts-distro/recipes-support/ipxe-commands/ipxe-commands_local.bb b/meta-dts-distro/recipes-support/ipxe-commands/ipxe-commands_local.bb
index d1e6c182..c8c07073 100644
--- a/meta-dts-distro/recipes-support/ipxe-commands/ipxe-commands_local.bb
+++ b/meta-dts-distro/recipes-support/ipxe-commands/ipxe-commands_local.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "iPXE commands autostart on boot"
+SUMMARY = "iPXE commands autostart on boot"
 HOMEPAGE = "https://github.com/Dasharo/meta-dts"
 
 LICENSE = "MIT"
diff --git a/meta-dts-distro/recipes-support/mei-amt-check/mei-amt-check.bb b/meta-dts-distro/recipes-support/mei-amt-check/mei-amt-check_git.bb
similarity index 67%
rename from meta-dts-distro/recipes-support/mei-amt-check/mei-amt-check.bb
rename to meta-dts-distro/recipes-support/mei-amt-check/mei-amt-check_git.bb
index 0a0186c8..04b84e86 100644
--- a/meta-dts-distro/recipes-support/mei-amt-check/mei-amt-check.bb
+++ b/meta-dts-distro/recipes-support/mei-amt-check/mei-amt-check_git.bb
@@ -1,16 +1,16 @@
-DESCRIPTION = "AMT status checker for Linux"
-SECTION = "tools"
+SUMMARY = "AMT status checker for Linux"
 HOMEPAGE = "https://github.com/mjg59/mei-amt-check"
+SECTION = "tools"
 
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=39f5702df600d6d1b1d6d138dc62347d"
 
-SRC_URI = " \
-    git://github.com/mjg59/mei-amt-check;protocol=https;branch=master \
-    file://0001-Makefile-removed-setting-CC-variable.patch \
-"
-
 PV = "1.0+git${SRCPV}"
+
+SRC_URI = " \
+            git://github.com/mjg59/mei-amt-check;protocol=https;branch=master \
+            file://0001-Makefile-removed-setting-CC-variable.patch \
+            "
 SRCREV = "ec921d1e0a2ac770e7835589a28b85bc2f15200c"
 
 S = "${WORKDIR}/git"
@@ -23,4 +23,3 @@ do_install () {
     install -d ${D}/${sbindir}
     install -m 0755 ${S}/mei-amt-check ${D}/${sbindir}
 }
-
diff --git a/meta-dts-distro/recipes-tests/converged-security-suite/bg-suite_2.7.0.bb b/meta-dts-distro/recipes-tests/converged-security-suite/bg-suite_2.7.0.bb
index 9f0a2708..22c201f4 100644
--- a/meta-dts-distro/recipes-tests/converged-security-suite/bg-suite_2.7.0.bb
+++ b/meta-dts-distro/recipes-tests/converged-security-suite/bg-suite_2.7.0.bb
@@ -1,6 +1,4 @@
-FILESEXTRAPATHS += "${THISDIR}/${PN}"
-
-DESCRIPTION = "Converged Security Suite's bg-suite"
+SUMMARY = "Converged Security Suite's bg-suite"
 HOMEPAGE = "https://github.com/9elements/converged-security-suite"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
diff --git a/meta-dts-distro/recipes-tests/converged-security-suite/txt-suite_2.6.0.bb b/meta-dts-distro/recipes-tests/converged-security-suite/txt-suite_2.6.0.bb
index 10ab37b1..5edd54f6 100644
--- a/meta-dts-distro/recipes-tests/converged-security-suite/txt-suite_2.6.0.bb
+++ b/meta-dts-distro/recipes-tests/converged-security-suite/txt-suite_2.6.0.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "Converged Security Suite's txt-suite"
+SUMMARY = "Converged Security Suite's txt-suite"
 HOMEPAGE = "https://github.com/9elements/converged-security-suite"
 SECTION = "devel"
 LICENSE = "BSD-3-Clause"
@@ -14,4 +14,4 @@ do_install() {
     install -m 0755 ${S}/txt-suite ${D}${bindir}
 }
 
-FILES_${PN} = "${bindir}/txt-suite"
+FILES:${PN} += "${bindir}/txt-suite"
diff --git a/meta-dts-distro/recipes-tests/dts-tests/dts-tests.bb b/meta-dts-distro/recipes-tests/dts-tests/dts-tests_1.0.bb
similarity index 79%
rename from meta-dts-distro/recipes-tests/dts-tests/dts-tests.bb
rename to meta-dts-distro/recipes-tests/dts-tests/dts-tests_1.0.bb
index dfc7832b..f909ebc3 100644
--- a/meta-dts-distro/recipes-tests/dts-tests/dts-tests.bb
+++ b/meta-dts-distro/recipes-tests/dts-tests/dts-tests_1.0.bb
@@ -1,3 +1,5 @@
+SUMMARY = "DTS cukinia tests"
+HOMEPAGE = "https://github.com/Dasharo/meta-dts"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
diff --git a/scripts/get_last_commit.sh b/scripts/get_last_commit.sh
index 8deb7734..8da25f88 100755
--- a/scripts/get_last_commit.sh
+++ b/scripts/get_last_commit.sh
@@ -8,6 +8,9 @@ while getopts "r:b:" arg; do
         b)
             branch="${OPTARG}"
             ;;
+        *)
+          exit 1
+          ;;
     esac
 done
 
diff --git a/scripts/local-ipxe-server.sh b/scripts/local-ipxe-server.sh
index 5a1816f0..367671b7 100755
--- a/scripts/local-ipxe-server.sh
+++ b/scripts/local-ipxe-server.sh
@@ -34,7 +34,7 @@ fi
 userIP=$(ip route get 1 | sed 's/^.*src \([^ ]*\).*$/\1/;q')
 error_check "cannot get user IP"
 
-distroVersion=$(cat ""$SCRIPTDIR"/../meta-dts-distro/conf/distro/dts-distro.conf" | grep -F "DISTRO_VERSION" | awk -F'"' '{print $2}')
+distroVersion=$(cat "$SCRIPTDIR/../meta-dts-distro/conf/distro/dts-distro.conf" | grep -F "DISTRO_VERSION" | awk -F'"' '{print $2}')
 error_check "cannot get distro version from 'meta-dts/meta-dts-distro/conf/distro/dts-distro.conf'"
 
 mkdir -p $SCRIPTDIR/ipxe-files
diff --git a/scripts/update_components.sh b/scripts/update_components.sh
index c29bc314..5fe5a67f 100755
--- a/scripts/update_components.sh
+++ b/scripts/update_components.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPTDIR=$(readlink -f $(dirname "$0"))
+SCRIPTDIR=$(readlink -f "$(dirname "$0")")
 ROOT=$(readlink -f "${SCRIPTDIR}/..")
 GET_LAST_COMMIT="${SCRIPTDIR}/get_last_commit.sh"
 CHANGELOG_FILE="$ROOT/CHANGELOG.md"
@@ -90,7 +90,7 @@ do_update() {
         line_number=$(grep -n '##' CHANGELOG.md | sed -n '2p' | cut -d ":" -f 1)
         result=$((line_number - 2))
 
-        sed ""$result"a\* Updated $1 to revision $last_commit" $CHANGELOG_FILE > $CHANGELOG_TMP_FILE
+        sed "$result a\* Updated $1 to revision $last_commit" $CHANGELOG_FILE > $CHANGELOG_TMP_FILE
         cp $CHANGELOG_TMP_FILE $CHANGELOG_FILE
         git add "${recipe_path}"
         git commit -F - <<< "${component_name}: update to ${last_commit}"

From 59b1eb709f72c3b42c5bb82d3705edbef28677b2 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Tue, 18 Jun 2024 13:23:33 +0200
Subject: [PATCH 46/99] recipes-bsp/txe-secure-boot/txesbmantool_git: Update
 revision

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
index aafc41e9..14e61a09 100644
--- a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
+++ b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
@@ -5,7 +5,7 @@ SRC_URI = " \
     git://github.com/Dasharo/coreboot.git;branch=txe_sb_tool;protocol=https \
 "
 
-SRCREV = "295c158e577400025d01e7ca8ad3beb64e1614a0"
+SRCREV = "235c946838dc8c619ff821c9791386d63f5cbd6a"
 
 LIC_FILES_CHKSUM = " \
     file://${WORKDIR}/git/LICENSES/GPL-2.0-only.txt;md5=5430828348d2cf7d4b5e8395f774a68e \

From 55f6c651a7bb11078267397887f69705334b1d5e Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Mon, 24 Jun 2024 13:33:18 +0200
Subject: [PATCH 47/99] Change pre-commit hook revisions

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 .pre-commit-config.yaml                       | 10 ++++----
 .../txe-secure-boot/smmstoretool_git.bb       | 21 +++++++++--------
 .../txe-secure-boot/txesbmantool_git.bb       | 23 ++++++++++---------
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a4d341d6..fe9af2bc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 default_stages: [pre-commit]
 
 default_install_hook_types: [pre-commit, commit-msg]
-exclude: .*\.patch$
+exclude: .*\.(patch)|(diff)$
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -42,7 +42,7 @@ repos:
         args: ["--severity=warning"]
 
   - repo: https://github.com/zarhus/oelint-adv
-    rev: 949111ff4d256af759aa5d94db9d0fb444679b2c
+    rev: 5.5.2-zarhus
     hooks:
       - id: oelint-adv
         args: [--rulefile=.oelint-ruleset.json, --hide=info, --quiet, --fix]
@@ -58,12 +58,12 @@ repos:
     hooks:
       - id: codespell
 
-  - repo: https://github.com/3mdeb/pre-commit-hook-branding
-    rev: 57bba1549352401e8a1c3617384a22458973fa7b
+  - repo: https://github.com/3mdeb/hooks
+    rev: v0.1.2
     hooks:
       - id: namespell
         args: [--fix]
-
+        exclude: meta-dts-distro/recipes-tests/converged-security-suite/bg-suite/bg-suite
 ci:
   autoupdate_commit_msg: 'pre-commit: autoupdate hooks'
   autofix_prs: false
diff --git a/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb b/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
index 11a4e895..6606a2b2 100644
--- a/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
+++ b/meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
@@ -1,5 +1,10 @@
-DESCRIPTION = "Offline SMMSTORE variable modification tool"
+SUMMARY = "Offline SMMSTORE variable modification tool"
+HOMEPAGE = "https://github.com/coreboot/coreboot"
+
 LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = " \
+    file://${WORKDIR}/git/LICENSES/GPL-2.0-or-later.txt;md5=261bea1168c0bdfa73232ee90df11eb6 \
+"
 
 SRC_URI = " \
     git://github.com/coreboot/coreboot.git;branch=main;protocol=https \
@@ -8,23 +13,19 @@ SRC_URI = " \
 
 SRCREV = "602653abed391ae1b1445ad86d0f05b8b5b678cb"
 
-LIC_FILES_CHKSUM = " \
-    file://${WORKDIR}/git/LICENSES/GPL-2.0-or-later.txt;md5=261bea1168c0bdfa73232ee90df11eb6 \
-"
-
 inherit pkgconfig
 
 S = "${WORKDIR}/git/util/smmstoretool"
 
 EXTRA_OEMAKE = ' \
-  DESTDIR="${D}" \
-  PREFIX="${prefix}" \
-'
+                DESTDIR="${D}" \
+                PREFIX="${prefix}" \
+                '
 
 do_install() {
     oe_runmake install
 }
 
-FILES:${PN} = " \
-   ${bindir}/smmstoretool \
+FILES:${PN} += " \
+    ${bindir}/smmstoretool \
 "
diff --git a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
index 14e61a09..3b5dee4d 100644
--- a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
+++ b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
@@ -1,5 +1,12 @@
-DESCRIPTION = "Utility for generating TXE Secure Boot manifests"
+SUMMARY = "Utility for generating TXE Secure Boot manifests"
+HOMEPAGE = "https://github.com/Dasharo/coreboot"
+
 LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = " \
+    file://${WORKDIR}/git/LICENSES/GPL-2.0-only.txt;md5=5430828348d2cf7d4b5e8395f774a68e \
+"
+
+DEPENDS += "wolfssl"
 
 SRC_URI = " \
     git://github.com/Dasharo/coreboot.git;branch=txe_sb_tool;protocol=https \
@@ -7,20 +14,14 @@ SRC_URI = " \
 
 SRCREV = "235c946838dc8c619ff821c9791386d63f5cbd6a"
 
-LIC_FILES_CHKSUM = " \
-    file://${WORKDIR}/git/LICENSES/GPL-2.0-only.txt;md5=5430828348d2cf7d4b5e8395f774a68e \
-"
-
 S = "${WORKDIR}/git/util/txesbmantool"
 
 inherit pkgconfig
 
-DEPENDS += "wolfssl"
-
 EXTRA_OEMAKE = ' \
-  DESTDIR="${D}" \
-  PREFIX="${prefix}" \
-'
+                DESTDIR="${D}" \
+                PREFIX="${prefix}" \
+                '
 
 do_configure:prepend(){
     export PKG_CONFIG_PATH="${STAGING_LIBDIR}/pkgconfig:${STAGING_DIR_HOST}/usr/lib/pkgconfig"
@@ -37,5 +38,5 @@ do_install() {
 INSANE_SKIP:${PN} += "ldflags"
 
 FILES:${PN} += " \
-   ${bindir}/txesbmantool \
+    ${bindir}/txesbmantool \
 "

From 1e200f24e03c338d737f54dd0887cbba30913763 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Fri, 5 Jul 2024 08:49:12 +0200
Subject: [PATCH 48/99] Add cpuid tool + cukinia test

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb  | 1 +
 meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb b/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
index 5f619a98..11b01d3a 100644
--- a/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
+++ b/meta-dts-distro/recipes-dts/packagegroups/packagegroup-dts.bb
@@ -40,6 +40,7 @@ RDEPENDS:${PN}-tools-base = " \
     iperf3 \
     txesbmantool \
     smmstoretool \
+    cpuid \
 "
 
 RDEPENDS:${PN}-tools-dts = " \
diff --git a/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf b/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf
index d44c4859..f3d4c804 100644
--- a/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf
+++ b/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf
@@ -22,4 +22,6 @@ as "Check if dasharo-hcl-report script exists" cukinia_test -x $(which dasharo-h
 as "Check if txesbmantool binary exists" cukinia_test -x $(which txesbmantool)
 as "Check if smmstoretool package can be started" cukinia_cmd smmstoretool -h
 
+as "Check if cpuid has the -l option" cukinia_cmd cpuid -l 0x1a | grep CPU
+
 cukinia_log "result: $cukinia_failures failure(s)"

From c6476c754586e56cc466002365ba108acb972f45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Tue, 9 Jul 2024 10:07:44 +0200
Subject: [PATCH 49/99] dts-distro.conf: bump to v2.0.0-rc1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 meta-dts-distro/conf/distro/dts-distro.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/conf/distro/dts-distro.conf b/meta-dts-distro/conf/distro/dts-distro.conf
index 348208e9..9d1c3c01 100644
--- a/meta-dts-distro/conf/distro/dts-distro.conf
+++ b/meta-dts-distro/conf/distro/dts-distro.conf
@@ -4,7 +4,7 @@ DISTRO = "dts-distro"
 
 # distro name
 DISTRO_NAME = "Dasharo Tools Suite"
-DISTRO_VERSION = "1.2.23"
+DISTRO_VERSION = "2.0.0-rc1"
 SDK_VENDOR = "-dtssdk"
 
 MAINTAINER = "3mdeb Sp. z o. o. <contact@3mdeb.com>"

From e50e133b1e2d544e52ce0c8eec34d8603afb3ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Wed, 10 Jul 2024 14:25:43 +0200
Subject: [PATCH 50/99] openssh_%.bbappend: use sshd.service instead of
 sshd.socket
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

sshd.service was autogenerated by systemd as init.d script and was not
disabled so we can just use sshd.service explicitly and it will be
disabled by default.

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 meta-dts-distro/recipes-connectivity/openssh/openssh_%.bbappend | 1 +
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-connectivity/openssh/openssh_%.bbappend b/meta-dts-distro/recipes-connectivity/openssh/openssh_%.bbappend
index 51a273a5..a18f4d3e 100644
--- a/meta-dts-distro/recipes-connectivity/openssh/openssh_%.bbappend
+++ b/meta-dts-distro/recipes-connectivity/openssh/openssh_%.bbappend
@@ -1,3 +1,4 @@
+PACKAGECONFIG += "systemd-sshd-service-mode"
 SYSTEMD_AUTO_ENABLE:${PN}-sshd = "disable"
 
 do_install:append() {
diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index b85e86eb..c43d0ca2 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "019212bf44a5fade576e4d02c9f093cffda6af8e"
+SRCREV = "1932a7823e3a751ddc039068a6e7558ab4170d8d"
 
 S = "${WORKDIR}/git"
 

From 15102e13014369c4e7a728153a98b57b9da9b5c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Thu, 11 Jul 2024 16:54:59 +0200
Subject: [PATCH 51/99] workflow: Change action and jobs names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Develop workflow doesn't deploy to GitHub Releases page.

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 .github/workflows/ci.yml      | 6 +++---
 .github/workflows/develop.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b9877003..bc08ad8e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,5 @@
 ---
-name: CI on push tag
+name: CI on push release tag
 on:
   push:
     tags:
@@ -41,7 +41,7 @@ jobs:
             echo "At least one build attempt succeeded."
           fi
   deploy-images:
-    name: Deploy DTS artifacts on boot.dasharo.com
+    name: Deploy DTS artifacts on boot.dasharo.com and GitHub Release
     if: ${{ always() && contains(join(needs.*.result, ','), 'success') }}
     needs: build
     runs-on:
@@ -127,7 +127,7 @@ jobs:
         run: |
           ./meta-dts/scripts/generate-ipxe-menu.sh ${{ env.DTS_VER }}
           scp -i ~/.ssh/dts-ci-key dts.ipxe builder@10.1.40.2:boot/dts/
-      - name: Trigger signing
+      - name: Trigger signing and deploy to GitHub Release tab
         shell: bash
         run: |
           DTS_VER="${{ env.DTS_VER }}"
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index 04e6dd1d..c7edc37d 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -1,5 +1,5 @@
 ---
-name: CI on push to develop
+name: CI on push develop tag
 on:
   push:
     tags:
@@ -40,7 +40,7 @@ jobs:
             echo "At least one build attempt succeeded."
           fi
   deploy-images:
-    name: Deploy DTS artifacts on GitHub Releases tab
+    name: Deploy DTS artifacts on boot.dasharo.com
     if: ${{ always() && contains(join(needs.*.result, ','), 'success') }}
     needs: build
     runs-on:

From b4b9b98ac771eeeb8d33396f119a3f9e1101b00f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Tue, 9 Jul 2024 15:14:39 +0200
Subject: [PATCH 52/99] dts-base-image.inc: Remove 'rootfs' suffix from image
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 meta-dts-distro/recipes-dts/images/dts-base-image.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-dts-distro/recipes-dts/images/dts-base-image.inc b/meta-dts-distro/recipes-dts/images/dts-base-image.inc
index eb833e6c..e9b09c91 100644
--- a/meta-dts-distro/recipes-dts/images/dts-base-image.inc
+++ b/meta-dts-distro/recipes-dts/images/dts-base-image.inc
@@ -6,6 +6,8 @@ LICENSE = "MIT"
 
 inherit core-image
 
+IMAGE_NAME_SUFFIX = ""
+
 IMAGE_INSTALL:append = " \
     packagegroup-dts-python \
     packagegroup-dts-system \

From b29cbfd7996ce2d9b5043cde4acfc7df3fcd612c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Tue, 9 Jul 2024 14:49:25 +0200
Subject: [PATCH 53/99] dts-scripts: Update revision
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index c43d0ca2..98f216dc 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -3,12 +3,12 @@ HOMEPAGE = "https://github.com/Dasharo/dts-scripts"
 SECTION = "tools"
 
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded4771514fcc  "
+LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded4771514fcc"
 
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "1932a7823e3a751ddc039068a6e7558ab4170d8d"
+SRCREV = "ce1c0e9038f142169339c4f2efeb4b7f8a0a86c1"
 
 S = "${WORKDIR}/git"
 

From d4f9a6d34e3daa8e62b3840ff443b3338339ab4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Wed, 10 Jul 2024 14:54:06 +0200
Subject: [PATCH 54/99] dts-scripts: Add python3-semver dependency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 98f216dc..60f454fb 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -23,6 +23,7 @@ RDEPENDS:${PN} = " \
     dmidecode \
     acpi-call-dkms \
     iotools \
+    python3-semver \
 "
 
 do_configure[noexec] = "1"

From 34da98777b0f629de5ec1adc45091c3dda16c880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Wed, 10 Jul 2024 15:42:25 +0200
Subject: [PATCH 55/99] tests: cukinia: Add semver module check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf b/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf
index f3d4c804..18bdab92 100644
--- a/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf
+++ b/meta-dts-distro/recipes-tests/dts-tests/dts-tests/cukinia.conf
@@ -24,4 +24,6 @@ as "Check if smmstoretool package can be started" cukinia_cmd smmstoretool -h
 
 as "Check if cpuid has the -l option" cukinia_cmd cpuid -l 0x1a | grep CPU
 
+cukinia_python_pkg semver
+
 cukinia_log "result: $cukinia_failures failure(s)"

From c39030f78af1079b576b3349747e5f7dfa48c245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kope=C4=87?= <michal.kopec@3mdeb.com>
Date: Wed, 17 Jul 2024 11:22:21 +0200
Subject: [PATCH 56/99] meta-dts-distro/recipes-support/dasharo-ectool: bump
 rev for Dasharo ACPI ID
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Kopeć <michal.kopec@3mdeb.com>
---
 .../recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb b/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
index 843941b0..239ecf45 100644
--- a/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
+++ b/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
@@ -1,7 +1,7 @@
 inherit cargo
 inherit pkgconfig
 
-SUMMARY = "System76 Open Source Embedded Controller"
+SUMMARY = "Dasharo Open Source Embedded Controller utility"
 HOMEPAGE = "https://github.com/Dasharo/ec"
 
 LICENSE = "MIT"
@@ -40,7 +40,7 @@ SRC_URI:append = " \
     crate://crates.io/winapi/0.3.9 \
 "
 
-SRCREV = "2b2c17ac6e61f45e0fc1bcf6b907a8289f37bcc4"
+SRCREV = "4ae73b9d2cc2ec34c760c7774a7859d240c4c8dd"
 
 SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

From 89e2f3107d97a44f5183c9d62d8e6c81cb9e2cfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Tue, 9 Jul 2024 12:00:56 +0200
Subject: [PATCH 57/99] CHANGELOG.md: Add v2.0.0-rc2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 CHANGELOG.md | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b5a0722..18c6d90d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,20 +2,22 @@
 
 All notable changes to the DTS project will be documented in this file.
 
-## v1.2.23 - 2024-06-27
-
-* Hotfix for PC Engines SeaBIOS firmware variant deployment
-
-## v1.2.22 - 2024-06-27
-
-* Extended Dasharo zero-touch initial deployment on PCEngines APU2 platforms for
-  [DES](https://docs.dasharo.com/ways-you-can-help-us/#become-a-dasharo-entry-subscription-subscriber)
-  users with SeaBIOS firmware variant, in addition to UEFI variant.
-* Increase supported Dasharo (coreboot + heads) version from  v0.9.0 to v0.9.1
-  for NovaCustom NV4x 12th Gen series
-* Include new tools into the image: `python3-roca-detect`, `iperf3`, `lshw`
-* Fix [Dell Optiplex 7010 initial deployment](https://github.com/Dasharo/dasharo-issues/issues/706)
-* Update versions of coreboot-utils
+## v2.0.0-rc2 - 2024-07-09
+
+* Add support for MTL
+* Remove separate EC update
+* Updated Linux kernel to version 6.6.23
+* Update most of system libraries and applications to newer version
+* Don't use ICMP for network connection verification
+* Update coreboot tools to revision d08d5eaa98b1204b5e665d3ae4f63fb6f84a0d77
+* Update dasharo_ectool to revision 4ae73b9d2cc2ec34c760c7774a7859d240c4c8dd
+* Fixed scp not working without `-O` option
+* Add txesbmantool, revision 235c946838dc8c619ff821c9791386d63f5cbd6a
+* Add smmstoretool, revision 602653abed391ae1b1445ad86d0f05b8b5b678cb
+* Add cpuid tool
+* Add more cukinia tests
+* Add and use python semver module to compare versions
+* Use sshd.service instead of sshd.socket
 
 ## v1.2.21 - 2024-03-29
 

From eb7012586feefcebc6deadd0e342c9d9bda1a62c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Thu, 18 Jul 2024 14:28:46 +0200
Subject: [PATCH 58/99] dts-distro.conf: bump version to 2.0.0-rc2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 meta-dts-distro/conf/distro/dts-distro.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/conf/distro/dts-distro.conf b/meta-dts-distro/conf/distro/dts-distro.conf
index 9d1c3c01..93246424 100644
--- a/meta-dts-distro/conf/distro/dts-distro.conf
+++ b/meta-dts-distro/conf/distro/dts-distro.conf
@@ -4,7 +4,7 @@ DISTRO = "dts-distro"
 
 # distro name
 DISTRO_NAME = "Dasharo Tools Suite"
-DISTRO_VERSION = "2.0.0-rc1"
+DISTRO_VERSION = "2.0.0-rc2"
 SDK_VENDOR = "-dtssdk"
 
 MAINTAINER = "3mdeb Sp. z o. o. <contact@3mdeb.com>"

From b10342019b72efe3fa1af865937748b2cdadeb8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Thu, 18 Jul 2024 18:37:59 +0200
Subject: [PATCH 59/99] dts-scripts: Change to rev removing separate EC update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 CHANGELOG.md                                               | 1 -
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18c6d90d..f629880b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,6 @@ All notable changes to the DTS project will be documented in this file.
 ## v2.0.0-rc2 - 2024-07-09
 
 * Add support for MTL
-* Remove separate EC update
 * Updated Linux kernel to version 6.6.23
 * Update most of system libraries and applications to newer version
 * Don't use ICMP for network connection verification
diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 60f454fb..298d4ab6 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "ce1c0e9038f142169339c4f2efeb4b7f8a0a86c1"
+SRCREV = "3477ab69b7658a383f32e5dc3520416a409243dd"
 
 S = "${WORKDIR}/git"
 

From aa8788fb4c1bf0b4ba1c8a0ea8be7be3fcce22a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Thu, 18 Jul 2024 18:46:27 +0200
Subject: [PATCH 60/99] dasharo-ectool: automatically get PV hash from SRCCREV
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 .../recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb b/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
index 239ecf45..df2f51a5 100644
--- a/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
+++ b/meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
 "
 
 DEPENDS += "hidapi"
-PV:append = ".AUTOINC+411fab9b7c"
+PV:append = ".AUTOINC+${@d.getVar('SRCREV')[:10]}"
 SRC_URI = "gitsm://github.com/Dasharo/ec.git;protocol=https;nobranch=1"
 
 CARGO_SRC_DIR = "/tool/"

From 22054d88251cc23ec447473ed3a07aee62b77d14 Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Thu, 18 Jul 2024 19:49:38 +0200
Subject: [PATCH 61/99] Revert "dts-scripts: Change to rev removing separate EC
 update"

This reverts commit 5097225d5d8c6ef3c9eae4c181d9cd199023ecc2.
---
 CHANGELOG.md                                               | 1 +
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f629880b..18c6d90d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to the DTS project will be documented in this file.
 ## v2.0.0-rc2 - 2024-07-09
 
 * Add support for MTL
+* Remove separate EC update
 * Updated Linux kernel to version 6.6.23
 * Update most of system libraries and applications to newer version
 * Don't use ICMP for network connection verification
diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 298d4ab6..60f454fb 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "3477ab69b7658a383f32e5dc3520416a409243dd"
+SRCREV = "ce1c0e9038f142169339c4f2efeb4b7f8a0a86c1"
 
 S = "${WORKDIR}/git"
 

From acde9e1ddb2da6e42e30d22a8db532b75e6727d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Thu, 18 Jul 2024 18:37:59 +0200
Subject: [PATCH 62/99] dts-scripts: Change to rev removing separate EC update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 CHANGELOG.md                                               | 1 -
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18c6d90d..f629880b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,6 @@ All notable changes to the DTS project will be documented in this file.
 ## v2.0.0-rc2 - 2024-07-09
 
 * Add support for MTL
-* Remove separate EC update
 * Updated Linux kernel to version 6.6.23
 * Update most of system libraries and applications to newer version
 * Don't use ICMP for network connection verification
diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 60f454fb..298d4ab6 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "ce1c0e9038f142169339c4f2efeb4b7f8a0a86c1"
+SRCREV = "3477ab69b7658a383f32e5dc3520416a409243dd"
 
 S = "${WORKDIR}/git"
 

From 579556c347c38d70c099bfba8331bd0e565cab1b Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Thu, 18 Jul 2024 21:13:34 +0200
Subject: [PATCH 63/99] dts-distro.conf: bump to 2.0.0-rc3

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 meta-dts-distro/conf/distro/dts-distro.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/conf/distro/dts-distro.conf b/meta-dts-distro/conf/distro/dts-distro.conf
index 93246424..f44d62b0 100644
--- a/meta-dts-distro/conf/distro/dts-distro.conf
+++ b/meta-dts-distro/conf/distro/dts-distro.conf
@@ -4,7 +4,7 @@ DISTRO = "dts-distro"
 
 # distro name
 DISTRO_NAME = "Dasharo Tools Suite"
-DISTRO_VERSION = "2.0.0-rc2"
+DISTRO_VERSION = "2.0.0-rc3"
 SDK_VENDOR = "-dtssdk"
 
 MAINTAINER = "3mdeb Sp. z o. o. <contact@3mdeb.com>"

From 61b7be07f3b5a85b1f342a8e68181b8b3be68a76 Mon Sep 17 00:00:00 2001
From: Daniil Klimuk <daniil.klimuk@3mdeb.com>
Date: Wed, 19 Jun 2024 17:24:12 +0200
Subject: [PATCH 64/99] distro: recipes-extended: minio-cli: add

Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
---
 .../minio-cli/minio-cli_git.bb                | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 meta-dts-distro/recipes-extended/minio-cli/minio-cli_git.bb

diff --git a/meta-dts-distro/recipes-extended/minio-cli/minio-cli_git.bb b/meta-dts-distro/recipes-extended/minio-cli/minio-cli_git.bb
new file mode 100644
index 00000000..55cf8b91
--- /dev/null
+++ b/meta-dts-distro/recipes-extended/minio-cli/minio-cli_git.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Simple and fasst CLI tool to manage MinIO deployments."
+HOMEPAGE = "https://min.io/docs/minio/linux/reference/minio-mc.html"
+SECTION = "net"
+
+GO_IMPORT = "github.com/minio/mc"
+
+inherit go-mod
+
+LICENSE = "AGPL-3.0"
+LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=eb1e647870add0502f8f010b19de32af"
+
+SRC_URI = "git://${GO_IMPORT};protocol=https;branch=master"
+SRCREV = "e7c9a733c680fe62066d24e8718f81938b4f6606"
+
+FILES:${PN} += "${bindir}/mc"
+
+# MinIO CLI depends on getent which is a part of glibc-utils.
+RDEPENDS:${PN} = "glibc-utils"
+# github.com/minio/mc has some Bash scripts.
+RDEPENDS:${PN}-dev = "bash"

From ab3221d10a58199ad3d6af9e93e77277a49cbbf5 Mon Sep 17 00:00:00 2001
From: Daniil Klimuk <daniil.klimuk@3mdeb.com>
Date: Mon, 24 Jun 2024 15:42:02 +0200
Subject: [PATCH 65/99] distro: recipes-dts: dts-scripts: add DES packaging
 support

Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 6 +++++-
 meta-dts-distro/recipes-dts/images/dts-base-image.inc      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 298d4ab6..2853439d 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "3477ab69b7658a383f32e5dc3520416a409243dd"
+SRCREV = "db23885453000db1f5f6f7a26249c768c87353cb"
 
 S = "${WORKDIR}/git"
 
@@ -24,6 +24,10 @@ RDEPENDS:${PN} = " \
     acpi-call-dkms \
     iotools \
     python3-semver \
+    rpm \
+    jq \
+    minio-cli \
+    dnf \
 "
 
 do_configure[noexec] = "1"
diff --git a/meta-dts-distro/recipes-dts/images/dts-base-image.inc b/meta-dts-distro/recipes-dts/images/dts-base-image.inc
index e9b09c91..6ed64d32 100644
--- a/meta-dts-distro/recipes-dts/images/dts-base-image.inc
+++ b/meta-dts-distro/recipes-dts/images/dts-base-image.inc
@@ -1,6 +1,6 @@
 SUMMARY = "DTS image"
 
-IMAGE_FEATURES += "ssh-server-openssh debug-tweaks"
+IMAGE_FEATURES += "ssh-server-openssh debug-tweaks package-management"
 
 LICENSE = "MIT"
 

From 8b5a9377cfde039ee969c9c087863c3362d8c72d Mon Sep 17 00:00:00 2001
From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
Date: Fri, 26 Jul 2024 12:50:39 +0200
Subject: [PATCH 66/99] dts-scripts: update SRCREV

Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 2853439d..0997add1 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "db23885453000db1f5f6f7a26249c768c87353cb"
+SRCREV = "493ef2985e94421fb0818db4c1e08ab020b40d5a"
 
 S = "${WORKDIR}/git"
 

From 0a41173d13c391aa25392134bc72ebab8591cda3 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Thu, 25 Jul 2024 11:30:37 +0200
Subject: [PATCH 67/99] recipes-bsp/txe-secure-boot/txesbmantool_git.bb: Bump
 SRCREV

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
index 3b5dee4d..7b2a41ad 100644
--- a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
+++ b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
@@ -12,7 +12,7 @@ SRC_URI = " \
     git://github.com/Dasharo/coreboot.git;branch=txe_sb_tool;protocol=https \
 "
 
-SRCREV = "235c946838dc8c619ff821c9791386d63f5cbd6a"
+SRCREV = "d6a30f4fd3a7fca9551eefa9730f5c0f09328043"
 
 S = "${WORKDIR}/git/util/txesbmantool"
 

From d006e781e4114277f3cec97b2ff26fa6a6e08ec7 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Wed, 24 Jul 2024 11:43:02 +0200
Subject: [PATCH 68/99] .github/workflows: Use separate SSH config for deploy
 job

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 .github/workflows/ci.yml      | 17 +++++++----------
 .github/workflows/develop.yml | 17 +++++++----------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bc08ad8e..292f1e68 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,18 +51,17 @@ jobs:
         shell: bash
         env:
           SSH_KEY: ${{secrets.SSH_KEY}}
-          SSH_KEY_GITEA: ${{secrets.SSH_KEY_GITEA}}
+          SSH_KEY_CI_CD: ${{secrets.SSH_KEY_CI_CD}}
         run: |
           echo -e ${SSH_KEY} > ~/.ssh/dts-ci-key
           chmod 600 ~/.ssh/dts-ci-key
-          echo -e ${SSH_KEY_GITEA} > ~/.ssh/gitea-key
-          chmod 600 ~/.ssh/gitea-key
-          cp ~/.ssh/config ~/.ssh/config-old
+          echo -e ${SSH_KEY_CI_CD} > ~/.ssh/gitea_dts_release_cicd
+          chmod 600 ~/.ssh/gitea_dts_release_cicd
           echo -e "\n
           Host git.3mdeb.com\n
           HostName       git.3mdeb.com\n
-          IdentityFile   ~/.ssh/gitea-key\n
-          IdentitiesOnly yes" >> ~/.ssh/config
+          IdentityFile   ~/.ssh/gitea_dts_release_cicd\n
+          IdentitiesOnly yes" > ~/.ssh/config_deploy
       - name: Get DTS version
         id: dts-ver
         shell: bash
@@ -131,7 +130,7 @@ jobs:
         shell: bash
         run: |
           DTS_VER="${{ env.DTS_VER }}"
-          git clone ssh://git@git.3mdeb.com:2222/3mdeb/dts-release-cicd-pipeline.git
+          GIT_SSH_COMMAND='ssh -F ~/.ssh/config_deploy' git clone ssh://git@git.3mdeb.com:2222/3mdeb/dts-release-cicd-pipeline.git
           cd dts-release-cicd-pipeline
           echo ${DTS_VER} > LATEST_RELEASE
           git add LATEST_RELEASE
@@ -152,7 +151,5 @@ jobs:
         run: |
           rm -rf ~/.ssh/dts-ci-key
           rm -rf dts-release-cicd-pipeline
-          rm -f ~/.ssh/gitea-key
+          rm -f ~/.ssh/gitea_dts_release_cicd
           rm -rf build
-          rm -f ~/.ssh/config
-          mv ~/.ssh/config-old ~/.ssh/config
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index c7edc37d..d98373bc 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -50,18 +50,17 @@ jobs:
         shell: bash
         env:
           SSH_KEY: ${{secrets.SSH_KEY}}
-          SSH_KEY_GITEA: ${{secrets.SSH_KEY_GITEA}}
+          SSH_KEY_CI_CD: ${{secrets.SSH_KEY_CI_CD}}
         run: |
           echo -e ${SSH_KEY} > ~/.ssh/dts-ci-key
           chmod 600 ~/.ssh/dts-ci-key
-          echo -e ${SSH_KEY_GITEA} > ~/.ssh/gitea-key
-          chmod 600 ~/.ssh/gitea-key
-          cp ~/.ssh/config ~/.ssh/config-old
+          echo -e ${SSH_KEY_CI_CD} > ~/.ssh/gitea_dts_release_cicd
+          chmod 600 ~/.ssh/gitea_dts_release_cicd
           echo -e "\n
           Host git.3mdeb.com\n
           HostName       git.3mdeb.com\n
-          IdentityFile   ~/.ssh/gitea-key\n
-          IdentitiesOnly yes" >> ~/.ssh/config
+          IdentityFile   ~/.ssh/gitea_dts_release_cicd\n
+          IdentitiesOnly yes" > ~/.ssh/config_deploy
       - name: Get DTS version
         id: dts-ver
         shell: bash
@@ -122,7 +121,7 @@ jobs:
         shell: bash
         run: |
           DTS_VER="${{ env.DTS_VER }}"
-          git clone ssh://git@git.3mdeb.com:2222/3mdeb/dts-release-cicd-pipeline.git
+          GIT_SSH_COMMAND='ssh -F ~/.ssh/config_deploy' git clone ssh://git@git.3mdeb.com:2222/3mdeb/dts-release-cicd-pipeline.git
           cd dts-release-cicd-pipeline
           echo ${DTS_VER} > LATEST_RELEASE
           git add LATEST_RELEASE
@@ -143,7 +142,5 @@ jobs:
         run: |
           rm -rf ~/.ssh/dts-ci-key
           rm -rf dts-release-cicd-pipeline
-          rm -f ~/.ssh/gitea-key
+          rm -f ~/.ssh/gitea_dts_release_cicd
           rm -rf build
-          rm -f ~/.ssh/config
-          mv ~/.ssh/config-old ~/.ssh/config

From be7e728e98b08682f1c1d00303bf85ec1d82d244 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Fri, 2 Aug 2024 09:18:13 +0200
Subject: [PATCH 69/99] recipes-bsp: txesbmantool: Change branch and SRCREV

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 .../recipes-bsp/txe-secure-boot/txesbmantool_git.bb           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
index 7b2a41ad..a85ac968 100644
--- a/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
+++ b/meta-dts-distro/recipes-bsp/txe-secure-boot/txesbmantool_git.bb
@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = " \
 DEPENDS += "wolfssl"
 
 SRC_URI = " \
-    git://github.com/Dasharo/coreboot.git;branch=txe_sb_tool;protocol=https \
+    git://github.com/Dasharo/coreboot.git;branch=dasharo;protocol=https \
 "
 
-SRCREV = "d6a30f4fd3a7fca9551eefa9730f5c0f09328043"
+SRCREV = "4706227e009b758a1bebace99f5bfba431874d7a"
 
 S = "${WORKDIR}/git/util/txesbmantool"
 

From 888c07b42c0cbe51ab2f9ec58b8a22787ae6dcb8 Mon Sep 17 00:00:00 2001
From: Daniil Klimuk <daniil.klimuk@3mdeb.com>
Date: Fri, 2 Aug 2024 10:09:38 +0200
Subject: [PATCH 70/99] distro: extended: minio-cli: amend absolete-license

Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
---
 meta-dts-distro/recipes-extended/minio-cli/minio-cli_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-extended/minio-cli/minio-cli_git.bb b/meta-dts-distro/recipes-extended/minio-cli/minio-cli_git.bb
index 55cf8b91..06b8d4d0 100644
--- a/meta-dts-distro/recipes-extended/minio-cli/minio-cli_git.bb
+++ b/meta-dts-distro/recipes-extended/minio-cli/minio-cli_git.bb
@@ -6,7 +6,7 @@ GO_IMPORT = "github.com/minio/mc"
 
 inherit go-mod
 
-LICENSE = "AGPL-3.0"
+LICENSE = "AGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=eb1e647870add0502f8f010b19de32af"
 
 SRC_URI = "git://${GO_IMPORT};protocol=https;branch=master"

From 8380e8c44ab68c4035cebfb1f17e5f0e9640eb1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Mon, 5 Aug 2024 11:47:40 +0200
Subject: [PATCH 71/99] .oelint-ruleset.json: Set homepageping to info so
 pre-commit ci can run
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 .oelint-ruleset.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.oelint-ruleset.json b/.oelint-ruleset.json
index 1337cefa..68b2b028 100644
--- a/.oelint-ruleset.json
+++ b/.oelint-ruleset.json
@@ -134,7 +134,7 @@
   "oelint.vars.fileextrapathsop": "error",
   "oelint.var.filesoverride": "warning",
   "oelint.vars.homepageprefix": "warning",
-  "oelint.vars.homepageping": "warning",
+  "oelint.vars.homepageping": "info",
   "oelint.vars.insaneskip": "info",
   "oelint.var.licenseremotefile": "info",
   "oelint.vars.licensesdpx": "warning",

From 431b70b85cc459b42088acd382be86b5fbdb5a53 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Wed, 28 Aug 2024 15:09:43 +0200
Subject: [PATCH 72/99] conf/distro/dts-distro.conf: Bump DISTRO_VERSION to
 2.0.0-rc5

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 meta-dts-distro/conf/distro/dts-distro.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/conf/distro/dts-distro.conf b/meta-dts-distro/conf/distro/dts-distro.conf
index f44d62b0..d783f174 100644
--- a/meta-dts-distro/conf/distro/dts-distro.conf
+++ b/meta-dts-distro/conf/distro/dts-distro.conf
@@ -4,7 +4,7 @@ DISTRO = "dts-distro"
 
 # distro name
 DISTRO_NAME = "Dasharo Tools Suite"
-DISTRO_VERSION = "2.0.0-rc3"
+DISTRO_VERSION = "2.0.0-rc5"
 SDK_VENDOR = "-dtssdk"
 
 MAINTAINER = "3mdeb Sp. z o. o. <contact@3mdeb.com>"

From fca7159d2b03fc1c363344dd83a09c6cb9bb7998 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Wed, 28 Aug 2024 15:17:05 +0200
Subject: [PATCH 73/99] CHANGELOG: Add change notes v2.0.0-rc5

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f629880b..f5470c46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to the DTS project will be documented in this file.
 
+## v2.0.0-rc5
+
+* recipes-bsp/txe-secure-boot/txesbmantool_git.bb: Bump SRCREV
+* .github/workflows: Use separate SSH config for deploy job
+* recipes-bsp: txesbmantool: Change branch and SRCREV
+* distro: extended: minio-cli: amend absolete-license
+* .oelint-ruleset.json: Set homepageping to info so pre-commit ci can run
+* conf/distro/dts-distro.conf: Bump DISTRO_VERSION to 2.0.0-rc5
+
 ## v2.0.0-rc2 - 2024-07-09
 
 * Add support for MTL

From da582acb733db5c9e2763f2de1f8b7cb9f8d6cd3 Mon Sep 17 00:00:00 2001
From: Alan Ostrowski <alan.ostrowski@3mdeb.com>
Date: Wed, 28 Aug 2024 16:33:03 +0200
Subject: [PATCH 74/99] 
 meta-dts/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb: SRCREV
 update

Signed-off-by: Alan Ostrowski <alan.ostrowski@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 0997add1..9f23d4fa 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "493ef2985e94421fb0818db4c1e08ab020b40d5a"
+SRCREV = "6392a59cf3713447e0559a069fe3da72ba2112d7"
 
 S = "${WORKDIR}/git"
 

From c3e252264da042d4eb55303cdba8637be27dcd63 Mon Sep 17 00:00:00 2001
From: Daniil Klimuk <daniil.klimuk@3mdeb.com>
Date: Wed, 28 Aug 2024 19:23:11 +0200
Subject: [PATCH 75/99] scripts: generate-ipxe-menu: delete root=/dev/nfs

Signed-off-by: Daniil Klimuk <daniil.klimuk@3mdeb.com>
---
 scripts/generate-ipxe-menu.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate-ipxe-menu.sh b/scripts/generate-ipxe-menu.sh
index 8226d4e2..712a8898 100755
--- a/scripts/generate-ipxe-menu.sh
+++ b/scripts/generate-ipxe-menu.sh
@@ -36,6 +36,6 @@ set path_initrd \${dts_prefix}/dts-base-image-\${dts_version}.cpio.gz
 imgfetch --name file_kernel \${path_kernel}
 imgfetch --name file_initrd \${path_initrd}
 
-kernel file_kernel root=/dev/nfs initrd=file_initrd
+kernel file_kernel initrd=file_initrd
 boot
 EOF

From bb0787ace2f0e182707c4ec987fc4d4a2744d72b Mon Sep 17 00:00:00 2001
From: Tymoteusz Burak <tymoteusz.burak@3mdeb.com>
Date: Fri, 6 Sep 2024 16:38:00 +0200
Subject: [PATCH 76/99] python/python3-binwalk_2.3.3.bb: changed src to updated
 fork

See related issues:
https://github.com/ReFirmLabs/binwalk/issues/671
https://github.com/ReFirmLabs/binwalk/pull/675
---
 ...{python3-binwalk_2.3.3.bb => python3-binwalk_2.4.2.bb} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-dts-distro/recipes-devtool/python/{python3-binwalk_2.3.3.bb => python3-binwalk_2.4.2.bb} (77%)

diff --git a/meta-dts-distro/recipes-devtool/python/python3-binwalk_2.3.3.bb b/meta-dts-distro/recipes-devtool/python/python3-binwalk_2.4.2.bb
similarity index 77%
rename from meta-dts-distro/recipes-devtool/python/python3-binwalk_2.3.3.bb
rename to meta-dts-distro/recipes-devtool/python/python3-binwalk_2.4.2.bb
index fee131a4..3c6f11a3 100644
--- a/meta-dts-distro/recipes-devtool/python/python3-binwalk_2.3.3.bb
+++ b/meta-dts-distro/recipes-devtool/python/python3-binwalk_2.4.2.bb
@@ -3,16 +3,16 @@
 # (Feel free to remove these comments when editing.)
 
 SUMMARY = "Firmware analysis tool"
-HOMEPAGE = "https://github.com/ReFirmLabs/binwalk"
+HOMEPAGE = "https://github.com/OSPG/binwalk"
 # WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is
 # your responsibility to verify that the values are complete and correct.
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=65bbee055d3ea3bfc475f07aecf4de64"
 
-PV = "2.3.3+git${SRCPV}"
-SRC_URI = "git://github.com/ReFirmLabs/binwalk;protocol=https;branch=master"
+PV = "2.4.2+git${SRCPV}"
+SRC_URI = "git://github.com/OSPG/binwalk;protocol=https;branch=master"
 # Modify these as desired
-SRCREV = "fa0c0bd59b8588814756942fe4cb5452e76c1dcd"
+SRCREV = "3dd13d7fd890f662ac6c75344906ebe50524200e"
 
 S = "${WORKDIR}/git"
 

From 2442ec338def833bb3d1382267fb6ad93d9ecf66 Mon Sep 17 00:00:00 2001
From: Tymoteusz Burak <tymoteusz.burak@3mdeb.com>
Date: Mon, 9 Sep 2024 13:51:16 +0200
Subject: [PATCH 77/99] meta-dts-distro/conf/layer.conf: bump layer priority

Addresses https://github.com/Dasharo/dasharo-issues/issues/769
---
 meta-dts-distro/conf/layer.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/conf/layer.conf b/meta-dts-distro/conf/layer.conf
index a9424ab2..7bbf2265 100644
--- a/meta-dts-distro/conf/layer.conf
+++ b/meta-dts-distro/conf/layer.conf
@@ -6,7 +6,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "dts-distro"
 BBFILE_PATTERN_dts-distro = "^${LAYERDIR}/"
-BBFILE_PRIORITY_dts-distro = "1"
+BBFILE_PRIORITY_dts-distro = "9"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers

From a1b2f5bdac79250246d26554ba7cf52f9ae0ccfa Mon Sep 17 00:00:00 2001
From: Tymoteusz Burak <tymoteusz.burak@3mdeb.com>
Date: Wed, 11 Sep 2024 15:19:49 +0200
Subject: [PATCH 78/99] meta-dts-distro/recipes-devtool: remove outdated
 python3-uefi-firmware

See https://github.com/Dasharo/meta-dts/pull/158#issuecomment-2343650673
---
 .../python/python3-uefi-firmware_1.9.bb            | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 meta-dts-distro/recipes-devtool/python/python3-uefi-firmware_1.9.bb

diff --git a/meta-dts-distro/recipes-devtool/python/python3-uefi-firmware_1.9.bb b/meta-dts-distro/recipes-devtool/python/python3-uefi-firmware_1.9.bb
deleted file mode 100644
index 80b44071..00000000
--- a/meta-dts-distro/recipes-devtool/python/python3-uefi-firmware_1.9.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-
-SUMMARY = "Various data structures and parsing tools for UEFI firmware."
-AUTHOR = "Teddy Reed <teddy@prosauce.org>"
-HOMEPAGE = "https://github.com/theopolis/uefi-firmware-parser"
-LICENSE = "BSD-2-Clause & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://setup.py;md5=90fa5bae1547550f1c1993f651eda955"
-
-SRC_URI = "https://files.pythonhosted.org/packages/7e/b4/a4ec646d24a1aad709fdb83de6e5eddd6cb24faec02f3a94a3af3b0aba28/uefi_firmware-1.9.tar.gz"
-SRC_URI[md5sum] = "ee5011b4d0bcb0eb7c06295e0107894f"
-SRC_URI[sha256sum] = "234119dd92780c67cce3b664e86119c41d0b2af188d7f372b69789b32c5d5cd0"
-
-S = "${WORKDIR}/uefi_firmware-1.9"
-
-inherit setuptools3

From 3915cb073d22995cb52545f04161795c72037f21 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Tue, 10 Sep 2024 16:52:24 +0200
Subject: [PATCH 79/99] meta-dts-distro/recipes-dts: dts-scripts: Bump revision
 to support Optiplex

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 9f23d4fa..b2aca768 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "6392a59cf3713447e0559a069fe3da72ba2112d7"
+SRCREV = "2f3bdf695d30744f51a6965bc0849b1b7d5e8457"
 
 S = "${WORKDIR}/git"
 

From 7089e1ea28fe4fbf1297b15714d75a52c2d4372b Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Thu, 12 Sep 2024 09:27:37 +0200
Subject: [PATCH 80/99] meta-dts-distro/recipes-dts: dts-scripts: Bump SRCREV
 to support Optiplex DPP

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index b2aca768..93ea6b06 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "2f3bdf695d30744f51a6965bc0849b1b7d5e8457"
+SRCREV = "aec528e07943befd21acc51471f05144143f0b9f"
 
 S = "${WORKDIR}/git"
 

From 956db97c0e28a2bb15aeda7228411304b024c5d2 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Thu, 12 Sep 2024 14:24:15 +0200
Subject: [PATCH 81/99] dts-distro.conf: bump to 2.0.0-rc6

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 meta-dts-distro/conf/distro/dts-distro.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/conf/distro/dts-distro.conf b/meta-dts-distro/conf/distro/dts-distro.conf
index d783f174..ed6d9292 100644
--- a/meta-dts-distro/conf/distro/dts-distro.conf
+++ b/meta-dts-distro/conf/distro/dts-distro.conf
@@ -4,7 +4,7 @@ DISTRO = "dts-distro"
 
 # distro name
 DISTRO_NAME = "Dasharo Tools Suite"
-DISTRO_VERSION = "2.0.0-rc5"
+DISTRO_VERSION = "2.0.0-rc6"
 SDK_VENDOR = "-dtssdk"
 
 MAINTAINER = "3mdeb Sp. z o. o. <contact@3mdeb.com>"

From befccde852169f8d83291c525d1b7ad807036fb7 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Thu, 12 Sep 2024 14:30:45 +0200
Subject: [PATCH 82/99] CHANGELOG: add changelog for v2.0.0-rc6

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5470c46..f7d98d3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to the DTS project will be documented in this file.
 
+## v2.0.0-rc6 - 2024-09-12
+
+* scripts: generate-ipxe-menu: delete root=/dev/nfs
+* python/python3-binwalk_2.3.3.bb: Change src to updated fork
+* meta-dts-distro/conf/layer.conf: Bump layer priority to 9
+* Add support for Dell Optiplex including DPP support
+
 ## v2.0.0-rc5
 
 * recipes-bsp/txe-secure-boot/txesbmantool_git.bb: Bump SRCREV

From c677bcafa5ff764c0c222f89e4e2d00534b9b85d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Tue, 10 Sep 2024 15:50:58 +0200
Subject: [PATCH 83/99] pre-commit: use upstream oelint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fe9af2bc..8e6a84b8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -41,8 +41,8 @@ repos:
       - id: shellcheck
         args: ["--severity=warning"]
 
-  - repo: https://github.com/zarhus/oelint-adv
-    rev: 5.5.2-zarhus
+  - repo: https://github.com/priv-kweihmann/oelint-adv
+    rev: 5.7.2
     hooks:
       - id: oelint-adv
         args: [--rulefile=.oelint-ruleset.json, --hide=info, --quiet, --fix]

From 62807707e311c7768280291647c8663c82e76ed9 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Tue, 27 Aug 2024 14:19:24 +0200
Subject: [PATCH 84/99] recipes-dts: dts-scripts: Bump SRCREV (verbose mode and
 sending logs)

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 93ea6b06..5fd6eec8 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "aec528e07943befd21acc51471f05144143f0b9f"
+SRCREV = "2eaa53cf1ca2477887020711eef45260efcf9ef9"
 
 S = "${WORKDIR}/git"
 

From 4c27ec44cbfad137cfc798121a127ca74bdd5d6d Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Mon, 23 Sep 2024 14:24:43 +0200
Subject: [PATCH 85/99] dts-distro.conf: bump to 2.0.0-rc7

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 meta-dts-distro/conf/distro/dts-distro.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/conf/distro/dts-distro.conf b/meta-dts-distro/conf/distro/dts-distro.conf
index ed6d9292..ed503eee 100644
--- a/meta-dts-distro/conf/distro/dts-distro.conf
+++ b/meta-dts-distro/conf/distro/dts-distro.conf
@@ -4,7 +4,7 @@ DISTRO = "dts-distro"
 
 # distro name
 DISTRO_NAME = "Dasharo Tools Suite"
-DISTRO_VERSION = "2.0.0-rc6"
+DISTRO_VERSION = "2.0.0-rc7"
 SDK_VENDOR = "-dtssdk"
 
 MAINTAINER = "3mdeb Sp. z o. o. <contact@3mdeb.com>"

From 953d2ed2a4b235118881f1c8b6e9841a99f28584 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Mon, 23 Sep 2024 14:27:26 +0200
Subject: [PATCH 86/99]  CHANGELOG: add changelog for v2.0.0-rc7

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7d98d3a..82401aec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to the DTS project will be documented in this file.
 
+## v2.0.0-rc7 - 2024-09-23
+
+* pre-commit: use upstream oelint
+* recipes-dts: dts-scripts: Bump SRCREV (verbose mode and sending logs)
+
 ## v2.0.0-rc6 - 2024-09-12
 
 * scripts: generate-ipxe-menu: delete root=/dev/nfs

From 5261be3de76b4cf433ba1b05e4d98a47bd5fd8ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Tue, 24 Sep 2024 14:37:39 +0200
Subject: [PATCH 87/99] workflows: fix dts-release-cicd-pipeline ssh errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 .github/workflows/ci.yml      | 4 ++--
 .github/workflows/develop.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 292f1e68..bd5ba8b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -135,9 +135,9 @@ jobs:
           echo ${DTS_VER} > LATEST_RELEASE
           git add LATEST_RELEASE
           git commit -m "Signing release ${DTS_VER}"
-          git push origin main
+          GIT_SSH_COMMAND='ssh -F ~/.ssh/config_deploy' git push origin main
           git tag ${DTS_VER}
-          git push origin ${DTS_VER}
+          GIT_SSH_COMMAND='ssh -F ~/.ssh/config_deploy' git push origin ${DTS_VER}
           cd -
   cleanup:
     name: Cleanup
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index d98373bc..cc40920c 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -126,9 +126,9 @@ jobs:
           echo ${DTS_VER} > LATEST_RELEASE
           git add LATEST_RELEASE
           git commit -m "Signing release ${DTS_VER}"
-          git push origin main
+          GIT_SSH_COMMAND='ssh -F ~/.ssh/config_deploy' git push origin main
           git tag ${DTS_VER}
-          git push origin ${DTS_VER}
+          GIT_SSH_COMMAND='ssh -F ~/.ssh/config_deploy' git push origin ${DTS_VER}
           cd -
   cleanup:
     name: Cleanup

From 6ec479ae9631908fed0b72b584ee7a32a9e45560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Wed, 11 Sep 2024 17:35:19 +0200
Subject: [PATCH 88/99] dts-scripts: update to version with ODROID-H4+ support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 5fd6eec8..14cc5428 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "2eaa53cf1ca2477887020711eef45260efcf9ef9"
+SRCREV = "62414ae5771ca087756ad7ea85567a7c1351b582"
 
 S = "${WORKDIR}/git"
 

From 34e87a59e40ffe2f5e7aad45a99b72cbdef9d818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Mon, 23 Sep 2024 16:50:52 +0200
Subject: [PATCH 89/99] distro: dts-scripts: add support for NovaCustom V5x0TNx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index 14cc5428..c6296412 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "62414ae5771ca087756ad7ea85567a7c1351b582"
+SRCREV = "6153dc9193e8e576cafa7b1819538c187f4edd89"
 
 S = "${WORKDIR}/git"
 

From 6d13a9c5ba8838fbf4e3ee23decb6149b54d3a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Fri, 27 Sep 2024 13:31:42 +0200
Subject: [PATCH 90/99] dts-scripts: update srcrev, fixes optiplex dpp link
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
index c6296412..69fe3020 100644
--- a/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
+++ b/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded477
 PV = "0.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/Dasharo/dts-scripts;protocol=https;branch=main"
-SRCREV = "6153dc9193e8e576cafa7b1819538c187f4edd89"
+SRCREV = "dcb0e12214f58705cba4524b3f8c86f0912106ac"
 
 S = "${WORKDIR}/git"
 

From ac6869898dfe9394ddfab85d310435d63806ec5c Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Fri, 27 Sep 2024 14:35:06 +0200
Subject: [PATCH 91/99] Clean up changelog

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 CHANGELOG.md | 45 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82401aec..a02b48a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,30 +14,55 @@ All notable changes to the DTS project will be documented in this file.
 * meta-dts-distro/conf/layer.conf: Bump layer priority to 9
 * Add support for Dell Optiplex including DPP support
 
-## v2.0.0-rc5
+## v2.0.0-rc5 - 2024-08-28
 
-* recipes-bsp/txe-secure-boot/txesbmantool_git.bb: Bump SRCREV
 * .github/workflows: Use separate SSH config for deploy job
-* recipes-bsp: txesbmantool: Change branch and SRCREV
 * distro: extended: minio-cli: amend absolete-license
 * .oelint-ruleset.json: Set homepageping to info so pre-commit ci can run
-* conf/distro/dts-distro.conf: Bump DISTRO_VERSION to 2.0.0-rc5
+
+## v2.0.0-rc4 - 2024-07-26
+
+* Add minio-cli
+* dts-scripts: add DES(DPP) packaging support
+
+## v2.0.0-rc3 - 2024-07-18
+
+* dts-scripts: Change to rev removing separate EC update
 
 ## v2.0.0-rc2 - 2024-07-09
 
+* Use sshd.service instead of sshd.socket
+* dts-base-image.inc: Remove 'rootfs' suffix from image
+* dts-scripts: Add more model checks for V54x_6xTU
+* Add and use python semver module to compare versions
+* Add lshw
+* dasharo-ectool: bump rev for Dasharo ACPI ID
+
+## v2.0.0-rc1
+
+* Change meta-secure-core origin
+* Update most of system libraries and applications to newer version
+* linux-yocto: remove efi-ext.scc from KERNEL_FEATURES
+* move DTS scripts to another repo
+* dts-scripts: do_install via Makefile
+* dts-scripts: relicense to Apache-2.0
+* support: hidapi: delete
+* kernel: acpi-call-dkms: change license to GPLv3
+* update layers to scarthgap
+* dts-distro.conf: add usrmerge to DISTRO_FEATURES
+* dasharo-ectool: add sha256sums for cargo deps
+* iotools: allow overriding CC
+* iotools: disable DEBUG by default
+* dts-scripts: fix Intel regions backup
 * Add support for MTL
 * Updated Linux kernel to version 6.6.23
-* Update most of system libraries and applications to newer version
 * Don't use ICMP for network connection verification
-* Update coreboot tools to revision d08d5eaa98b1204b5e665d3ae4f63fb6f84a0d77
-* Update dasharo_ectool to revision 4ae73b9d2cc2ec34c760c7774a7859d240c4c8dd
 * Fixed scp not working without `-O` option
 * Add txesbmantool, revision 235c946838dc8c619ff821c9791386d63f5cbd6a
 * Add smmstoretool, revision 602653abed391ae1b1445ad86d0f05b8b5b678cb
 * Add cpuid tool
-* Add more cukinia tests
-* Add and use python semver module to compare versions
-* Use sshd.service instead of sshd.socket
+* Add pre-commit configuration
+* Add cukinia documentation
 
 ## v1.2.21 - 2024-03-29
 

From 761ae254164036e601a00f9ae65a3421496b418d Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Fri, 27 Sep 2024 14:50:48 +0200
Subject: [PATCH 92/99] dts-distro.conf: bump to 2.0.0

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 meta-dts-distro/conf/distro/dts-distro.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-dts-distro/conf/distro/dts-distro.conf b/meta-dts-distro/conf/distro/dts-distro.conf
index ed503eee..316389c4 100644
--- a/meta-dts-distro/conf/distro/dts-distro.conf
+++ b/meta-dts-distro/conf/distro/dts-distro.conf
@@ -4,7 +4,7 @@ DISTRO = "dts-distro"
 
 # distro name
 DISTRO_NAME = "Dasharo Tools Suite"
-DISTRO_VERSION = "2.0.0-rc7"
+DISTRO_VERSION = "2.0.0"
 SDK_VENDOR = "-dtssdk"
 
 MAINTAINER = "3mdeb Sp. z o. o. <contact@3mdeb.com>"

From dd57b299d30ce21f3e07545f05b003c091b268b3 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Fri, 27 Sep 2024 14:54:17 +0200
Subject: [PATCH 93/99] CHANGELOG: add changelog for v2.0.0

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a02b48a4..a2830195 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to the DTS project will be documented in this file.
 
+## v2.0.0 - 2024-09-30
+
+* Fix workflow errors
+* Add support for ODROID-H4
+* Add support for NovaCustom V5x0TNx
+* Add support for Dell Optiplex 7010/9010
+* Clean up changelog
+
 ## v2.0.0-rc7 - 2024-09-23
 
 * pre-commit: use upstream oelint

From 01b684668a435fb2d645822060eb4404625822da Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Fri, 27 Sep 2024 15:43:22 +0200
Subject: [PATCH 94/99] Remove unit_tests and scripts/local-deploy

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 scripts/local-deploy.sh               |  16 -
 unit_tests/.gitignore                 |   1 -
 unit_tests/.shellcheckrc              |   1 -
 unit_tests/README.md                  | 670 --------------------------
 unit_tests/dasharo-ectool-mock.sh     |  21 -
 unit_tests/des-credentials.sh.example |  24 -
 unit_tests/dts-boot                   |  51 --
 unit_tests/flashrom-mock.sh           |  63 ---
 8 files changed, 847 deletions(-)
 delete mode 100755 scripts/local-deploy.sh
 delete mode 100644 unit_tests/.gitignore
 delete mode 100644 unit_tests/.shellcheckrc
 delete mode 100644 unit_tests/README.md
 delete mode 100755 unit_tests/dasharo-ectool-mock.sh
 delete mode 100644 unit_tests/des-credentials.sh.example
 delete mode 100755 unit_tests/dts-boot
 delete mode 100755 unit_tests/flashrom-mock.sh

diff --git a/scripts/local-deploy.sh b/scripts/local-deploy.sh
deleted file mode 100755
index 777d4e5d..00000000
--- a/scripts/local-deploy.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# This scripts deplos DTS scripts into target machine, for local development
-
-IP_ADDR="$1"
-PORT=${PORT:-22}
-
-scp -P ${PORT} \
-  -O \
-  -o StrictHostKeyChecking=no \
-  -o UserKnownHostsFile=/dev/null \
-  meta-dts-distro/recipes-dts/dts/dasharo-deploy/* \
-  meta-dts-distro/recipes-dts/dts/dts/* \
-  meta-dts-distro/recipes-dts/reports/dasharo-hcl-report/* \
-  unit_tests/* \
-  root@${IP_ADDR}:/usr/sbin
diff --git a/unit_tests/.gitignore b/unit_tests/.gitignore
deleted file mode 100644
index 8c8bff43..00000000
--- a/unit_tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-des-credentials.sh
diff --git a/unit_tests/.shellcheckrc b/unit_tests/.shellcheckrc
deleted file mode 100644
index d5a471e7..00000000
--- a/unit_tests/.shellcheckrc
+++ /dev/null
@@ -1 +0,0 @@
-disable=SC2034
diff --git a/unit_tests/README.md b/unit_tests/README.md
deleted file mode 100644
index ed45dd9b..00000000
--- a/unit_tests/README.md
+++ /dev/null
@@ -1,670 +0,0 @@
-# DTS scripts unit tests
-
-This directory contains stub scripts for testing DTS update and deploy logic
-in complex scenarios.
-
-## Prerequisites
-
-Running test on the host may result in unpredictable results because of the
-missing programs and different version of certain tools. It is advised to run
-the DTS image in QEMU as a development environment. Running on host is
-generally not supported and should be avoided.
-
-## Running in QEMU
-
-### Credentials setup
-
-We need credentials for each test variant. You can use provided template and
-fill it in accordingly.
-
-```bash
-cp des-credentials.sh.example des-credentials.sh
-```
-
-### Running automatically
-
-Some scenarios are have been already migrated into [OSFV](TBD).
-
-```bash
-robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no dts/dts-tests.robot
-```
-
-### Running manually
-
-1. Boot the latest DTS image in QEMU. Recommended steps:
-  - start QEMU according to
-    [OSFV documentation](https://github.com/Dasharo/open-source-firmware-validation/blob/develop/docs/qemu.md#booting)
-    (use `os` switch, not `firmware`)
-  - enable network boot and boot into DTS via iPXE
-  - enable SSH server (option `8` in main menu)
-
-1. Deploy updated scripts and tests into qemu
-
-    ```bash
-    PORT=5222 ./scripts/local-deploy.sh 127.0.0.1
-    ```
-
-1. Execute desired test as described in below section. E.g.:
-
-    ```
-    ssh -p 5222 root@127.0.0.1
-    export BOARD_VENDOR="Notebook" SYSTEM_MODEL="NV4xPZ" BOARD_MODEL="NV4xPZ"
-    export BIOS_VERSION="Dasharo (coreboot+UEFI) v1.7.2" TEST_DES=y DES_TYPE="heads" && dts-boot
-    ```
-
-## Test cases
-
-The general idea is that we override some variables, so DTS scripts consider
-they are running on the given board. Then we select `Install` or `Update`
-actions from DTS menu, and check if the flow is as expected in certain
-scenario.
-
-After each `dts-boot -> 5) Check and apply Dasharo firmware updates` scenario
-exection, we can drop to DTS shell and continue with the next scenario.
-
-### NovaCustom
-
-```bash
-export BOARD_VENDOR="Notebook" SYSTEM_MODEL="NV4xPZ" BOARD_MODEL="NV4xPZ"
-```
-
-1. Dasharo v1.7.2 on NV4x_PZ eligible for updates to heads with heads DES and
-   regular update:
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+UEFI) v1.7.2" TEST_DES=y DES_TYPE="heads" && dts-boot
-    ```
-
-Expected output:
-- heads fw should be offered
-
-```
-Enter an option: 5
-
-Waiting for network connection ...
-Checking if board is Dasharo compatible.
-Gathering flash chip and chipset information...
-Flash information: vendor="ST" name="M95M02"
-Flash size: 0M
-Getting platform specific GPG key... Done
-Checking for the latest Dasharo update available...
-Current Dasharo version: 1.7.2
-Latest available Dasharo version: 1.7.2
-Dasharo Heads firmware version is available and your subscription
-gives you access to this firmware.
-
-Would you like to switch to Dasharo heads firmware? (Y|n) y
-
-
-Switching to Dasharo heads firmware v0.9.1
-
-Are you sure you want to proceed with update? (Y|n) y
-
-Downloading Dasharo firmware...Done
-
-Please verify detected hardware!
-
-Board vendor: Notebook
-System model: NV4xPZ
-Board model: NV4xPZ
-
-Does it match your actual specification? (Y|n) y
-
-Following firmware will be used to install Dasharo
-Dasharo BIOS firmware:
-  - link: https://cloud.3mdeb.com/public.php/webdav/novacustom_nv4x_adl/v0.9.1/novacustom_nv4x_adl_v0.9.1_heads.rom
-  - hash: b64e92ebce59e0ee4aca8f134b41abb987703f329149c17730ac5861d8715b5e
-
-You can learn more about this release on: https://docs.dasharo.com/
-
-Do you want to update Dasharo firmware on your hardware? (Y|n) y
-
-Checking Dasharo firmware checksum... Verified.
-Checking Dasharo firmware signature... Verified.
-
-Device does not have Dasharo EC firmware - cannot continue update! : (1)
-```
-
-2. Dasharo v1.7.2 on NV4x_PZ eligible for updates to heads without DES
-   (regular update only):
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+UEFI) v1.7.2" TEST_DES=n && dts-boot
-    ```
-
-Expected output:
-- no update should be offered
-
-```
-Enter an option: 5
-
-Waiting for network connection ...
-Checking if board is Dasharo compatible.
-Gathering flash chip and chipset information...
-Flash information: vendor="ST" name="M95M02"
-Flash size: 0M
-Getting platform specific GPG key... Done
-Checking for the latest Dasharo update available...
-Current Dasharo version: 1.7.2
-Latest available Dasharo version: 1.7.2
-Dasharo heads firmware version is available. If you are interested,
-please provide your subscription credentials in the main DTS menu
-and select 'Update Dasharo firmware' again to check if you are eligible.
-No update available for your machine
-```
-
-3. Dasharo v1.6.0 on NV4x_PZ not eligible for updates to heads with heads DES
-   (regular update only):
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+UEFI) v1.6.0" TEST_DES=y DES_TYPE="heads" && dts-boot
-    ```
-
-Expected output:
-- UEFI fw update should be offered (this is too old release to transition to
-  heads directly, need to flash latest UEFI fw first)
-
-```
-Enter an option: 5
-
-Waiting for network connection ...
-Checking if board is Dasharo compatible.
-Gathering flash chip and chipset information...
-Flash information: vendor="ST" name="M95M02"
-Flash size: 0M
-Getting platform specific GPG key... Done
-Checking for the latest Dasharo update available...
-Current Dasharo version: 1.6.0
-Latest available Dasharo version: 1.7.2
-
-Are you sure you want to proceed with update? (Y|n) y
-
-Downloading Dasharo firmware...Done
-
-Please verify detected hardware!
-
-Board vendor: Notebook
-System model: NV4xPZ
-Board model: NV4xPZ
-
-Does it match your actual specification? (Y|n) y
-
-Following firmware will be used to install Dasharo
-Dasharo BIOS firmware:
-  - link: https://dl.3mdeb.com/open-source-firmware/Dasharo/novacustom_nv4x_adl/v1.7.2/novacustom_nv4x_adl_v1.7.2.rom
-  - hash: 00b6338389cc5d020b641629971aac6d4047be6134c6e8d0228140edc42584f6
-
-You can learn more about this release on: https://docs.dasharo.com/
-
-Do you want to update Dasharo firmware on your hardware? (Y|n) y
-
-Checking Dasharo firmware checksum... Verified.
-Checking Dasharo firmware signature... Verified.
-
-Device does not have Dasharo EC firmware - cannot continue update! : (1)
-```
-
-4. Dasharo v1.6.0 on NV4x_PZ not eligible for updates to heads without heads
-   DES (regular update only):
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+UEFI) v1.6.0" TEST_DES=n && dts-boot
-    ```
-
-Expected output:
-- UEFI fw update should be offered
-
-```
-Enter an option: 5
-
-Waiting for network connection ...
-Checking if board is Dasharo compatible.
-Gathering flash chip and chipset information...
-Flash information: vendor="ST" name="M95M02"
-Flash size: 0M
-Getting platform specific GPG key... Done
-Checking for the latest Dasharo update available...
-Current Dasharo version: 1.6.0
-Latest available Dasharo version: 1.7.2
-
-Are you sure you want to proceed with update? (Y|n) y
-
-Downloading Dasharo firmware...Done
-
-Please verify detected hardware!
-
-Board vendor: Notebook
-System model: NV4xPZ
-Board model: NV4xPZ
-
-Does it match your actual specification? (Y|n) y
-
-Following firmware will be used to install Dasharo
-Dasharo BIOS firmware:
-  - link: https://dl.3mdeb.com/open-source-firmware/Dasharo/novacustom_nv4x_adl/v1.7.2/novacustom_nv4x_adl_v1.7.2.rom
-  - hash: 00b6338389cc5d020b641629971aac6d4047be6134c6e8d0228140edc42584f6
-
-You can learn more about this release on: https://docs.dasharo.com/
-
-Do you want to update Dasharo firmware on your hardware? (Y|n) y
-
-Checking Dasharo firmware checksum... Verified.
-Checking Dasharo firmware signature... Verified.
-
-Device does not have Dasharo EC firmware - cannot continue update! : (1)
-```
-
-5. Dasharo heads v0.9.0 on NV4x_PZ eligible for updates to heads with heads
-   DES and switch back (heads updates):
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+heads) v0.9.0" TEST_DES=y DES_TYPE="heads" && dts-boot
-    ```
-
-Expected output:
-- migration to UEFI should be offered first
-- if we say `n` to switch, heads update should be offered
-
-```
-Enter an option: 5
-
-Waiting for network connection ...
-Checking if board is Dasharo compatible.
-Gathering flash chip and chipset information...
-Flash information: vendor="ST" name="M95M02"
-Flash size: 0M
-Getting platform specific GPG key... Done
-Checking for the latest Dasharo update available...
-Current Dasharo version: 0.9.0
-Latest available Dasharo version: 0.9.1
-
-If you are running heads firmware variant and want to update, say "n" here.
-You will be asked for heads udpate confirmation in a moment.
-Say "Y" only if you want to migrate from heads to UEFI firmware variant.
-Would you like to switch back to the regular (UEFI) Dasharo firmware variant? (Y|n) y
-
-
-Switching back to regular Dasharo firmware v1.7.2
-
-
-Are you sure you want to proceed with update? (Y|n) y
-
-Downloading Dasharo firmware...Done
-
-Please verify detected hardware!
-
-Board vendor: Notebook
-System model: NV4xPZ
-Board model: NV4xPZ
-
-Does it match your actual specification? (Y|n) y
-
-Following firmware will be used to install Dasharo
-Dasharo BIOS firmware:
-  - link: https://dl.3mdeb.com/open-source-firmware/Dasharo/novacustom_nv4x_adl/v1.7.2/novacustom_nv4x_adl_v1.7.2.rom
-  - hash: 00b6338389cc5d020b641629971aac6d4047be6134c6e8d0228140edc42584f6
-
-You can learn more about this release on: https://docs.dasharo.com/
-
-Do you want to update Dasharo firmware on your hardware? (Y|n) y
-
-Checking Dasharo firmware checksum... Verified.
-Checking Dasharo firmware signature... Verified.
-
-```
-
-6. Dasharo heads v0.9.0 on NV4x_PZ without DES switch back, no heads updates:
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+heads) v0.9.0" TEST_DES=n && dts-boot
-    ```
-
-Expected output:
-- migration to UEFI should be offered first
-- if we say `n` to switch, no heads update should be offered
-
-```
-Enter an option: 5
-
-Waiting for network connection ...
-Checking if board is Dasharo compatible.
-Gathering flash chip and chipset information...
-Flash information: vendor="ST" name="M95M02"
-Flash size: 0M
-Getting platform specific GPG key... Done
-Checking for the latest Dasharo update available...
-Current Dasharo version: 0.9.0
-You are running heads firmware, but did not provide DES credentials.
-There are updates available if you provide DES credentials in main DTS menu.
-
-Latest available Dasharo version: 0.9.1
-
-
-Would you like to switch back to the regular Dasharo firmware? (Y|n) y
-
-
-Switching back to regular Dasharo firmware v1.7.2
-
-
-Are you sure you want to proceed with update? (Y|n) y
-
-Downloading Dasharo firmware...Done
-
-Please verify detected hardware!
-
-Board vendor: Notebook
-System model: NV4xPZ
-Board model: NV4xPZ
-
-Does it match your actual specification? (Y|n) y
-
-Following firmware will be used to install Dasharo
-Dasharo BIOS firmware:
-  - link: https://dl.3mdeb.com/open-source-firmware/Dasharo/novacustom_nv4x_adl/v1.7.2/novacustom_nv4x_adl_v1.7.2.rom
-  - hash: 00b6338389cc5d020b641629971aac6d4047be6134c6e8d0228140edc42584f6
-
-You can learn more about this release on: https://docs.dasharo.com/
-
-Do you want to update Dasharo firmware on your hardware? (Y|n) y
-
-Checking Dasharo firmware checksum... Verified.
-Checking Dasharo firmware signature... Verified.
-```
-
-Another case is to edit `dts-functions.sh` and set `DASHARO_REL_VER` to
-`v1.7.3` to detect possible regular firmware updates and `HEADS_REL_VER_DES`
-to `v0.9.1` to detect possible heads firmware updates and repeat all test
-cases. The URLs for non-existing versions may fail.
-
-The NovaCustom test binaries for credentials in `dts-boot` are placed in
-[/projects/projects/2022/novacustom/dts_test](https://cloud.3mdeb.com/index.php/f/659609)
-on 3mdeb cloud. These are just public coreboot+UEFI v1.7.2 binaries.
-Analogically with MSI, cloud directory is
-[/projects/projects/2022/msi/dts_test](https://cloud.3mdeb.com/index.php/f/667474)
-and binaries are simply Z690-A public coreboot+UEFI v1.1.1 binaries with
-changed names for both Z690-A and Z790-P (resigned with appropriate keys).
-
-### MSI MS-7D25
-
-```bash
-export BOARD_VENDOR="Micro-Star International Co., Ltd." SYSTEM_MODEL="MS-7D25" BOARD_MODEL="PRO Z690-A WIFI DDR4(MS-7D25)"
-```
-
-1. Dasharo v1.1.1 on MS-7D25 eligible for updates to heads with heads DES and
-   regular update:
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+UEFI) v1.1.1" TEST_DES=y DES_TYPE="heads" && dts-boot
-    ```
-
-2. Dasharo v1.1.1 on MS-7D25 eligible for updates to heads without DES
-   (regular update only):
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+UEFI) v1.1.1" TEST_DES=n && dts-boot
-    ```
-
-3. Dasharo v1.1.2 on MS-7D25 eligible for updates to heads with heads DES
-   (regular update only through regular DES):
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+UEFI) v1.1.2" TEST_DES=y DES_TYPE="heads" && dts-boot
-    ```
-
-4. Dasharo v1.1.2 on MS-7D25 not eligible for updates to heads without heads
-   DES (regular update only through regular DES):
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+UEFI) v1.1.2" TEST_DES=n && dts-boot
-    ```
-
-5. Dasharo heads v0.9.0 on MS-7D25 eligible for updates to heads with heads
-   DES and switch back (regular update and switch-back):
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+heads) v0.9.0" TEST_DES=y DES_TYPE="heads" && dts-boot
-    ```
-
-6. Dasharo heads v0.9.0 on MS-7D25 without DES switch back, no heads updates
-   (regular update and switch-back):
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+heads) v0.9.0" TEST_DES=n && dts-boot
-    ```
-
-### MSI MS-7E06
-
-```bash
-export BOARD_VENDOR="Micro-Star International Co., Ltd." SYSTEM_MODEL="MS-7E06" BOARD_MODEL="PRO Z790-P WIFI (MS-7E06)"
-```
-
-1. Dasharo heads v0.9.0 on MS-7E06 eligible for updates to heads with heads
-   DES and switch back (regular update and switch-back only through regular
-   DES, no community release):
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+heads) v0.9.0" TEST_DES=y DES_TYPE=heads && dts-boot
-    ```
-
-Expected output:
-- migration to UEFI should be offered first
-- if we say `n` to switch, no heads (no more recent update available yet)
-
-```
-Enter an option: 5
-
-Waiting for network connection ...
-Checking if board is Dasharo compatible.
-Gathering flash chip and chipset information...
-Flash information: vendor="ST" name="M95M02"
-Flash size: 0M
-Getting platform specific GPG key... Done
-Checking for the latest Dasharo update available...
-Current Dasharo version: 0.9.0
-Latest available Dasharo version: 0.9.0
-
-If you are running heads firmware variant and want to update, say "n" here.
-You will be asked for heads udpate confirmation in a moment.
-Say "Y" only if you want to migrate from heads to UEFI firmware variant.
-Would you like to switch back to the regular (UEFI) Dasharo firmware variant? (Y|n) y
-
-
-Switching back to regular Dasharo firmware v0.9.1
-
-
-Are you sure you want to proceed with update? (Y|n) y
-
-Downloading Dasharo firmware...Done
-
-Please verify detected hardware!
-
-Board vendor: Micro-Star International Co., Ltd.
-System model: MS-7E06
-Board model: PRO Z790-P WIFI (MS-7E06)
-
-Does it match your actual specification? (Y|n) y
-
-Following firmware will be used to install Dasharo
-Dasharo BIOS firmware:
-  - link: https://cloud.3mdeb.com/public.php/webdav/MS-7E06/v0.9.1/msi_ms7e06_v0.9.1_ddr5.rom
-  - hash: 3b438422338cf4c13abdb25823a9b2a2ad6e82fabbe0d9ed41a16a6eae1f15ff
-
-You can learn more about this release on: https://docs.dasharo.com/
-
-Do you want to update Dasharo firmware on your hardware? (Y|n) y
-
-Checking Dasharo firmware checksum... Verified.
-Checking Dasharo firmware signature... Verified.
-
-Backing up firmware configuration... Failed! Default settings will be used.
-Failed! Default settings will be used.
-Done.
-Found file config at 0xa2b40, type raw, compressed 2480, size 2480
-Checking flash layout.
-Could not read the FMAP region
-Updating Dasharo firmware...
-This may take several minutes. Please be patient and do not power off your computer or touch the keyboard!
-Failed to update Dasharo firmware : (1)
-```
-
-
-2. Dasharo heads v0.9.0 on MS-7E06 without DES switch back, no heads updates
-   (regular update and switch-back only through regular DES, no community
-   release):
-
-    ```bash
-    export BIOS_VERSION="Dasharo (coreboot+heads) v0.9.0" TEST_DES=n && dts-boot
-    ```
-
-Expected output:
-- should print info on DES availability in the shop
-- migration to UEFI should be offered
-
-```
-Enter an option: 5
-
-Waiting for network connection ...
-Checking if board is Dasharo compatible.
-Gathering flash chip and chipset information...
-Flash information: vendor="ST" name="M95M02"
-Flash size: 0M
-Getting platform specific GPG key... Done
-Checking for the latest Dasharo update available...
-Current Dasharo version: 0.9.0
-DES version available, if you are interested
-please visit https://shop.3mdeb.com/product-category/dasharo-entry-subscription/
-
-Latest available Dasharo version: 0.9.0
-
-
-Would you like to switch back to the regular Dasharo firmware? (Y|n) n
-```
-
-### PC Engines
-
-```bash
-export BOARD_VENDOR="PC Engines" SYSTEM_MODEL="APU2" BOARD_MODEL="APU2"
-```
-
-1. Initial deployment from legacy firmware (no DES credentials)
-
-    ```bash
-    export BIOS_VERSION="v4.19.0.1" TEST_DES=n && dts-boot
-    ```
-
-Expected output:
-- no DES - no deployment should be offered
-- info on DES availailbity in the shop should be shown
-
-```
-Enter an option: 2
-
-Waiting for network connection ...
-Preparing ...
-Waiting for network connection ...
-Checking if board is Dasharo compatible.
-Gathering flash chip and chipset information...
-Flash information: Mock flashrom: Extra options = --flash-name 
-/usr/sbin/dts-functions.sh: line 652: Mock flashrom: Extra options = --flash-size  / 1024 / 1024: syntax error in expression (error token is "flashrom: Extra options = --flash-size  / 1024 / 1024")
-Backing up BIOS firmware and store it locally...
-Remember that firmware is also backed up in HCL report.
-Saving backup to: /fw_backup.tar.gz
-tar: Removing leading `/' from member names
-Successfully backed up firmware locally at: /fw_backup.tar.gz
-
-Please, select Dasharo firmware version to install
-  DES version available, if you are interested, please visit https://shop.3mdeb.com/product-category/dasharo-entry-subscription/
-  b) Back to main menu
-
-Enter an option: b
-```
-
-2. Initial deployment from legacy firmware (UEFI DES credentials)
-
-    ```bash
-    export BIOS_VERSION="v4.19.0.1" TEST_DES=y DES_TYPE="UEFI" && dts-boot
-    ```
-
-Expected output:
-- UEFI deployment should be offered
-- info on DES availailbity in the shop should not be shown
-
-```
-Enter an option: 2
-
-Waiting for network connection ...
-Preparing ...
-Waiting for network connection ...
-Checking if board is Dasharo compatible.
-Gathering flash chip and chipset information...
-Flash information: Mock flashrom: Extra options = --flash-name 
-/usr/sbin/dts-functions.sh: line 652: Mock flashrom: Extra options = --flash-size  / 1024 / 1024: syntax error in expression (error token is "flashrom: Extra options = --flash-size  / 1024 / 1024")
-Backing up BIOS firmware and store it locally...
-Remember that firmware is also backed up in HCL report.
-Saving backup to: /fw_backup.tar.gz
-tar: Removing leading `/' from member names
-Successfully backed up firmware locally at: /fw_backup.tar.gz
-
-Please, select Dasharo firmware version to install
-  d) DES version
-  b) Back to main menu
-
-Enter an option: d
-
-Dasharo Entry Subscription version selected
-Downloading Dasharo firmware...Done
-
-Please verify detected hardware!
-
-Board vendor: PC Engines
-System model: APU2
-Board model: APU2
-
-Does it match your actual specification? (Y|n) y
-
-Following firmware will be used to install Dasharo
-Dasharo BIOS firmware:
-  - link: https://cloud.3mdeb.com/public.php/webdav/pcengines_apu2/v0.9.0/pcengines_apu2_v0.9.0.rom
-  - hash: 5943fcff46add5161f520d4c4e3612496aa07933951bbc77c58ec847f07c12b9
-
-You can learn more about this release on: https://docs.dasharo.com/
-
-Do you want to install Dasharo firmware on your hardware? (Y|n) y
-
-Checking Dasharo firmware checksum... Verified.
-
-Found file config at 0x1eae00, type raw, compressed 3848, size 12269
-CONFIG_VBOOT=y
-Installing Dasharo firmware...
-Successfully installed Dasharo firmware
-Syncing disks... Done.
-The computer will reboot automatically in 5 seconds
-```
-
-3. Initial deployment from legacy firmware (seabios DES credentials)
-
-    ```bash
-    export BIOS_VERSION="v4.19.0.1" TEST_DES=y DTS_TYPE="seabios" && dts-boot
-    ```
-
-Expected output:
-- Seabios deployment should be offered
-- info on DES availailbity in the shop should not be shown
-
-```
-TBD
-```
-
-4. Initial deployment from legacy firmware (correct DES credentials)
-
-    ```bash
-    export BIOS_VERSION="v4.19.0.1" TEST_DES=n && dts-boot
-    ```
-
-Expected output:
-- seabios deployment should be offered
-- info on DES availailbity in the shop should not be shown
-
-```
-TBD
-```
diff --git a/unit_tests/dasharo-ectool-mock.sh b/unit_tests/dasharo-ectool-mock.sh
deleted file mode 100755
index e5023614..00000000
--- a/unit_tests/dasharo-ectool-mock.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Function to print usage
-usage() {
-    echo "Usage: $0 info"
-    exit 1
-}
-
-# Check if the first argument is 'info'
-if [[ "$1" != "info" ]]; then
-    usage
-fi
-
-# Mock info command output
-echo "Dasharo EC Tool Mock - Info Command"
-echo "-----------------------------------"
-echo "board: novacustom/nv4x_adl"
-echo "version: 2023-03-10_c0fe220"
-echo "-----------------------------------"
-
-exit 0
diff --git a/unit_tests/des-credentials.sh.example b/unit_tests/des-credentials.sh.example
deleted file mode 100644
index e2ead919..00000000
--- a/unit_tests/des-credentials.sh.example
+++ /dev/null
@@ -1,24 +0,0 @@
-# NovaCustom heads keys
-NCM_HEADS_LOGS_KEY=''
-NCM_HEADS_DL_KEY=''
-NCM_HEADS_PWD=''
-
-# MSI heads keys
-MSI_HEADS_LOGS_KEY=''
-MSI_HEADS_DL_KEY=''
-MSI_HEADS_PWD=''
-
-# MSI UEFI keys
-MSI_UEFI_LOGS_KEY=''
-MSI_UEFI_DL_KEY=''
-MSI_UEFI_PWD=''
-
-# PC Engines SeaBIOS keys
-PCE_SEABIOS_LOGS_KEY=''
-PCE_SEABIOS_DL_KEY=''
-PCE_SEABIOS_PWD=''
-
-# PC Engines UEFI keys
-PCE_UEFI_LOGS_KEY=''
-PCE_UEFI_DL_KEY=''
-PCE_UEFI_PWD=''
diff --git a/unit_tests/dts-boot b/unit_tests/dts-boot
deleted file mode 100755
index 0f606b62..00000000
--- a/unit_tests/dts-boot
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-source /usr/sbin/des-credentials.sh
-
-# QEMU does not support flashrom read/write yet, provide some basic mock to pass flashrom calls
-export FLASHROM="/usr/sbin/flashrom-mock.sh"
-export DASHARO_ECTOOL="/usr/sbin/dasharo-ectool-mock.sh"
-# Skip HCL report in Dasharo deployment, which takes a lot of time
-# and creates many reports in cloud.
-export LOGS_SENT="1"
-
-CLOUD_PASS_FILE="/etc/cloud-pass"
-
-if [ $TEST_DES == "y" ]; then
-  rm -f "${CLOUD_PASS_FILE}"
-  if [ "$BOARD_VENDOR" = "Notebook" ] && [ "$DES_TYPE" = "heads" ]; then
-    echo "$NCM_HEADS_LOGS_KEY" >> "${CLOUD_PASS_FILE}"
-    echo "$NCM_HEADS_DL_KEY" >> "${CLOUD_PASS_FILE}"
-    echo "$NCM_HEADS_PWD" >> "${CLOUD_PASS_FILE}"
-  elif [ "$BOARD_VENDOR" = "Micro-Star International Co., Ltd." ] && [ "$DES_TYPE" = "heads" ]; then
-    echo "$MSI_HEADS_LOGS_KEY" >> "${CLOUD_PASS_FILE}"
-    echo "$MSI_HEADS_DL_KEY" >> "${CLOUD_PASS_FILE}"
-    echo "$MSI_HEADS_PWD" >> "${CLOUD_PASS_FILE}"
-  elif [ "$BOARD_VENDOR" = "Micro-Star International Co., Ltd." ] && [ "$DES_TYPE" = "UEFI" ]; then
-    echo "$MSI_UEFI_LOGS_KEY" >> "${CLOUD_PASS_FILE}"
-    echo "$MSI_UEFI_DL_KEY" >> "${CLOUD_PASS_FILE}"
-    echo "$MSI_UEFI_PWD" >> "${CLOUD_PASS_FILE}"
-  elif [ "$BOARD_VENDOR" = "PC Engines" ] && [ "$DES_TYPE" = "UEFI" ]; then
-    echo "$PCE_UEFI_LOGS_KEY" >> "${CLOUD_PASS_FILE}"
-    echo "$PCE_UEFI_DL_KEY" >> "${CLOUD_PASS_FILE}"
-    echo "$PCE_UEFI_PWD" >> "${CLOUD_PASS_FILE}"
-  elif [ "$BOARD_VENDOR" = "PC Engines" ] && [ "$DES_TYPE" = "seabios" ]; then
-    echo "$PCE_SEABIOS_LOGS_KEY" >> "${CLOUD_PASS_FILE}"
-    echo "$PCE_SEABIOS_DL_KEY" >> "${CLOUD_PASS_FILE}"
-    echo "$PCE_SEABIOS_PWD" >> "${CLOUD_PASS_FILE}"
-  fi
-elif [ $TEST_DES != "y" ] && [ -f "${CLOUD_PASS_FILE}" ]; then
-  rm -f "${CLOUD_PASS_FILE}"
-fi
-
-if [ -f /tmp/bios.bin ]; then
-  rm /tmp/bios.bin
-fi
-
-wget https://dl.3mdeb.com/open-source-firmware/Dasharo/novacustom_nv4x_adl/v1.7.2/novacustom_nv4x_adl_v1.7.2.rom -O /tmp/bios.bin
-
-# export DTS_FUNCS="$PWD/../meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh"
-# export DTS_ENV="$PWD/dts-environment.sh"
-
-export HAVE_EC="false"
-
-source dts
diff --git a/unit_tests/flashrom-mock.sh b/unit_tests/flashrom-mock.sh
deleted file mode 100755
index fa65cd84..00000000
--- a/unit_tests/flashrom-mock.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-# Initialize variables
-PROGRAMMER=""
-READ_FLAG=""
-OUTPUT_FILE=""
-EXTRA_OPTIONS=""
-
-# Function to print usage
-usage() {
-    echo "Usage: $0 -p PROGRAMMER -r OUTPUT_FILE [EXTRA_OPTIONS]"
-    exit 1
-}
-
-# Parse command-line arguments
-while [[ "$#" -gt 0 ]]; do
-    case $1 in
-        -p)
-            PROGRAMMER="$2"
-            shift 2
-            ;;
-        -r)
-            READ_FLAG="-r"
-            OUTPUT_FILE="$2"
-            shift 2
-            ;;
-        *)
-            EXTRA_OPTIONS+="$1 "
-            shift
-            ;;
-    esac
-done
-
-# Check if required arguments are provided
-if [[ -z "$PROGRAMMER" ]]; then
-    usage
-fi
-
-# Create the directory for the output file if it doesn't exist
-OUTPUT_DIR=$(dirname "$OUTPUT_FILE")
-mkdir -p "$OUTPUT_DIR"
-
-# Mock flashrom functionality
-echo "Mock flashrom: Programmer = $PROGRAMMER"
-echo "Mock flashrom: Extra options = $EXTRA_OPTIONS"
-
-if [[ -n "$READ_FLAG" ]]; then
-    if [[ -z "$OUTPUT_FILE" ]]; then
-        usage
-    fi
-    echo "Mock flashrom: Reading BIOS into $OUTPUT_FILE"
-
-    # Create a mock rom.bin file with some dummy data
-    echo "This is a mock rom.bin file for testing purposes." > "$OUTPUT_FILE"
-    
-    # Verify if the file is created
-    if [ -f "$OUTPUT_FILE" ]; then
-        echo "Mock flashrom: Successfully created $OUTPUT_FILE"
-    else
-        echo "Mock flashrom: Failed to create $OUTPUT_FILE"
-        exit 1
-    fi
-fi

From daaf8a59f0617c433c70f3f450f021d33ba12372 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Fri, 27 Sep 2024 16:11:39 +0200
Subject: [PATCH 95/99] Rename python3-roca-detect_git_1.2.12.bb

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 ...n3-roca-detect_git_1.2.12.bb => python3-roca-detect_git.bb} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta-dts-distro/recipes-devtool/python/{python3-roca-detect_git_1.2.12.bb => python3-roca-detect_git.bb} (99%)

diff --git a/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git_1.2.12.bb b/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git.bb
similarity index 99%
rename from meta-dts-distro/recipes-devtool/python/python3-roca-detect_git_1.2.12.bb
rename to meta-dts-distro/recipes-devtool/python/python3-roca-detect_git.bb
index 2670b303..a373b43d 100644
--- a/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git_1.2.12.bb
+++ b/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git.bb
@@ -10,10 +10,11 @@ HOMEPAGE = "https://github.com/crocs-muni/roca"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2a6b12210371b9201fd100ff0cbef45a"
 
+PV = "v1.2.12+git"
+
 SRC_URI = "git://github.com/crocs-muni/roca;protocol=https;branch=master"
 
 # Modify these as desired
-PV = "v1.2.12+git"
 SRCREV = "df6071d502f68701427f8b1d409cab22055ad1b7"
 
 S = "${WORKDIR}/git"

From 79c892b99faf3f74aa467c7f3aa29f3c0b15cfed Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Mon, 30 Sep 2024 13:34:24 +0200
Subject: [PATCH 96/99] CHANGELOG: Reintroduce notes for v1.2.22 and v1.2.23

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2830195..39a66f8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,21 @@ All notable changes to the DTS project will be documented in this file.
 * Add pre-commit configuration
 * Add cukinia documentation
 
+## v1.2.23 - 2024-06-27
+
+* Hotfix for PC Engines SeaBIOS firmware variant deployment
+
+## v1.2.22 - 2024-06-27
+
+* Extended Dasharo zero-touch initial deployment on PCEngines APU2 platforms for
+  [DES](https://docs.dasharo.com/ways-you-can-help-us/#become-a-dasharo-entry-subscription-subscriber)
+  users with SeaBIOS firmware variant, in addition to UEFI variant.
+* Increase supported Dasharo (coreboot + heads) version from  v0.9.0 to v0.9.1
+  for NovaCustom NV4x 12th Gen series
+* Include new tools into the image: `python3-roca-detect`, `iperf3`, `lshw`
+* Fix [Dell Optiplex 7010 initial deployment](https://github.com/Dasharo/dasharo-issues/issues/706)
+* Update versions of coreboot-utils
+
 ## v1.2.21 - 2024-03-29
 
 * Added Dasharo zero-touch initial deployment on PCEngines APU2 platforms for

From 51ae29fc5992f057a21acc7b64da4b4a2ee1533b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Tue, 1 Oct 2024 09:39:13 +0200
Subject: [PATCH 97/99] kas-uefi-sb.yml: update to scarthgap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 kas-uefi-sb.yml                                | 9 ++-------
 meta-dts-distro/conf/distro/dts-sb-distro.conf | 2 ++
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/kas-uefi-sb.yml b/kas-uefi-sb.yml
index 031351ee..31ba524f 100644
--- a/kas-uefi-sb.yml
+++ b/kas-uefi-sb.yml
@@ -13,18 +13,13 @@ target:
 repos:
   meta-secure-core:
     url: https://github.com/Wind-River/meta-secure-core
-    refspec: fa438247c3e61d7f746687d85ef3b0dd66dc6b3f
+    refspec: 0aa7452355abc39b700f8787eab1b655f6099407
     layers:
       meta-efi-secure-boot:
-      meta:
+      meta-secure-core-common:
       meta-signing-key:
       meta-tpm2:
 
   meta-openembedded:
-    url: https://git.openembedded.org/meta-openembedded
-    refspec: 0b78362654262145415df8211052442823b9ec9b
     layers:
-      meta-oe:
-      meta-networking:
-      meta-python:
       meta-perl:
diff --git a/meta-dts-distro/conf/distro/dts-sb-distro.conf b/meta-dts-distro/conf/distro/dts-sb-distro.conf
index f20dae80..c7ede7ee 100644
--- a/meta-dts-distro/conf/distro/dts-sb-distro.conf
+++ b/meta-dts-distro/conf/distro/dts-sb-distro.conf
@@ -39,3 +39,5 @@ MACHINE_FEATURES:append = " efi"
 
 DEBUG_FLAGS:forcevariable = ""
 IMAGE_INSTALL:append = " kernel-image-bzimage"
+
+PREFERRED_VERSION_tpm2-tss-engine = "1.1.0"

From a7c2cef1230344de08308e9b65a9592f53aca8c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= <michal.iwanicki@3mdeb.com>
Date: Sat, 28 Sep 2024 19:05:39 +0200
Subject: [PATCH 98/99] python3-roca-detect: fix missing dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
---
 .../python/python3-pgpdump_1.5.bb             |  8 ++++
 .../python/python3-roca-detect_git.bb         | 41 ++++---------------
 2 files changed, 17 insertions(+), 32 deletions(-)
 create mode 100644 meta-dts-distro/recipes-devtool/python/python3-pgpdump_1.5.bb

diff --git a/meta-dts-distro/recipes-devtool/python/python3-pgpdump_1.5.bb b/meta-dts-distro/recipes-devtool/python/python3-pgpdump_1.5.bb
new file mode 100644
index 00000000..856c62fa
--- /dev/null
+++ b/meta-dts-distro/recipes-devtool/python/python3-pgpdump_1.5.bb
@@ -0,0 +1,8 @@
+SUMMARY = "PGP packet parser library"
+HOMEPAGE = "https://pypi.org/project/pgpdump/"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d8b3cb8278a76dc8de839fecf2e15e64"
+
+SRC_URI[sha256sum] = "1c4700857bf7ba735b08cfe4101aa3a4f5fd839657af249c17b2697c20829668"
+
+inherit pypi setuptools3
diff --git a/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git.bb b/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git.bb
index a373b43d..1dccbe0f 100644
--- a/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git.bb
+++ b/meta-dts-distro/recipes-devtool/python/python3-roca-detect_git.bb
@@ -1,46 +1,23 @@
-# Recipe created by recipetool
-# This is the basis of a recipe and may need further editing in order to be fully functional.
-# (Feel free to remove these comments when editing.)
-
 SUMMARY = "ROCA key detector / fingerprinter tool"
 HOMEPAGE = "https://github.com/crocs-muni/roca"
-# NOTE: License in setup.py/PKGINFO is: MIT
-# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is
-# your responsibility to verify that the values are complete and correct.
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2a6b12210371b9201fd100ff0cbef45a"
 
 PV = "v1.2.12+git"
 
 SRC_URI = "git://github.com/crocs-muni/roca;protocol=https;branch=master"
-
-# Modify these as desired
 SRCREV = "df6071d502f68701427f8b1d409cab22055ad1b7"
 
 S = "${WORKDIR}/git"
 
 inherit setuptools3
 
-# WARNING: the following rdepends are determined through basic analysis of the
-# python sources, and might not be 100% accurate.
-RDEPENDS:${PN} += "python3-compression python3-core python3-crypt python3-datetime python3-io python3-json python3-logging python3-math python3-netclient python3-unittest python3-future python3-coloredlogs"
-
-# WARNING: We were unable to map the following python package/module
-# dependencies to the bitbake packages which include them:
-#    apk_parse.apk
-#    coloredlogs
-#    cryptography.hazmat.backends
-#    cryptography.hazmat.backends.openssl.backend
-#    cryptography.hazmat.backends.openssl.x509
-#    cryptography.hazmat.primitives
-#    cryptography.hazmat.primitives.asymmetric.rsa
-#    cryptography.hazmat.primitives.serialization
-#    cryptography.x509
-#    cryptography.x509.base
-#    cryptography.x509.oid
-#    future.utils
-#    jks
-#    past.builtins
-#    pgpdump.data
-#    pgpdump.packet
-#    pkg_resources
+RDEPENDS:${PN} += " \
+                    python3 \
+                    python3-cryptography \
+                    python3-six \
+                    python3-future \
+                    python3-coloredlogs \
+                    python3-pgpdump \
+                    python3-dateutil \
+                    "

From e0c2fbe60692a8b613c88c2d2aefdcd31444e638 Mon Sep 17 00:00:00 2001
From: Pawel Langowski <pawel.langowski@3mdeb.com>
Date: Wed, 2 Oct 2024 14:18:05 +0200
Subject: [PATCH 99/99] CHANGELOG: Fix kernel version for 2.0.0-rc1

Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39a66f8f..6ba0b67c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,7 +63,7 @@ All notable changes to the DTS project will be documented in this file.
 * iotools: disable DEBUG by default
 * dts-scripts: fix Intel regions backup
 * Add support for MTL
-* Updated Linux kernel to version 6.6.23
+* Updated Linux kernel to version 6.6.21
 * Don't use ICMP for network connection verification
 * Fixed scp not working without `-O` option
 * Add txesbmantool, revision 235c946838dc8c619ff821c9791386d63f5cbd6a