From 384b918efb5f6a36e7ac1977a504d167df1d71ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mrzyg=C5=82=C3=B3d?= Date: Wed, 11 Sep 2024 11:49:27 +0200 Subject: [PATCH 01/50] conf/distro/dts-distro.conf: ROOT_HOME was missing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WARNING: systemd-1_255.4-r0 do_install: Using /home/root as root user's home directory is not fully supported by systemd Set ROOT_HOME to "/root" to avoid such warning. Signed-off-by: Daniel Mrzygłód --- meta-dts-distro/conf/distro/dts-distro.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-dts-distro/conf/distro/dts-distro.conf b/meta-dts-distro/conf/distro/dts-distro.conf index 04113267..38d3fa26 100644 --- a/meta-dts-distro/conf/distro/dts-distro.conf +++ b/meta-dts-distro/conf/distro/dts-distro.conf @@ -23,6 +23,7 @@ VIRTUAL-RUNTIME_syslog = "" DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit pulseaudio" VIRTUAL-RUNTIME_vim = "vim" +ROOT_HOME = '/root' ROOT_PASSWORD = "jlz9IbDJscvTcTjpDkk1xVoPZnxIm1K5" WKS_FILES = "usb-stick-dts.wks.in" From 20777be9ebef71584c8e56595cb1ff4cc9a22cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mrzyg=C5=82=C3=B3d?= Date: Mon, 9 Sep 2024 18:04:03 +0200 Subject: [PATCH 02/50] recipes-bsp: txe-secure-boot: smmstoretool fix buildpaths warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch add to recipe INHIBIT_PACKAGE_DEBUG_SPLIT="1" this change force system not to build debug packages and do strip of executables to remove TMPDIR from binary file. Signed-off-by: Daniel Mrzygłód --- meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb | 2 ++ 1 file changed, 2 insertions(+) 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 6606a2b2..abd0fa34 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 @@ -17,6 +17,8 @@ inherit pkgconfig S = "${WORKDIR}/git/util/smmstoretool" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + EXTRA_OEMAKE = ' \ DESTDIR="${D}" \ PREFIX="${prefix}" \ From 9635d27912a3d2dc3c0f2feec131248ed4648905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mrzyg=C5=82=C3=B3d?= Date: Mon, 9 Sep 2024 17:55:00 +0200 Subject: [PATCH 03/50] recipes-bsp: coreboot-utils: nvramtool - Fix buildpath warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch add to recipe INHIBIT_PACKAGE_DEBUG_SPLIT="1" this change force system not to build debug packages and do strip of executables to remove TMPDIR from binary file. Signed-off-by: Daniel Mrzygłód --- meta-dts-distro/recipes-bsp/coreboot-utils/nvramtool_git.bb | 2 ++ 1 file changed, 2 insertions(+) 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 fab029fe..a8dcf100 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/nvramtool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/nvramtool_git.bb @@ -7,6 +7,8 @@ EXTRA_OEMAKE = ' \ PREFIX="${prefix}" \ ' +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + do_compile () { oe_runmake -C util/nvramtool } From 9285d3dfa6c6792815370ce38b020597c3869fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mrzyg=C5=82=C3=B3d?= Date: Fri, 6 Sep 2024 17:28:18 +0200 Subject: [PATCH 04/50] recipes-bsp/coreboot-utils/intelp2m_git.bb: fix buildpath error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit golang is adding path if GO_PATH is created and removing this and adding -trimpath to build process should remove path inside binary Signed-off-by: Daniel Mrzygłód --- meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 f15979b1..b4478df0 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb @@ -22,11 +22,9 @@ inherit go do_compile() { export GOARCH="${TARGET_GOARCH}" - export GOPATH="${WORKDIR}/git/" - cd ${S} - - oe_runmake + go version + go build -trimpath -v -o intelp2m } do_install() { From 66290778664ae82c1c617aaa512ca39d17743994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mrzyg=C5=82=C3=B3d?= Date: Thu, 5 Sep 2024 16:39:17 +0200 Subject: [PATCH 05/50] linux-yocto: remove deprecated kconfig entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit remove CONFIG_INTEL_MENLOW & CONFIG_EFI_VARS are deprecated add CONFIG_EFIVAR_FS=y This patch enables new interface for depraceted sysfs one is compatible with previous one. Signed-off-by: Daniel Mrzygłód --- meta-dts-distro/recipes-kernel/kernel/linux-yocto/efivars.cfg | 2 +- .../recipes-kernel/kernel/linux-yocto/intel-other.cfg | 1 - meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-dts-distro/recipes-kernel/kernel/linux-yocto/efivars.cfg b/meta-dts-distro/recipes-kernel/kernel/linux-yocto/efivars.cfg index b9206d9f..4e151f10 100644 --- a/meta-dts-distro/recipes-kernel/kernel/linux-yocto/efivars.cfg +++ b/meta-dts-distro/recipes-kernel/kernel/linux-yocto/efivars.cfg @@ -1 +1 @@ -CONFIG_EFI_VARS=y +CONFIG_EFIVAR_FS=y diff --git a/meta-dts-distro/recipes-kernel/kernel/linux-yocto/intel-other.cfg b/meta-dts-distro/recipes-kernel/kernel/linux-yocto/intel-other.cfg index 51d55f8c..3a04af3a 100644 --- a/meta-dts-distro/recipes-kernel/kernel/linux-yocto/intel-other.cfg +++ b/meta-dts-distro/recipes-kernel/kernel/linux-yocto/intel-other.cfg @@ -18,7 +18,6 @@ CONFIG_INTEL_SOC_DTS_IOSF_CORE=y CONFIG_INTEL_SOC_DTS_THERMAL=y CONFIG_INTEL_PCH_THERMAL=y CONFIG_INTEL_TCC_COOLING=y -CONFIG_INTEL_MENLOW=y CONFIG_INTEL_SOC_PMIC=y CONFIG_INTEL_SOC_PMIC_CHTWC=y CONFIG_INTEL_SOC_PMIC_CHTDC_TI=y diff --git a/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend b/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend index 02f2be3a..99e25488 100644 --- a/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend +++ b/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend @@ -4,7 +4,6 @@ SRC_URI:append = " \ file://acpi-bgrt.cfg \ file://dts.cfg \ file://enable-memconsole-coreboot.cfg \ - file://efivars.cfg \ file://intel-mei.cfg \ file://intel-other.cfg \ file://intel-sound.cfg \ From 64d384bcbeca9d9ef1a4ed836bae10bcf7bda690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mrzyg=C5=82=C3=B3d?= Date: Wed, 11 Sep 2024 12:16:13 +0200 Subject: [PATCH 06/50] recipes-connectivity: wolfssl: Ignore [buildpaths] QA ISSUE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch fixes: WARNING: wolfssl-5.7.0-r0 do_package_qa: QA Issue: File /usr/lib/libwolfssl.so.42.1.0 in package wolfssl contains reference to TMPDIR [buildpaths] Signed-off-by: Daniel Mrzygłód --- meta-dts-distro/recipes-connectivity/wolfssl/wolfssl_%.bbappend | 1 + 1 file changed, 1 insertion(+) create mode 100644 meta-dts-distro/recipes-connectivity/wolfssl/wolfssl_%.bbappend diff --git a/meta-dts-distro/recipes-connectivity/wolfssl/wolfssl_%.bbappend b/meta-dts-distro/recipes-connectivity/wolfssl/wolfssl_%.bbappend new file mode 100644 index 00000000..968a7239 --- /dev/null +++ b/meta-dts-distro/recipes-connectivity/wolfssl/wolfssl_%.bbappend @@ -0,0 +1 @@ +INSANE_SKIP:${PN} += "buildpaths" From 08a75ceeb6060982c2bf41165cec5baa0c607a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mrzyg=C5=82=C3=B3d?= Date: Wed, 11 Sep 2024 12:04:43 +0200 Subject: [PATCH 07/50] recipes-gnome: gcab: add bbapend that disable qa tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WARNING: gcab-1.6-r0 do_package_qa: QA Issue: File /usr/src/debug/gcab/1.6/libgcab/gcab-enums.c in package gcab-src contains reference to TMPDIR [buildpaths] Disable QA checkout for this package: do_package_qa[noexec] = "1" Signed-off-by: Daniel Mrzygłód --- meta-dts-distro/recipes-gnome/gcab/gcab_%.bbappend | 1 + 1 file changed, 1 insertion(+) create mode 100644 meta-dts-distro/recipes-gnome/gcab/gcab_%.bbappend diff --git a/meta-dts-distro/recipes-gnome/gcab/gcab_%.bbappend b/meta-dts-distro/recipes-gnome/gcab/gcab_%.bbappend new file mode 100644 index 00000000..8517eb99 --- /dev/null +++ b/meta-dts-distro/recipes-gnome/gcab/gcab_%.bbappend @@ -0,0 +1 @@ +do_package_qa[noexec] = "1" From 023a0156c88e28d86c2015a7136be4d63548f4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= Date: Mon, 21 Oct 2024 12:02:53 +0200 Subject: [PATCH 08/50] recipes-kernel: linux-yocto: add efivars.cfg back to SRC_URI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Iwanicki --- meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend b/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend index 99e25488..3c3e3fc6 100644 --- a/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend +++ b/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend @@ -3,6 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI:append = " \ file://acpi-bgrt.cfg \ file://dts.cfg \ + file://efivars.cfg \ file://enable-memconsole-coreboot.cfg \ file://intel-mei.cfg \ file://intel-other.cfg \ From 7e5b6b0faaa2255c0b0eb3e0a77cb21ed2b37bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= Date: Mon, 21 Oct 2024 12:45:28 +0200 Subject: [PATCH 09/50] recipes-gnome: gcab: use insane_skip instead of disabling whole qa check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Iwanicki --- meta-dts-distro/recipes-gnome/gcab/gcab_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-dts-distro/recipes-gnome/gcab/gcab_%.bbappend b/meta-dts-distro/recipes-gnome/gcab/gcab_%.bbappend index 8517eb99..8c525e7b 100644 --- a/meta-dts-distro/recipes-gnome/gcab/gcab_%.bbappend +++ b/meta-dts-distro/recipes-gnome/gcab/gcab_%.bbappend @@ -1 +1 @@ -do_package_qa[noexec] = "1" +insane_skip += "buildpaths" From f6ce1ca7dc937fa4109f5f24e2c98aeff559b187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= Date: Mon, 21 Oct 2024 13:21:33 +0200 Subject: [PATCH 10/50] recipes-bsp: intelp2m: remove useless 'go version' command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Iwanicki --- meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb | 1 - 1 file changed, 1 deletion(-) 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 b4478df0..167f5f76 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb @@ -23,7 +23,6 @@ inherit go do_compile() { export GOARCH="${TARGET_GOARCH}" cd ${S} - go version go build -trimpath -v -o intelp2m } From a225b4e2c65617672662fafc9bdb9f7b643b151b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= Date: Tue, 22 Oct 2024 16:18:19 +0200 Subject: [PATCH 11/50] recipes-core: base-files: Mount efivars by default. Needed by FUM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Iwanicki --- meta-dts-distro/recipes-core/base-files/base-files_%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-dts-distro/recipes-core/base-files/base-files_%.bbappend b/meta-dts-distro/recipes-core/base-files/base-files_%.bbappend index 37534eb3..cd0d6224 100644 --- a/meta-dts-distro/recipes-core/base-files/base-files_%.bbappend +++ b/meta-dts-distro/recipes-core/base-files/base-files_%.bbappend @@ -1 +1,5 @@ hostname = "DasharoToolsSuite" + +do_install:append() { + echo 'efivarfs /sys/firmware/efi/efivars efivarfs ro,nosuid,nodev,noexec,nofail 0 0' >> ${D}${sysconfdir}/fstab +} From e58279e97665e8a56af9779f4b0ec1b988644818 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Tue, 12 Nov 2024 16:24:05 +0100 Subject: [PATCH 12/50] .github/workflows: Add workflow with DTS tests Signed-off-by: Pawel Langowski --- .github/workflows/test.yml | 108 +++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 00000000..733908c7 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,108 @@ +--- +name: CI on push release tag +on: + pull_request: + branches: + - 'main' +jobs: + run-tests: + name: Run DTS tests + if: ${{ github.head_ref == 'develop' }} + runs-on: + labels: dts-builder + steps: + - name: Checkout meta-dts repo + uses: actions/checkout@v2 + with: + path: "meta-dts" + - name: Build DTS image + shell: bash + id: build_image + run: | + for attempt in {1..5}; do + if kas-container build meta-dts/kas.yml; then + echo "Build command succeeded on attempt $attempt" + break + else + echo "Build command failed on attempt $attempt" + if [ $attempt -lt 5 ]; then + sleep 5 + fi + fi + done + continue-on-error: true + - name: Report build command + run: | + if [ ${{ steps.build_image.outcome }} == 'failure' ]; then + echo "All build attempts failed." + exit 1 + else + echo "At least one build attempt succeeded." + fi + - name: Checkout OSFV repo + uses: actions/checkout@v4 + with: + repository: 'Dasharo/open-source-firmware-validation' + path: 'open-source-firmware-validation' + submodules: 'recursive' + ref: 'develop' + - name: Copy DTS binary + shell: bash + run: | + bmaptool copy \ + --bmap build/tmp/deploy/images/genericx86-64/dts-base-image-genericx86-64.wic.bmap \ + build/tmp/deploy/images/genericx86-64/dts-base-image-genericx86-64.wic.gz \ + open-source-firmware-validation/scripts/ci/qemu-data/dts.img + - name: Set up Python + uses: actions/setup-python@v5 + with: + cache: 'pip' + - name: Install requirements + shell: bash + run: | + cd open-source-firmware-validation + python3 -m virtualenv venv + source venv/bin/activate + pip install -r requirements.txt + - name: Run QEMU + shell: bash + id: run_qemu + run: | + HDD_PATH=./scripts/ci/qemu-data/dts.img ./scripts/ci/qemu-run.sh nographic os & + pid=$! + echo "qemu_pid=$pid" >> "$GITHUB_OUTPUT" + - name: Create directory for logs + shell: bash + id: log_dirs + run: | + timestamp=$(date -u +%Y-%m-%dT%H:%M:%S%Z) + directory="/tmp/dts-test-ci-${timestamp}" + mkdir $directory + echo "directory=$directory" >> "$GITHUB_OUTPUT" + # TODO: Add DPP keys to secrets and use them in tests + - name: Run tests + shell: bash + env: + DPP_EMAIL: ${{ secrets.DPP_EMAIL }} + DPP_PASSWORD: ${{ secrets.DPP_PASSWORD }} + LOG_DIR: ${{ steps.log_dirs.outputs.directory }} + run: | + robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ + dts/dts-e2e.robot > $LOG_DIR/output.log + - name: Copy log + shell: bash + env: + LOG_DIR: ${{ steps.log_dirs.outputs.directory }} + run: | + cp log.html $LOG_DIR/log.html + - name: Cleanup + if: always() + shell: bash + run: | + deactivate + qemu_pid="${{ steps.run_qemu.outputs.qemu_pid }}" + if [ ! -z "$qemu_pid" ]; then + kill $qemu_pid + fi + cd .. + rm -rf open-source-firmware-validation meta-dts From 192361087c34d912d363de01d87c8de96396d35e Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Tue, 19 Nov 2024 10:53:18 +0100 Subject: [PATCH 13/50] .github/workflows: Add build.yml reusable workflow Signed-off-by: Pawel Langowski --- .github/workflows/build.yml | 38 +++++++++++++++++++++++++++++++++++ .github/workflows/ci.yml | 35 ++------------------------------ .github/workflows/develop.yml | 35 ++------------------------------ .github/workflows/test.yml | 33 ++++-------------------------- 4 files changed, 46 insertions(+), 95 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..7d3da358 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,38 @@ +--- +name: Build DTS +on: + workflow_call: + +jobs: + build: + runs-on: + labels: dts-builder + steps: + - name: Checkout meta-dts repo + uses: actions/checkout@v2 + with: + path: "meta-dts" + - name: Build DTS image + shell: bash + id: build_image + run: | + for attempt in {1..5}; do + if kas-container build meta-dts/kas.yml; then + echo "Build command succeeded on attempt $attempt" + break + else + echo "Build command failed on attempt $attempt" + if [ $attempt -lt 5 ]; then + sleep 5 + fi + fi + done + continue-on-error: true + - name: Report build command + run: | + if [ ${{ steps.build_image.outcome }} == 'failure' ]; then + echo "All build attempts failed." + exit 1 + else + echo "At least one build attempt succeeded." + fi diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a48fee4..12d0b7f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,38 +8,7 @@ on: jobs: build: - name: Build system image - runs-on: - labels: dts-builder - steps: - - name: Checkout meta-dts repo - uses: actions/checkout@v2 - with: - path: "meta-dts" - - name: Build DTS image - shell: bash - id: build_image - run: | - for attempt in {1..5}; do - if kas-container build meta-dts/kas.yml; then - echo "Build command succeeded on attempt $attempt" - break - else - echo "Build command failed on attempt $attempt" - if [ $attempt -lt 5 ]; then - sleep 5 - fi - fi - done - continue-on-error: true - - name: Report build command - run: | - if [ ${{ steps.build_image.outcome }} == 'failure' ]; then - echo "All build attempts failed." - exit 1 - else - echo "At least one build attempt succeeded." - fi + uses: ./.github/workflows/build.yml deploy-images: name: Deploy DTS artifacts on boot.dasharo.com and GitHub Release if: ${{ always() && contains(join(needs.*.result, ','), 'success') }} @@ -152,4 +121,4 @@ jobs: rm -rf ~/.ssh/dts-ci-key rm -rf dts-release-cicd-pipeline rm -f ~/.ssh/gitea_dts_release_cicd - rm -rf build + rm -rf build meta-dts diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 1920ff12..35c16c7a 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -7,38 +7,7 @@ on: jobs: build: - name: Build system image - runs-on: - labels: dts-builder - steps: - - name: Checkout meta-dts repo - uses: actions/checkout@v2 - with: - path: "meta-dts" - - name: Build DTS image - shell: bash - id: build_image - run: | - for attempt in {1..5}; do - if kas-container build meta-dts/kas.yml; then - echo "Build command succeeded on attempt $attempt" - break - else - echo "Build command failed on attempt $attempt" - if [ $attempt -lt 5 ]; then - sleep 5 - fi - fi - done - continue-on-error: true - - name: Report build command - run: | - if [ ${{ steps.build_image.outcome }} == 'failure' ]; then - echo "All build attempts failed." - exit 1 - else - echo "At least one build attempt succeeded." - fi + uses: ./.github/workflows/build.yml deploy-images: name: Deploy DTS artifacts on boot.dasharo.com if: ${{ always() && contains(join(needs.*.result, ','), 'success') }} @@ -143,4 +112,4 @@ jobs: rm -rf ~/.ssh/dts-ci-key rm -rf dts-release-cicd-pipeline rm -f ~/.ssh/gitea_dts_release_cicd - rm -rf build + rm -rf build meta-dts diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 733908c7..74bf214c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,40 +5,15 @@ on: branches: - 'main' jobs: + build-dts: + uses: ./.github/workflows/build.yml run-tests: name: Run DTS tests - if: ${{ github.head_ref == 'develop' }} + if: ${{ github.head_ref == 'develop' && contains(join(needs.*.result, ','), 'success') }} + needs: build runs-on: labels: dts-builder steps: - - name: Checkout meta-dts repo - uses: actions/checkout@v2 - with: - path: "meta-dts" - - name: Build DTS image - shell: bash - id: build_image - run: | - for attempt in {1..5}; do - if kas-container build meta-dts/kas.yml; then - echo "Build command succeeded on attempt $attempt" - break - else - echo "Build command failed on attempt $attempt" - if [ $attempt -lt 5 ]; then - sleep 5 - fi - fi - done - continue-on-error: true - - name: Report build command - run: | - if [ ${{ steps.build_image.outcome }} == 'failure' ]; then - echo "All build attempts failed." - exit 1 - else - echo "At least one build attempt succeeded." - fi - name: Checkout OSFV repo uses: actions/checkout@v4 with: From 980b61335521194f4db526bdfe21eecb289116e3 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Tue, 19 Nov 2024 12:32:25 +0100 Subject: [PATCH 14/50] .github/workflows/test.yml: Print test statuses to stdout Signed-off-by: Pawel Langowski --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 74bf214c..b7b897d5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,7 +63,7 @@ jobs: LOG_DIR: ${{ steps.log_dirs.outputs.directory }} run: | robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ - dts/dts-e2e.robot > $LOG_DIR/output.log + dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output.log | grep "| PASS |\|| FAIL |" - name: Copy log shell: bash env: From 0bd2bae6035a6c9a7c71c732f5a4185a243adc61 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Tue, 19 Nov 2024 12:42:02 +0100 Subject: [PATCH 15/50] .github/workflows/test.yml: Specify Python version (3.12) Signed-off-by: Pawel Langowski --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b7b897d5..5f4b0e09 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,6 +32,7 @@ jobs: uses: actions/setup-python@v5 with: cache: 'pip' + python-version: '3.12' - name: Install requirements shell: bash run: | From 950dbad34e985e7d37443b8e1f0b1a93e37e5932 Mon Sep 17 00:00:00 2001 From: Daniil Klimuk Date: Thu, 8 Aug 2024 11:04:38 +0200 Subject: [PATCH 16/50] distro: recipes-kernel: linux-yocto: add capsule update configuration Signed-off-by: Daniil Klimuk --- .../recipes-kernel/kernel/linux-yocto/capsule-update.cfg | 1 + meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend | 1 + 2 files changed, 2 insertions(+) create mode 100644 meta-dts-distro/recipes-kernel/kernel/linux-yocto/capsule-update.cfg diff --git a/meta-dts-distro/recipes-kernel/kernel/linux-yocto/capsule-update.cfg b/meta-dts-distro/recipes-kernel/kernel/linux-yocto/capsule-update.cfg new file mode 100644 index 00000000..0a98fa5d --- /dev/null +++ b/meta-dts-distro/recipes-kernel/kernel/linux-yocto/capsule-update.cfg @@ -0,0 +1 @@ +CONFIG_EFI_CAPSULE_LOADER=y diff --git a/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend b/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend index 3c3e3fc6..441c12a0 100644 --- a/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend +++ b/meta-dts-distro/recipes-kernel/kernel/linux-yocto_%.bbappend @@ -13,6 +13,7 @@ SRC_URI:append = " \ file://silence-terminal-logs.cfg \ file://touchpad.cfg \ file://tpm.cfg \ + file://capsule-update.cfg \ " # Enable support for additional file systems: From 9de3b6b38940576c1ac4d56d3785e390e9773df5 Mon Sep 17 00:00:00 2001 From: Daniil Klimuk Date: Fri, 27 Sep 2024 12:00:15 +0200 Subject: [PATCH 17/50] distro: recipes-dts: dts-scripts: bump revision Signed-off-by: Daniil Klimuk --- 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 bd22d65f..6d92efea 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 = "a5f6ef77111cf2dca57888c4a072b6e5d078fa35" +SRCREV = "e757053cae37453cbd7dfaebf0f1a1676829fb25" S = "${WORKDIR}/git" From 379f816e541920a0d8e927da36b3962d8694c493 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Tue, 19 Nov 2024 14:51:13 +0100 Subject: [PATCH 18/50] .github/workflows/test.yml: Fix Signed-off-by: Pawel Langowski --- .github/workflows/build.yml | 11 +++- .github/workflows/ci.yml | 2 + .github/workflows/develop.yml | 2 + .github/workflows/test.yml | 101 ++++++++++++++++++++++++---------- .github/workflows/weekly.yml | 46 +--------------- 5 files changed, 90 insertions(+), 72 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d3da358..e852d5a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,10 @@ name: Build DTS on: workflow_call: + inputs: + cacheless: + type: boolean + required: true jobs: build: @@ -9,9 +13,14 @@ jobs: labels: dts-builder steps: - name: Checkout meta-dts repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: "meta-dts" + - name: Prepare cache-less build configuration + if: ${{ inputs.cacheless }} + shell: bash + run: | + sed -i '/cache.yml/d' meta-dts/kas.yml - name: Build DTS image shell: bash id: build_image diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12d0b7f6..1bc0d990 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,8 @@ on: jobs: build: uses: ./.github/workflows/build.yml + with: + cacheless: false deploy-images: name: Deploy DTS artifacts on boot.dasharo.com and GitHub Release if: ${{ always() && contains(join(needs.*.result, ','), 'success') }} diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 35c16c7a..1b795679 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -8,6 +8,8 @@ on: jobs: build: uses: ./.github/workflows/build.yml + with: + cacheless: false deploy-images: name: Deploy DTS artifacts on boot.dasharo.com if: ${{ always() && contains(join(needs.*.result, ','), 'success') }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5f4b0e09..9c8862e3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,5 @@ --- -name: CI on push release tag +name: Run DTS tests on: pull_request: branches: @@ -7,6 +7,8 @@ on: jobs: build-dts: uses: ./.github/workflows/build.yml + with: + cacheless: false run-tests: name: Run DTS tests if: ${{ github.head_ref == 'develop' && contains(join(needs.*.result, ','), 'success') }} @@ -21,18 +23,19 @@ jobs: path: 'open-source-firmware-validation' submodules: 'recursive' ref: 'develop' - - name: Copy DTS binary + - name: Run IPXE server shell: bash run: | - bmaptool copy \ - --bmap build/tmp/deploy/images/genericx86-64/dts-base-image-genericx86-64.wic.bmap \ - build/tmp/deploy/images/genericx86-64/dts-base-image-genericx86-64.wic.gz \ - open-source-firmware-validation/scripts/ci/qemu-data/dts.img - - name: Set up Python - uses: actions/setup-python@v5 - with: - cache: 'pip' - python-version: '3.12' + mkdir ipxe + cp build/tmp/deploy/images/genericx86-64/dts-base-image-genericx86-64.cpio.gz ipxe + cp build/tmp/deploy/images/genericx86-64/bzImage ipxe + echo -e "\n + #!ipxe\n + imgfetch --name file_kernel bzImage\n + imgfetch --name file_initrd dts-base-image-genericx86-64.cpio.gz\n + kernel file_kernel root=/dev/nfs initrd=file_initrd\n + boot" > ipxe/dts.ipxe + cd ipxe && python3-m http.server 4321 & - name: Install requirements shell: bash run: | @@ -44,9 +47,9 @@ jobs: shell: bash id: run_qemu run: | - HDD_PATH=./scripts/ci/qemu-data/dts.img ./scripts/ci/qemu-run.sh nographic os & - pid=$! - echo "qemu_pid=$pid" >> "$GITHUB_OUTPUT" + cd open-source-firmware-validation/scripts/ci + qemu-img create -f qcow2 qemu-data/hdd.qcow 20G + ./qemu-run.sh nographic os & - name: Create directory for logs shell: bash id: log_dirs @@ -55,30 +58,72 @@ jobs: directory="/tmp/dts-test-ci-${timestamp}" mkdir $directory echo "directory=$directory" >> "$GITHUB_OUTPUT" - # TODO: Add DPP keys to secrets and use them in tests - name: Run tests shell: bash env: - DPP_EMAIL: ${{ secrets.DPP_EMAIL }} - DPP_PASSWORD: ${{ secrets.DPP_PASSWORD }} LOG_DIR: ${{ steps.log_dirs.outputs.directory }} run: | + cd open-source-firmware-validation + source venv/bin/activate + # This file is already present on dts-builder. + # It contains credentials for DPP subscriptions. + # It has the following form: + # DPP_PASSWORD="..." + # _DOWNLOADS="download key" + # _LOGS="logs key" + # (...) + source ~/.secrets/dpp-keys + ip_addr=$(ip -o -4 addr list eno2 | awk '{print $4}' | cut -d/ -f1) + + robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ + -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$MSI_DOWNLOAD \ + -v dpp_logs_key:$MSI_LOGS -v netboot_utilities_support:True \ + -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe + -i "msi" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_msi.log | grep "| PASS |\|| FAIL |" + + robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ + -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$MSI_HEADS_DOWNLOAD \ + -v dpp_logs_key:$MSI_HEADS_LOGS -v netboot_utilities_support:True \ + -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe + -i "msi_heads" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_msi_heads.log | grep "| PASS |\|| FAIL |" + + robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ + -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$OPTIPLEX_DOWNLOAD \ + -v dpp_logs_key:$OPTIPLEX_LOGS -v netboot_utilities_support:True \ + -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe + -i "optiplex" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_optiplex.log | grep "| PASS |\|| FAIL |" + robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ - dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output.log | grep "| PASS |\|| FAIL |" + -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$NOVACUSTOM_HEADS_DOWNLOAD \ + -v dpp_logs_key:$NOVACUSTOM_HEADS_LOGS -v netboot_utilities_support:True \ + -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe + -i "novacustom_heads" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_nc_heads.log | grep "| PASS |\|| FAIL |" + + robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ + -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$PCENGINES_DOWNLOAD \ + -v dpp_logs_key:$PCENGINES_LOGS -v netboot_utilities_support:True \ + -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe + -i "pcengines" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_pcengines.log | grep "| PASS |\|| FAIL |" + + robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ + -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$PCENGINES_SEABIOS_DOWNLOAD \ + -v dpp_logs_key:$PCENGINES_SEABIOS_LOGS -v netboot_utilities_support:True \ + -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe + -i "pcengines_seabios" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_pcengines_seabios.log | grep "| PASS |\|| FAIL |" - name: Copy log shell: bash env: LOG_DIR: ${{ steps.log_dirs.outputs.directory }} run: | - cp log.html $LOG_DIR/log.html - - name: Cleanup - if: always() + cp open-source-firmware-validation/log.html $LOG_DIR/log.html + cleanup: + name: Cleanup + if: always() + needs: run-tests + runs-on: + labels: dts-builder + steps: + - name: Cleanup after tests shell: bash run: | - deactivate - qemu_pid="${{ steps.run_qemu.outputs.qemu_pid }}" - if [ ! -z "$qemu_pid" ]; then - kill $qemu_pid - fi - cd .. - rm -rf open-source-firmware-validation meta-dts + rm -rf open-source-firmware-validation meta-dts build ipxe diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 333e6942..88e12d81 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -7,49 +7,9 @@ on: jobs: build: - name: Build system image without using cache - runs-on: - labels: dts-builder - steps: - - name: Prepare SSH key - shell: bash - env: - SSH_KEY: ${{secrets.SSH_KEY}} - run: | - echo -e ${SSH_KEY} > ~/.ssh/dts-ci-key - chmod 600 ~/.ssh/dts-ci-key - - name: Checkout meta-dts repo - uses: actions/checkout@v2 - with: - path: "meta-dts" - - name: Prepare cache-less build configuration - shell: bash - run: | - sed -i '/cache.yml/d' meta-dts/kas.yml - - name: Build DTS image - shell: bash - id: build_image - run: | - for attempt in {1..5}; do - if kas-container build meta-dts/kas.yml; then - echo "Build command succeeded on attempt $attempt" - break - else - echo "Build command failed on attempt $attempt" - if [ $attempt -lt 5 ]; then - sleep 5 - fi - fi - done - continue-on-error: true - - name: Report build command - run: | - if [ ${{ steps.build_image.outcome }} == 'failure' ]; then - echo "All build attempts failed." - exit 1 - else - echo "At least one build attempt succeeded." - fi + uses: ./.github/workflows/build.yml + with: + cacheless: true deploy-cache: name: Deploy cache on cache.dasharo.com if: always() From c86b8a4cfed15a7595db38fdfa55e3287be99210 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Mon, 5 Aug 2024 09:16:20 +0200 Subject: [PATCH 19/50] Add generate-changed-recipes script + specify PV for git recipes Signed-off-by: Pawel Langowski --- .../coreboot-utils/cbfstool_git.bb | 2 + .../recipes-bsp/coreboot-utils/cbmem_git.bb | 2 + .../recipes-bsp/coreboot-utils/ectool_git.bb | 2 + .../recipes-bsp/coreboot-utils/futil_git.bb | 2 + .../recipes-bsp/coreboot-utils/ifdtool_git.bb | 2 + .../coreboot-utils/intelmetool_git.bb | 2 + .../coreboot-utils/intelp2m_git.bb | 2 + .../coreboot-utils/inteltool_git.bb | 2 + .../recipes-bsp/coreboot-utils/msrtool_git.bb | 1 + .../coreboot-utils/nvramtool_git.bb | 2 + .../coreboot-utils/superiotool_git.bb | 2 + .../recipes-bsp/flashrom/flashrom_git.bb | 2 + .../txe-secure-boot/smmstoretool_git.bb | 2 + .../txe-secure-boot/txesbmantool_git.bb | 2 + .../3mdeb-secpack/3mdeb-secpack_git.bb | 3 ++ .../dasharo-configuration-utility_git.bb | 2 + .../minio-cli/minio-cli_git.bb | 2 + .../kernel/acpi-call-dkms_git.bb | 2 + .../cloudsend/cloudsend_git.bb | 2 + scripts/generate-changed-recipes | 43 +++++++++++++++++++ 20 files changed, 81 insertions(+) create mode 100755 scripts/generate-changed-recipes 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 55b67e4b..e54779e0 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/cbfstool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/cbfstool_git.bb @@ -2,6 +2,8 @@ require coreboot-utils.inc SUMMARY = "Tool for manipulating CBFS file" +PV = "1.0+git${SRCPV}" + 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 68f4eb24..27ee373b 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/cbmem_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/cbmem_git.bb @@ -4,6 +4,8 @@ SUMMARY = "CBMEM parser to read e.g. timestamps and console log" DEPENDS += "pciutils zlib" +PV = "1.0+git${SRCPV}" + EXTRA_OEMAKE = ' \ DESTDIR="${D}" \ PREFIX="${prefix}" \ 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 0dba1c45..4e676e97 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/ectool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/ectool_git.bb @@ -2,6 +2,8 @@ require coreboot-utils.inc SUMMARY = "Dumps the RAM of a laptop's Embedded/Environmental Controller (EC)." +PV = "1.0+git${SRCPV}" + EXTRA_OEMAKE = ' \ DESTDIR="${D}" \ PREFIX="${prefix}" \ 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 3fd547e5..09be6ec6 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/futil_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/futil_git.bb @@ -12,6 +12,8 @@ DEPENDS += " \ flashrom \ " +PV = "1.0+git${SRCPV}" + SRC_URI = " \ git://github.com/Dasharo/vboot.git;protocol=https;branch=dasharo \ file://0001-Makefile-disable-deprecated-warnigs-as-errors.patch \ 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 92df4cd7..4162563a 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/ifdtool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/ifdtool_git.bb @@ -2,6 +2,8 @@ require coreboot-utils.inc SUMMARY = "Extract and dump Intel Firmware Descriptor information" +PV = "1.0+git${SRCPV}" + TARGET_CC_ARCH += "${LDFLAGS}" EXTRA_OEMAKE = ' \ 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 290039d9..efb9370a 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/intelmetool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/intelmetool_git.bb @@ -4,6 +4,8 @@ SUMMARY = "Dump interesting things about Management Engine even if hidden" DEPENDS += "pciutils zlib" +PV = "1.0+git${SRCPV}" + EXTRA_OEMAKE = ' \ DESTDIR="${D}" \ PREFIX="${prefix}" \ 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 167f5f76..9bde536d 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb @@ -7,6 +7,8 @@ SUMMARY = "\ LIC_FILES_CHKSUM = "file://../../COPYING;md5=751419260aa954499f7abaabaa882bbe" +PV = "1.0+git${SRCPV}" + GO_IMPORT = "github.com/dasharo/coreboot/" # we need to override SRC_URI from coreboot-utils.inc so it's unpacked in the 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 4294a52c..66323555 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/inteltool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/inteltool_git.bb @@ -7,6 +7,8 @@ SUMMARY = "\ DEPENDS += "pciutils zlib" +PV = "1.0+git${SRCPV}" + EXTRA_OEMAKE = ' \ DESTDIR="${D}" \ PREFIX="${prefix}" \ 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 6736d2f5..8d9b530a 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/msrtool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/msrtool_git.bb @@ -2,6 +2,7 @@ require coreboot-utils.inc SUMMARY = "Dumps chipset-specific MSR registers." DEPENDS += "pciutils" +PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git/util/msrtool" export PREFIX = "${prefix}" 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 a8dcf100..e0be39b8 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/nvramtool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/nvramtool_git.bb @@ -2,6 +2,8 @@ require coreboot-utils.inc SUMMARY = "Reads and writes coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM. " +PV = "1.0+git${SRCPV}" + EXTRA_OEMAKE = ' \ DESTDIR="${D}" \ PREFIX="${prefix}" \ 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 4169f462..5c3197aa 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/superiotool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/superiotool_git.bb @@ -4,6 +4,8 @@ SUMMARY = "A user-space utility to detect Super I/O of a mainboard and provide d DEPENDS += "pciutils zlib" +PV = "1.0+git${SRCPV}" + EXTRA_OEMAKE = ' \ DESTDIR="${D}" \ PREFIX="${prefix}" \ diff --git a/meta-dts-distro/recipes-bsp/flashrom/flashrom_git.bb b/meta-dts-distro/recipes-bsp/flashrom/flashrom_git.bb index 42a24305..f45aed7a 100644 --- a/meta-dts-distro/recipes-bsp/flashrom/flashrom_git.bb +++ b/meta-dts-distro/recipes-bsp/flashrom/flashrom_git.bb @@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "pciutils libusb libftdi" +PV = "dasharo-v1.2.2+git${SRCPV}" + BRANCH = "dasharo-release" SRC_URI = "git://github.com/Dasharo/flashrom.git;branch=${BRANCH};protocol=https" SRCREV = "a961af7a39138216660b410a4a0bec48ef0fdd35" 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 abd0fa34..465741dd 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 @@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = " \ file://${WORKDIR}/git/LICENSES/GPL-2.0-or-later.txt;md5=261bea1168c0bdfa73232ee90df11eb6 \ " +PV = "1.0+git${SRCPV}" + SRC_URI = " \ git://github.com/coreboot/coreboot.git;branch=main;protocol=https \ file://a5df001.diff;patchdir=${WORKDIR}/git \ 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 a85ac968..0415fb27 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 @@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "wolfssl" +PV = "1.0+git${SRCPV}" + SRC_URI = " \ git://github.com/Dasharo/coreboot.git;branch=dasharo;protocol=https \ " 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 e9f6473c..3a1ce149 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 @@ -8,11 +8,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 DEPENDS = "gnupg" +PV = "1.0+git${SRCPV}" + SRC_URI = " \ git://github.com/3mdeb/3mdeb-secpack.git;protocol=https;branch=master \ file://3mdeb-secpack.sh \ " SRCREV = "f52771d2d001c55b164fae397d060d6e5af9c733" + S = "${WORKDIR}/git" DASHARO_KEYS_HOMEDIR = "${WORKDIR}/dasharo_keys" 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 01196fff..ccca9a1e 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 @@ -6,6 +6,8 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +PV = "0.2.1+git${SRCPV}" + SRC_URI = " \ git://github.com/Dasharo/dcu.git;protocol=https;branch=main \ " 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 06b8d4d0..c2c33f9f 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 @@ -9,6 +9,8 @@ inherit go-mod LICENSE = "AGPL-3.0-only" LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=eb1e647870add0502f8f010b19de32af" +PV = "1.0+git${SRCPV}" + SRC_URI = "git://${GO_IMPORT};protocol=https;branch=master" SRCREV = "e7c9a733c680fe62066d24e8718f81938b4f6606" 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 c543f57b..13c25a05 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 @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=025e46592215127e8c98b397ff29a037" inherit module +PV = "1.2.2+git${SRCPV}" + SRC_URI = "\ git://github.com/nix-community/acpi_call.git;branch=master;protocol=https \ file://0001-Makefile-fixing-build-errrors.patch \ diff --git a/meta-dts-distro/recipes-support/cloudsend/cloudsend_git.bb b/meta-dts-distro/recipes-support/cloudsend/cloudsend_git.bb index 90f4eec0..bb228854 100644 --- a/meta-dts-distro/recipes-support/cloudsend/cloudsend_git.bb +++ b/meta-dts-distro/recipes-support/cloudsend/cloudsend_git.bb @@ -10,6 +10,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +PV = "2.2.8+git${SRCPV}" + SRC_URI = "\ git://github.com/tavinus/cloudsend.sh.git;protocol=https;branch=master \ file://0001-cloudsend.sh-Add-fail-with-body-flag.patch \ diff --git a/scripts/generate-changed-recipes b/scripts/generate-changed-recipes new file mode 100755 index 00000000..85aad1ed --- /dev/null +++ b/scripts/generate-changed-recipes @@ -0,0 +1,43 @@ +#!/usr/bin/python + +from pathlib import Path +import os +import sys + + +def main(): + if len(sys.argv) != 3: + print(f"Usage: {os.path.basename(__file__)} manifest_old manifest_new") + return sys.exit(1) + + manifest_old: dict[str, str] = { + line.split()[0]: line.split()[2] + for line in Path(sys.argv[1]).read_text().splitlines() + } + manifest_new: dict[str, str] = { + line.split()[0]: line.split()[2] + for line in Path(sys.argv[2]).read_text().splitlines() + } + + changed_recipes = [ + recipe for recipe in manifest_old.keys() & manifest_new.keys() + if manifest_old[recipe] != manifest_new[recipe] + ] + new_recipes = manifest_new.keys() - manifest_old.keys() + deleted_recipes = manifest_old.keys() - manifest_new.keys() + + print("Changed recipes:") + for changed_recipe in changed_recipes: + print(f"{changed_recipe}: {manifest_old[changed_recipe]} -> {manifest_new[changed_recipe]}") + + print("New recipes:") + for new_recipe in new_recipes: + print(f"{new_recipe}: {manifest_new[new_recipe]}") + + print("Deleted recipes:") + for deleted_recipe in deleted_recipes: + print(f"{deleted_recipe}: {manifest_old[deleted_recipe]}") + + +if __name__ == "__main__": + main() From 26a9293070bb42feee6ba58cac96dabaacd73b23 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Mon, 5 Aug 2024 14:08:38 +0200 Subject: [PATCH 20/50] .github/workflows: Deploy manifest to boot.dasharo.com Signed-off-by: Pawel Langowski --- .github/workflows/ci.yml | 9 +++++++++ .github/workflows/develop.yml | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a48fee4..e9610e08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,6 +102,13 @@ jobs: # do not release iso image until issue is fixed # see: https://github.com/dasharo/dasharo-issues/issues/288 # scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.iso builder@10.1.40.2:boot/dts/${DTS_VER}/ + - name: Deploy manifest on boot.dasharo.com + shell: bash + run: | + DTS_VER="${{steps.dts-ver.outputs.DTS_VER}}" + cd build/tmp/deploy/images/genericx86-64/ + cp dts-base-image-genericx86-64.manifest dts-base-image-${DTS_VER}.manifest + scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.manifest builder@10.1.40.2:boot/dts/${DTS_VER}/ - name: Deploy sha256 on boot.dasharo.com shell: bash run: | @@ -111,6 +118,7 @@ jobs: sha256sum dts-base-image-${DTS_VER}.cpio.gz > dts-base-image-${DTS_VER}.cpio.gz.sha256 sha256sum dts-base-image-${DTS_VER}.wic.gz > dts-base-image-${DTS_VER}.wic.gz.sha256 sha256sum dts-base-image-${DTS_VER}.wic.bmap > dts-base-image-${DTS_VER}.wic.bmap.sha256 + sha256sum dts-base-image-${DTS_VER}.manifest > dts-base-image-${DTS_VER}.manifest.sha256 # do not release iso image until issue is fixed # see: https://github.com/dasharo/dasharo-issues/issues/288 # sha256sum dts-base-image-${DTS_VER}.iso > dts-base-image-${DTS_VER}.iso.sha256 @@ -118,6 +126,7 @@ jobs: scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.cpio.gz.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.wic.gz.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.wic.bmap.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ + scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.manifest.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ # do not release iso image until issue is fixed # see: https://github.com/dasharo/dasharo-issues/issues/288 # scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.iso.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 1920ff12..7ae2a19d 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -97,6 +97,13 @@ jobs: scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.wic.gz builder@10.1.40.2:boot/dts/${DTS_VER}/ scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.wic.bmap builder@10.1.40.2:boot/dts/${DTS_VER}/ scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.iso builder@10.1.40.2:boot/dts/${DTS_VER}/ + - name: Deploy manifest on boot.dasharo.com + shell: bash + run: | + DTS_VER="${{steps.dts-ver.outputs.DTS_VER}}" + cd build/tmp/deploy/images/genericx86-64/ + cp dts-base-image-genericx86-64.manifest dts-base-image-${DTS_VER}.manifest + scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.manifest builder@10.1.40.2:boot/dts/${DTS_VER}/ - name: Deploy sha256 on boot.dasharo.com shell: bash run: | @@ -107,11 +114,13 @@ jobs: sha256sum dts-base-image-${DTS_VER}.wic.gz > dts-base-image-${DTS_VER}.wic.gz.sha256 sha256sum dts-base-image-${DTS_VER}.wic.bmap > dts-base-image-${DTS_VER}.wic.bmap.sha256 sha256sum dts-base-image-${DTS_VER}.iso > dts-base-image-${DTS_VER}.iso.sha256 + sha256sum dts-base-image-${DTS_VER}.manifest > dts-base-image-${DTS_VER}.manifest.sha256 scp -i ~/.ssh/dts-ci-key bzImage-${DTS_VER}.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.cpio.gz.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.wic.gz.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.wic.bmap.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.iso.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ + scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.manifest.sha256 builder@10.1.40.2:boot/dts/${DTS_VER}/ - name: Update iPXE menu shell: bash run: | From b689dc1c264a84f7280ed1bfafdddf4b165b0886 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Tue, 20 Aug 2024 15:31:51 +0200 Subject: [PATCH 21/50] Use git-cliff to generate changelog Signed-off-by: Pawel Langowski --- .pre-commit-config.yaml | 2 +- CHANGELOG.md | 1190 +++++++++++++++++++++++++++------------ cliff.toml | 82 +++ generate-changelog.sh | 6 + 4 files changed, 930 insertions(+), 350 deletions(-) create mode 100644 cliff.toml create mode 100755 generate-changelog.sh diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8e6a84b8..306db980 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)|(diff)$ +exclude: .*\.(patch)|(diff)$|CHANGELOG.md repos: - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/CHANGELOG.md b/CHANGELOG.md index f533d2df..f941c55c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,357 +1,849 @@ -# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). + +## [Unreleased] + +### Added +- workflows: add 'v' to DTS_VER + + +### Changed +- workflows: get DTS_VER from tag not dts-distro.conf +- Rename python3-roca-detect_git_1.2.12.bb +- CHANGELOG: Reintroduce notes for v1.2.22 and v1.2.23 +- CHANGELOG: Fix kernel version for 2.0.0-rc1 +- kas-uefi-sb.yml: update to scarthgap +- Add generate-changed-recipes script + specify PV for git recipes +- .github/workflows: Deploy manifest to boot.dasharo.com +- Use git-cliff to generate changelog +- recipes-bsp/coreboot-utils: Use 4.21 as base version for coreboot-utils packages + + +### Fixed +- python3-roca-detect: fix missing dependencies + + +## [1.2.23] - 2024-06-27 + +### Added +- dts-functions: support seabios in check_se_creds() + + +### Changed +- dts-distro.conf: bump to v1.2.23 +- CHANGELOG.md: v1.2.23 + + +### Fixed +- dasharo-deploy: fix flashrom_extra_args + + +## [1.2.22] - 2024-06-27 + +### Added +- packagegroup-dts.bb: add iperf3 to tools +- dts-base-image: add lshw +- meta-dts-distro: add python3-roca-detect +- meta-dts-distro: add rdepends for python3-roca-detect +- CHANGELOG.md: add v1.2.22 +- dts-functions: support seabios in check_se_creds() +- distro: support: hidapi: delete +- dts-distro.conf: add usrmerge to DISTRO_FEATURES +- dasharo-ectoo: add sha256sums for cargo deps +- distro: recipes-extended: minio-cli: add +- distro: recipes-dts: dts-scripts: add DES packaging support +- CHANGELOG: add changelog for v2.0.0-rc6 +- CHANGELOG: add changelog for v2.0.0-rc7 +- distro: dts-scripts: add support for NovaCustom V5x0TNx +- CHANGELOG: add changelog for v2.0.0 +- dts-base-image: add lshw +- meta-dts-distro: add python3-roca-detect +- meta-dts-distro: add rdepends for python3-roca-detect +- CHANGELOG.md: add v1.2.22 + + +### Changed +- dts-distro: coreboot-utils: Update branch and commit +- Fix Dell Optiplex variables to enable firmware download +- Remove unneeded line that is commented out +- dts: Remove separate EC update when updating Dasharo +- dts/dts-functions.sh: bump ncm adl heads to v0.9.1 +- conf/distro/dts-distro.conf: bump to v1.2.22 +- dts-functions.sh: clarify on heads update path +- dts: allow overriding some variables from env +- unit_tests: basic support for running in QEMU and OSFV +- dts: initial deployment for PC Engines SeaBIOS +- Revert "dts: Remove separate EC update when updating Dasharo" +- dasharo-deploy: preserve settings for seabios initial deploy +- dts-distro.conf: bump to v1.2.23 +- CHANGELOG.md: v1.2.23 +- workflows: get DTS_VER from tag not dts-distro.conf +- kas-uefi-sb: change meta-secure-core origin +- dts: dts-functions: make dts not use ICMP for network connection check +- distro: recipes-dts: move DTS scripts to another repo +- distro: recipes-dts: dts-scripts: do_install via Makefile +- dts-scripts_git.bb: relicense to Apache-2.0 +- distro: dts-scripts: bump revision +- distro: kernel: acpi-call-dkms: change license to GPLv3 +- update layers to scarthgap +- packagegroup-dts.bb: s/bmap-tools/bmaptool +- iotools: allow overriding CC +- kas/common.yml: enable buildstats class +- iotools: disable DEBUG by default +- dts-scripts: update SRCREV +- dts-scripts: update SRCREV +- README: Add section about cukinia tests +- meta-dts-distro: Add txesbmantool +- meta-dts-distro/recipes-tests/dts-tests: cukinia.conf: Add txesbmantool check +- recipes-bsp/txe-secure-boot/txe-secure-boot_git.bb: Use bindir in FILES +- recipes-bsp/txe-secure-boot/txesbmantool_git: Adjust PKG_CONFIG_PATH +- recipes-bsp/txe-secure-boot/txesbmantool_git: Specify EXTRA_OEMAKE + fix style +- meta-dts-distro/recipes Add smmstore tool +- meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git: Refactor file +- meta-dts-distro/recipes-tests/dts-tests: cukinia.conf: Add smmstoretool test +- recipes-bsp/txe-secure-boot/smmstoretool_git.bb: Specify EXTRA_OEMAKE +- Add basic pre-commit configuration +- recipes-dts: Remove dts-functions.sh +- recipes-support/cloudsend: Fetch script from git and add `--fail-with-body` flag +- Fix files so that pre-commit passes +- recipes-bsp/txe-secure-boot/txesbmantool_git: Update revision +- Change pre-commit hook revisions +- Add cpuid tool + cukinia test +- dts-distro.conf: bump to v2.0.0-rc1 +- openssh_%.bbappend: use sshd.service instead of sshd.socket +- workflow: Change action and jobs names +- dts-base-image.inc: Remove 'rootfs' suffix from image +- dts-scripts: Update revision +- dts-scripts: Add python3-semver dependency +- meta-dts-distro/recipes-support/dasharo-ectool: bump rev for Dasharo ACPI ID +- CHANGELOG.md: Add v2.0.0-rc2 +- dts-distro.conf: bump version to 2.0.0-rc2 +- dts-scripts: Change to rev removing separate EC update +- dasharo-ectool: automatically get PV hash from SRCCREV +- Revert "dts-scripts: Change to rev removing separate EC update" +- dts-scripts: Change to rev removing separate EC update +- dts-distro.conf: bump to 2.0.0-rc3 +- dts-scripts: update SRCREV +- 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 +- CHANGELOG: Add change notes v2.0.0-rc5 +- meta-dts/meta-dts-distro/recipes-dts/dts-scripts/dts-scripts_git.bb: SRCREV update +- python/python3-binwalk_2.3.3.bb: changed src to updated fork +- meta-dts-distro/conf/layer.conf: bump layer priority +- meta-dts-distro/recipes-dts: dts-scripts: Bump revision to support Optiplex +- meta-dts-distro/recipes-dts: dts-scripts: Bump SRCREV to support Optiplex DPP +- dts-distro.conf: bump to 2.0.0-rc6 +- pre-commit: use upstream oelint +- recipes-dts: dts-scripts: Bump SRCREV (verbose mode and sending logs) +- dts-distro.conf: bump to 2.0.0-rc7 +- dts-scripts: update to version with ODROID-H4+ support +- dts-scripts: update srcrev, fixes optiplex dpp link +- Clean up changelog +- dts-distro.conf: bump to 2.0.0 +- Remove unit_tests and scripts/local-deploy +- coreboot-utils: update SRCREV +- Revert "dts: Remove separate EC update when updating Dasharo" +- dasharo-deploy: preserve settings for seabios initial deploy + + +### Fixed +- dts: dts-functions.sh: fix BINARY_HAS_RW_B value +- dasharo-hcl-report: fix generation on qemu (coreboot + edk2) +- dasharo-deploy: fix flashrom_extra_args +- acpi-call-dkms: fix kernel module installation on scarthgap +- openssh: fix scp not working (Dasharo/dasharo-issues#840) +- tests: cukinia: Add semver module check +- workflows: fix dts-release-cicd-pipeline ssh errors + + +### Removed +- reports: dasharo-hcl-report: remove board_config call +- distro: kernel: linux-yocto: remove efi-ext.scc from KERNEL_FEATURES +- scripts: generate-ipxe-menu: delete root=/dev/nfs +- meta-dts-distro/recipes-devtool: remove outdated python3-uefi-firmware + + +## [1.2.21] - 2024-03-29 + +### Added +- deploy: add exit when trying to flash v1.1.1 on 13th gen and above +- deploy: add two missing DDR5 boards + + +### Changed +- deploy: make it exit only on specific boards +- Update meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy +- Update meta-dts-distro/recipes-dts/dts/dasharo-deploy/dasharo-deploy +- meta-dts-distro/recipes-dts: dts-functions: Add config for PC Engines APU boards +- recipes-dts: dts-functions.sh: Modify config for APU platforms +- recipes-dts: dts-functions.sh: Change PC Engines binary paths +- meta-dts-distro/recipes-dts: Changes to support PC Engines firmware deployment +- add support for hw-probe.AppImage +- add hw-probe section to the end of dasharo-hcl-report script +- add hw-probe tool +- make the wording in the prompt better +- move INSANE_SKIP to .bb +- distro: dts-distro: v1.2.21 bump +- CHANGELOG: v1.2.21 +- 3mdeb-secpack: update to f52771d2d001c55b164fae397d060d6e5af9c733 +- CHANGELOG.md: fill up after automatic update of components + + +### Fixed +- fix hcl report freezing, update script for hw-probe +- fix removing the mac adress from logs +>>>>>>> 17c474b669c2 (Use git-cliff to generate changelog) -All notable changes to the DTS project will be documented in this file. -## v2.0.1-rc2 - 2024-11-04 +### Removed +- deploy: remove extra boards -* kernel/linux-yocto: Add CONFIG_SERIAL_8250_DW -* recipes-extended: sbctl: add RDEPENDS to recipe -* flashrom: Add TGL chipset detection based on SPI PCI ID -## v2.0.1-rc1 - 2024-10-23 +## [1.2.20] - 2024-03-19 -* recipes-extended: sbctl: update sbctl to v0.15.4 -* dts-scripts: Print warning when creds don't support DPP packages +### Added +- CHANGELOG: add v1.2.20 -## 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 -* 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 -* 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 - 2024-08-28 - -* .github/workflows: Use separate SSH config for deploy job -* distro: extended: minio-cli: amend absolete-license -* .oelint-ruleset.json: Set homepageping to info so pre-commit ci can run - -## 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.21 -* Don't use ICMP for network connection verification -* Fixed scp not working without `-O` option -* Add txesbmantool, revision 235c946838dc8c619ff821c9791386d63f5cbd6a -* Add smmstoretool, revision 602653abed391ae1b1445ad86d0f05b8b5b678cb -* Add cpuid tool -* 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 - [DES](https://docs.dasharo.com/ways-you-can-help-us/#become-a-dasharo-entry-subscription-subscriber) - users. -* Addeded hw-probe utility which is used at the end of HCL report. -* Blocked possibility to run Dasharo deployment on Z690 platform with 13th gen - CPU; issue - [440](https://github.com/Dasharo/dasharo-issues/issues/440) -* Updated 3mdeb-secpack to revision f52771d2d001c55b164fae397d060d6e5af9c733 - -## v1.2.20 - 2024-03-19 - -* Enabled switch from Dasharo (coreboot+UEFI) to Dasharo (coreboot+heads) on - MSI Z690-A and MSI Z790-P. Switch back is not possible, please see information - from release notes for - [MSI Z690-A](https://github.com/Dasharo/docs/tree/master/docs/variants/msi_z690/heads.md#transition-from-dasharo-heads-back-to-uefi) - and - [MSI Z790-P](https://github.com/Dasharo/docs/tree/master/docs/variants/msi_z790/heads.md#transition-from-dasharo-heads-back-to-uefi). -* Added Dasharo (coreboot+heads) v0.9.0 for MSI Z690-A and MSI Z790-P. -* Fixed initial deployment for NovaCustom NV4x TGL; issue - [699](https://github.com/Dasharo/dasharo-issues/issues/699). -* Fixed HCL report generation when started from shell; issue - [736](https://github.com/Dasharo/dasharo-issues/issues/736). -* Changed DTS boot partition type to EFI; issue - [692](https://github.com/Dasharo/dasharo-issues/issues/692). -* Removed ISO image from release artifacts until reported usability issues are - fixed; issue - [288](https://github.com/Dasharo/dasharo-issues/issues/288#issuecomment-1995053693). -* Updated flashrom to revision f5a48aa6c67bd30603062bb4265419fd49f83870 -* Updated 3mdeb-secpack to revision c844b4ba536cde4813c8e4088bf069ac90ef9c27 - -## v1.2.19 - 2024-02-28 - -* Enabled switch between Dasharo (coreboot+UEFI) and Dasharo (coreboot+heads) on - NovaCustom NV4X ADL. -* Added Dasharo (coreboot+heads) v0.9.0 for NovaCustom NV4X ADL. -* Added missing TPM2 related packages needed to work with TPM2. -* Enabled IOMMU support in used Linux kernel. -* Fixed feature to [run commands from iPXE - shell](https://docs.dasharo.com/dasharo-tools-suite/documentation/#run-commands-from-ipxe-shell) -* Updated 3mdeb-secpack to revision c48af6eb2698f255c19a48a602b0e474137b07ef - -## v1.2.18 - 2024-01-22 - -* Bumped supported firmware versions of MSI Z690-A to v1.1.3 and MSI Z790-P to - v0.9.1. -* Improved logic for determining flashrom update parameters. - -## v1.2.17 - 2024-01-17 - -* Bumped supported firmware versions of NovaCustom NS5X TGL to v1.5.2. -* Fixed DTS build with UEFI Secure Boot enabled. -* Fixed minor typos in scripts. -* Updated 3mdeb-secpack to revision 2225894887fc81a1c72b067edbe348b5f3f02a05 - -## v1.2.16 - 2024-01-11 - -* Bumped supported firmware versions of NovaCustom NV4X TGL to v1.5.2. -* Improved release process of DTS images in release-candidate versions. - -## v1.2.15 - 2024-01-11 - -* Fixed GPG signature verification on MSI and Dell OptiPlex platforms. -* Updated ACM checksums used when deploying Dasharo firmware on Dell OptiPlex. -* Enhanced the user experience (UX) when running deployment or update - procedures. Fewer logs are displayed on the terminal, while all of them are - still stored under the `/var/local` path. -* Improved the CI/CD pipelines. - -## v1.2.14 - 2024-01-03 - -* Added 3mdeb Master Key and 3mdeb Dasharo Master Key from - [3mdeb-secpack](https://github.com/3mdeb/3mdeb-secpack/) with trust set to - ultimate. -* Added wic.bmap files to release artifacts; issue - [70](https://github.com/Dasharo/meta-dts/issues/70). - -## v1.2.13 - 2023-12-22 +### Changed +- workflows: ci.yml: comment out releasing iso image +- flashrom: update to f5a48aa6c67bd30603062bb4265419fd49f83870 +- 3mdeb-secpack: update to c844b4ba536cde4813c8e4088bf069ac90ef9c27 +- CHANGELOG.md: fill up after automatic update of components +- distro: dts-distro: bump v1.2.20 -* Added [dasharo_ectool](https://github.com/Dasharo/ec) for updating EC. -* Added [bg-suite](https://github.com/9elements/converged-security-suite/tree/main/cmd/bg-suite). -* Added [Dasharo configuration utility](https://github.com/Dasharo/dcu) that is - 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 for exFAT and NTFS file systems. -* Added ACPI BGRT support in kernel. -* Added signature verification of Dasharo firmware binaries. -* 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 - calling update; issue - [588](https://github.com/Dasharo/dasharo-issues/issues/588). - -## v1.2.12 - 2023-11-03 - -* Fixed updating boards without Vboot slot B. - -## v1.2.11 - 2023-10-31 - -* Bumped supported firmware versions of NovaCustom to 1.5.1/1.7.1. - -## v1.2.10 - 2023-10-27 - -* Added - [coreboot_customizer](https://docs.dasharo.com/guides/image-customization/#usage) - which allow to change logo displayed on boot. -* Added SMMSTORE migration for NovaCustom laptops, so the Dasharo Setup settings - are preserved after firmware update. -* Added CI/CD pipeline to generate signatures. - -## v1.2.9 - 2023-09-29 - -* Added [Firmware Update - Mode](https://docs.dasharo.com/guides/firmware-update/#firmware-update-mode) - integration, which speed up the process of Dasharo firmware update. -* Added efivars support and efivar utility. -* Fixed problem with EC firmware links and hashes. -* Improved logging of DTS menu options. - -## v1.2.8 - 2023-09-06 - -* Check for SMM protection before trying to flash. - -## v1.2.7 - 2023-09-05 - -* Added Dasharo zero-touch initial deployment on MSI PRO Z790-P for - [DES](https://docs.dasharo.com/ways-you-can-help-us/#become-a-dasharo-entry-subscription-subscriber) - users. -* Added Dasharo firmware update to version v1.1.2 on MSI PRO Z690-A for - [DES](https://docs.dasharo.com/ways-you-can-help-us/#become-a-dasharo-entry-subscription-subscriber) - users. -* Updated coreboot-utils to support Raptor Lake. -* Added couple UX improvements for DTS scripts, specially in the context of - [DES](https://docs.dasharo.com/ways-you-can-help-us/#become-a-dasharo-entry-subscription-subscriber) - users. -* Correctly fixed downloading Dell BIOS Update packages. - -## v1.2.6 - 2023-08-31 - -* Added [txt-suite](https://github.com/9elements/converged-security-suite/releases/download/v2.6.0/txt-suite). - -## v1.2.5 - 2023-08-07 - -* Fixed downloading Dell BIOS Update packages. - -## v1.2.4 - 2023-07-12 - -* Added [me_cleaner](https://github.com/corna/me_cleaner). - -## v1.2.3 - 2023-06-16 - -* Enabled devmem applet for buxybox. - -## v1.2.2 - 2023-06-16 - -* Updated coreboot-utils to support Alder Lake. - -## v1.2.1 - 2023-06-16 - -* Updated coreboot-utils to support Jasper Lake. - -## v1.2.0 - 2023-05-10 - -* Added Dasharo [firmware - update](https://docs.dasharo.com/dasharo-tools-suite/documentation/#firmware-update) - 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 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. -* Added IXGBE driver as a module. - -## v1.1.1 - 2023-02-20 - -* Fixed Dasharo zero-touch initial deployment on MSI PRO Z690-A, added DDR5 - target with dedicated firmware. -* Blocked Dasharo zero-touch initial deployment on platforms where Dasharo - firmware was detected. -* Added couple UX improvements for Dasharo zero-touch initial deployment: - - added platform verification step (show detected device information), - - added firmware verification step (show hash of using binary), - - added progress bar on first instructions, - - used reboot as default behavior after successful flashing. -* Added improvements for HCL report. -* Added DTS ISO format image, and documentation about - [VentoyOS](./documentation.md#run-dts-using-ventoyos) usage. -* Improved `README` of the `meta-dts` repository. -* Added service to run shell [commands from - iPXE](./documentation.md#run-commands-from-ipxe-shell). -* Added instructions for building PoC image with [enabled UEFI Secure - Boot](./documentation.md#build-image-with-uefi-secure-boot-support) support. - -## v1.1.0 - 2022-11-02 - -* Added [Dasharo zero-touch initial - deployment](https://docs.dasharo.com/dasharo-tools-suite/documentation.md#dasharo-zero-touch-initial-deployment) - for couple of supported platform. -* Added multiple HCL report improvements, e.g. dump information about TPM, ME. -* Refactored Dasharo Tools Suite [documentation](https://docs.dasharo.com/dasharo-tools-suite/overview.md). -* Added possibility to rollback using firmware dumped in HCL report. -* Added documentation about [building Dasharo Tools Suite - image](./documentation.md#building). -* Added Github Actions to automate new version building. -* Added new tools: cbfstool, cbmem, futil, intelmetool (all from [Dasharo - coreboot fork](https://github.com/Dasharo/coreboot/tree/coreboot-utils)), - [binwalk](https://github.com/ReFirmLabs/binwalk), - [uefi-firmware-parser](github.com/theopolis/uefi-firmware-parser), - [mei-amt-check](github.com/mjg59/mei-amt-check). -* Updated flashrom to version - [dasharo-v1.2.2](https://github.com/Dasharo/flashrom/tree/dasharo-v1.2.2). -* Deploying iPXE boot artifacts on - [boot.dasharo.com](https://boot.dasharo.com/dts/). -* Sharing build cache on [cache.dasharo.com](https://cache.dasharo.com/yocto/dts/). - -## v1.0.2 - 2022-10-19 - -* 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 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. -* Add kernel configuration to silence terminal logs by default (change loglevel - to 1). -* Enable GOOGLE_MEMCONSOLE_COREBOOT kernel configuration to ease getting - firmware logs. - -## v1.0.1 - 2022-09-02 - -* 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: . - -## v1.0.0 2022-08-09 - -* Initial release v1.0.0. -* 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 - servers. -* Possibility to manually [update the Dasharo - firmware](https://docs.dasharo.com/common-coreboot-docs/dasharo_tools_suite/#dasharo-firmware-update). -* [Bootable via - iPXE](https://docs.dasharo.com/common-coreboot-docs/dasharo_tools_suite/#bootable-over-network). -* [Bootable via - USB](https://docs.dasharo.com/common-coreboot-docs/dasharo_tools_suite/#bootable-usb-stick). + +## [1.2.20-rc7] - 2024-03-18 + +### Changed +- distro: wic: change boot partition to efi type +- dts: dts-functions: use local vars in check_se_creds +- dts: packagegroups: create packagegroup-tpm-dts +- distro: dts-base-image: install packagegroup-tpm-dts +- dts: dts-functions: standarize HEADS_SWITCH_FLASHROM_OPT_OVERRIDE variable +- dts: dasharo-deploy: change logic to set FLASHROM_ADD_OPT_UPDATE_OVERRIDE +- distro: dts-distro: bump v1.2.20-rc7 + + +## [1.2.20-rc6] - 2024-03-18 + +### Changed +- distro: dts-distro: bump v1.2.20-rc6 + + +### Fixed +- unit_tests: dts-boot: fixes after testing with MSI heads creds +- dts: dts-functions: fix links for MSI heads release +- dts: dts-functions: fix check_se_creds func for heads check +- dts: dts: fix providing DES creds, allow to use $ character + + +## [1.2.20-rc5] - 2024-03-15 + +### Added +- dts: dts-functions: add PLATFORM_SIGN_KEY for heads binary + + +### Changed +- dts-functions: set HEADS_SWITCH_FLASHROM_OPT_OVERRIDE based on msi ver +- dts: dts-functions: use DES_IS_LOGGED var while checking HEADS flashing flags +- distro: dts-distro: bump v1.2.20-rc5 + + +### Fixed +- dts: dts-functions: fix get_signing_keys function + + +## [1.2.20-rc4] - 2024-03-13 + +### Added +- distro: dts: add dropin to set DTS_ENV, DTS_FUNCS vars on ssh connection + + +### Changed +- dts: dts-environment: set default value for DEPLOY_REPORT variable +- distro: dts-distro: bump v1.2.20-rc2 +- distro: dts-distro: bump v1.2.20-rc3 +- distro: dts-distro: bump v1.2.20-rc4 + + +### Fixed +- dts: dasharo-hcl-report: fix typo while sourcing dts-functions script +- distro: dasharo-hcl-report: fix sed command to remove MAC address info + + +## [1.2.20-rc1] - 2024-03-13 + +### Added +- distro: dts: dts-functions: add flags for NovaCustom EC flashing + + +### Changed +- sbctl: fetch tarball from github +- distro: dts-functions: enable HEADS support for MSI targets +- distro: dts-distro: bump v1.2.20-rc1 + + +## [1.2.19] - 2024-02-28 + +### Added +- distro: packagegroup-dts: add missing packages for TPM2 support +- CHANGELOG: add changelog for v1.2.19 + + +### Changed +- distro: dts: iterate over gpg keys while importing them +- distro: bump v1.2.19-rc2 +- Update dts - reorder where to thow DES keys +- Update dts - remove unneeded empty line +- Update dts - removed not needed fi +- distro: bump v1.2.19 +- distro: dts-functions: comment out HEADS support for MSI targets +- 3mdeb-secpack: update to c48af6eb2698f255c19a48a602b0e474137b07ef +- CHANGELOG.md: fill up after automatic update of components + + +## [1.2.19-rc1] - 2024-02-27 + +### Added +- local-ipxe-server.sh: added +- dts: add warnings after switching FW branches + + +### Changed +- linux-yocto: enable IOMMU +- meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh: Fix MSI Z790-P DDR4 board matching +- meta-dts-distro/recipes-dts/dts: Add switching to heads +- unit_tests: Add stubs and unit tests for Dasharo updates +- Apply suggestions from code review +- Apply suggestions from code review +- meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh: Fix DES logged checks +- meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh: Reduce version checks in switching +- unit_tests: Fix running unit tests +- Add support for heads switching for MSI +- unit_tests: make dts-boot executable, add replacements for reboot/poweroff cmd +- unit_tests: README: change command for test execution +- distro: bump v1.2.19-rc1 + + +### Fixed +- unit_tests: dts-environment: fixes in CMD_POWEROFF/REBOOT after review + + +## [1.2.18] - 2024-01-22 + +### Changed +- distro: bump v1.2.18 +- Release v1.2.18 + + +## [1.2.18-rc1] - 2024-01-17 + +### Changed +- Bring back changes reverted in d72852e76e9f +- meta-dts-distro/recipes-dts/dts: Add flashrom update params override for MSI boards +- distro: bump v1.2.18-rc1 + + +## [1.2.17] - 2024-01-17 + +### Added +- CHANGELOG: add changelog for v1.2.17 + + +### Changed +- distro: bump v1.2.17 +- 3mdeb-secpack: update to 2225894887fc81a1c72b067edbe348b5f3f02a05 +- CHANGELOG.md: fill up after automatic update of components + + +## [1.2.17-rc4] - 2024-01-17 + +### Changed +- Revert changes introduced by commits d5054bc2f8b7 through b240c2484981 +- distro: dts-functions: bump update version for NCM NS5x +- distro: bump v1.2.17-rc4 + + +## [1.2.17-rc3] - 2024-01-16 + +### Changed +- distro: bump v1.2.17-rc3 + + +### Fixed +- distro: dasharo-deploy: fix typo in if statement + + +## [1.2.17-rc2] - 2024-01-16 + +### Changed +- meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh: Add missing fi +- distro: bump v1.2.17-rc2 + + +## [1.2.17-rc1] - 2024-01-16 + +### Added +- distr: dts-sb-distro: adds working distro configuration +- CHANGELOG: add info about changes in SB enabled image + + +### Changed +- distro: sbctl: provide recipe to install sbctl +- distro: dts-base-sb-image: install sbctl +- distro: grub-efi-efi-custom: provide UEFI SB enabled bootfiles to deploydir +- Update dts - wording +- meta-dts-distro/recipes-dts: Add checks for readable and flashable regions +- meta-dts-distro/recipes-dts/dts: Add logic for determining flashrom update params +- meta-dts-distro/recipes-dts/dts: Fix bugs and syntax +- meta-dts-distro/recipes-dts/dts: Check if vboot keys need to be updated +- meta-dts-distro/recipes-dts/dts: Add prints in section which may take a while +- meta-dts-distro/recipes-dts/dts: Add option to override flashrom update parameters +- meta-dts-distro/recipes-dts/dts: Handle all migration and update operations automatically +- meta-dts-distro/recipes-dts/dts: Address review discussions +- distro: dasharo-deploy: small syntax fixes +- distro: dts-functions: bump update versions for MSI and NCM NS5x +- distro: bump v1.2.17-rc1 + + +## [1.2.16] - 2024-01-11 + +### Changed +- dts: dts-functions: reset ns5x tgl to v1.5.1 +- dts-distro: bump v1.2.16 +- CHANGELOG: fill up list of changes for v1.2.16 + + +## [1.2.16-rc5] - 2024-01-11 + +### Changed +- dasharo-deploy: use dcu for patching bootlogo +- dts-distro: bump v1.2.16-rc5 + + +## [1.2.16-rc4] - 2024-01-11 + +### Added +- README: add info about rc rel available over iPXE on boot.dasharo.com + + +### Changed +- dts-distro: bump v1.2.16-rc4 + + +## [1.2.16-rc3] - 2024-01-11 + +### Added +- scripts: get_last_commit: add script to get latest commit from given branch +- scripts: update_components: add script to update 3mdeb/Dasharo-based recipes +- README: add info about automatic update of some revisions in prod release +- scripts: update_components: add automatic CHNGLG update, move tag after commiting release + + +### Changed +- workflows: run jobs on tags creation instead of pushing +- workflows: another try to run jobs dependencies +- distro: dts: dts-functions.sh: Fix missing space +- scripts: update_components: does not use force while creating tag +- dts: dts-functions: set DASHARO_REL_VER to 1.5.2 for NCM tgl +- dts-distro: bump v1.2.16-rc1 +- dts-distro: bump v1.2.16-rc2 +- scripts: generate-ipxe-menu: generate different ipxe menu file for rc releases +- dts-distro: bump v1.2.16-rc3 + + +### Fixed +- workflows: ci.yml: fix re in tags section +- workflows: fix pipeline triggers +- workflows: fix jobs execution +- workflows: fix typo +- README: fix release process section +- workflows: develop: fix tag re, push rc iPXE menu to boot.dasharo.com + + +## [1.2.15] - 2024-01-11 + +### Added +- CHANGELOG: add v1.2.15 +- workflows: weekly: add on workflow_dispatch to run job manually + + +### Changed +- Update dts-functions.sh +- dts-distro: bump v1.2.15 +- workflows: rerun build step in case of error +- dts/dts-functions.sh: update checksum for ACM relese file v003 +- meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh: Update SINIT ACM ZIP name +- dts: do not check signatures if PLATFORM_SIGN_KEY not set +- dasharo-deploy: update smmstore and bootsplash migration console output +- dasharo-deploy: use common error handling functions +- dts-functions: avoid printing empty line in error_check +- dts: dts-functions: improve UX +- dts: dasharo-deploy: improve logging in migration functions +- distro: dts: improve UX of update process +- CHANGELOG: update for v1.2.15 + + +### Fixed +- distro: dts-functions: fix PLATFORM_SIGN_KEY variable for msi cases +- dts: dts-functions: fix bash execution error + + +### Removed +- workflows: remove not needed comments + + +## [1.2.14] - 2024-01-03 + +### Added +- README: add information how to publish develop release +- distro: 3mdeb-secpack: add recipe to include 3mdeb keys in the image +- distro: 3mdeb-secpack: add script to profile to set GNUPGHOME env +- CHANGELOG: add rest changes for v1.2.14 + + +### Changed +- workflows: develop.yml: publish develop releases only on GitHub Rel tab +- distro: dts: set GNUPGHOME env when dts script is executed +- distro: packagegroup-dts: install 3mdeb-secpack +- dts-functions: do not fetch 3mdeb Master keys in get_signing_keys func +- distro: 3mdeb-secpack: correctly set dir permissions +- dts-distro: rel v1.2.14 +- CHANGELOG: fill up list of changes for v1.2.14 +- workflows: include wic.bmap files in prod and dev releases +- workflows: set tags pattern +- workflows: save gitea key in correct format + + +### Fixed +- workflows: fix usage of SSH_KEY_GITEA secret + + +## [1.2.13] - 2023-12-22 + +### Added +- meta-dts-distro: add dasharo_ectool +- distro: converged-security-suite: add bg-suite recipe and binary +- distro: recipes-dts: packagegroups: add bg-suite to image +- distro: converged-security-suite: add statically linked bg-suite +- CHANGELOG.md: add bg-suite note +- dts: kernel: add support for exFAT and NTFS +- CHANGELOG.md: add exFAT and NTFS note +- dts: add check_if_ac() before fw update +- dts: add bootsplash_migration() +- recipes-dasharo/dasharo-coreboot-customizer: add recipe +- distro: dts: add signature verification of Dasharo firmware binaries +- README: add section about testing updates from local sources +- README: add release process section +- CHANGELOG: add missing points + + +### Changed +- dts: print list of IPs when starting SSH +- system76_ectool: rename to dasharo_ectool +- dasharo-ectool_0.3.8.bb: update to fix build +- CHANGELOG.md: Fix Z790-P board typo +- Release v1.2.13 +- distro: converged-security-suite: change path to bg-suite binary +- linux-yocto: enable ACPI_BGRT +- dts: check for network in board_config(), improve err msgs +- dasharo-configuration-utility/: bump SRCREV +- Release v1.2.13-rc2 +- generate-ipxe-menu.sh: more readable script, prepare for imgverify +- distro: dts: cleanup environment and functions +- distro: dts-functions: bump ncm adl to v1.7.2 +- distro: dts-functions: flash whole bios for ncm adl update +- distro: dts-environment: set default value for FW_STORE_URL variable +- distro: dts-functions: silence logs from pub key fetching +- distro: dts-functions: run curl in silent mode when fetching artifacts +- Release v1.2.13-rc3 +- README: update section about testing updates from local sources +- distro: update revisions of Dasharo related utilities +- CHANGELOG: fillup changelog for release v1.2.13 +- distro: dts-distro: Release v1.2.13 + + +### Fixed +- distro: dasharo-configuration-utility: fix whitespace + + +### Removed +- distro: dts-environment: remove unused variable + + +## [1.2.12] - 2023-11-03 + +### Changed +- bump to 1.2.12 +- CHANGELOG.md: update for v1.2.12 +- github: workflows: use dts-builder label for runner + + +### Fixed +- dts/dts-functions.sh: fix updating boards without Vboot slot B +- github: workflows: fix typos + + +## [1.2.11] - 2023-10-31 + +### Changed +- dts/dts-functions.sh: set NovaCustom versions to 1.5.1/1.7.1 + + +## [1.2.10] - 2023-10-27 + +### Added +- meta-dts-distro/recipes-dts/dts: add coreboot_customizer +- workflows: ci.yml: add final version + + +### Changed +- meta-dts-distro/recipes-dts/dts/dts/coreboot_customizer: Fix UUID param case +- meta-dts-distro/recipes-dts/dts/coreboot_customizer: Use cbfstool from variable +- CHANGELOG: init v1.2.10 notes +- dts/dts-functions.sh: enable SMMSTORE migration for NovaCustom +- bump to 1.2.10 +- workflows: ci.yml: verification commit +- .github: ci.yml: prepare final CI for signing tests +- .github: ci.yml: commit changes to release singning repo +- CHAGELOG: finish v1.2.10 changelog + + +### Fixed +- CHANGELOG.md: fix typos for rel v1.2.10 + + +## [1.2.9] - 2023-09-29 + +### Added +- dts: dts-functions: add fum_exit + + +### Changed +- kernel: linux-yocto: set CONFIG_EFI_VARS +- dts: dts-functions: improve check_flash_chip func +- dts: install dts-boot script to help in detecting FUM +- dts: dts-base-image: use dts-boot as login-program +- dts: packagegroup-dts: install efivar utility +- dts: dasharo-deploy: integrate FUM support +- dts: dts-functions: modify flashrom update flags for NC targets +- distro: dts-distro: bump 1.2.9-rc1 +- distro: dts-functions: improve links to EC according to latest changes +- dts: dasharo-deploy: minor fix in EC_HASH check and add network check in FUM +- dts: dasharo-deploy: improve logging visibility +- distro: dts-distro: bump 1.2.9 +- CHANGELOG: v1.2.9 + + +### Fixed +- dts: dasharo-deploy: fix log typos + + +## [1.2.8] - 2023-09-05 + +### Added +- recipes-devtool/me-cleaner: add recipe +- dts: dasharo-deploy: add ROM hole and SMMSTORE migration +- dts: dts-functions: add board_config for Z790 +- CHANGELOG.md: add placeholder for v1.2.6 +- recipes-tests/converged-security-suite/txt-suite_2.6.0.bb: add recipe +- CHANGELOG.md: add txt-suite +- distro: dts: add check_flash_lock function + + +### Changed +- recipes-bsp/coreboot-utils: update revision for Jasper Lake support +- release v1.2.1 +- recipes-bsp/coreboot-utils: update to support Raptor Lake +- release v1.2.2 +- recipes-core/busybox: enable devmem applet +- release v1.2.3 +- release v1.2.4 +- release v1.2.5 +- Update CHANGELOG.md +- distro: flashrom: update flashrom revision +- scripts: local-deploy: improve development scripts +- dts: dasharo-hcl-report: move variables and functions to common files +- dts: dasharo-hcl-report: improve reading firmware image on Z790 +- dts: dasharo-deploy: move variables and functions to common files +- dts: dasharo-deploy: introduce split into DES and community releases +- dts: dasharo-deploy: improve reading firmware image on Z790 +- dts: use DES instead of SE in variables +- dts: dts-environment: move more variables to common file +- dts: dts-functions: source dts-environment, add new common functions +- distro: dts-distro: use IMAGE_EFI_BOOT_FILES to install EFI/DTS/grubx64.efi +- distro: dts-distro: bump v1.2.6 +- recipes-bsp/flashrom/flashrom_git.bb: use dashar-release branch +- recipes-dts/packagegroups/packagegroup-dts.bb: install txt-suite +- meta-dts-distro/recipes-dts: use consistent keys nomenclature +- distro: dts: improve logging, add link for Dasharo Security Options +- distro: dts-distro: bump v1.2.7 +- distro: dasharo-hcl-report: correct checking log/error files +- distro: dts: export creds for logs if DES not logged +- CHANGELOG: v1.2.7 +- recipes-dts/dts/dts/dts-functions.sh: check for SMM protection before flashing +- bump to v1.2.8 + + +### Fixed +- meta-dts-distro/recipes-dts/dts/dasharo-deploy: fix downloading Dell BIOS Update packages +- distro: dasharo-deploy: fix SMMSTORE migration +- meta-dts-distro/recipes-dts/dts/dts/dts-functions.sh: fix DES binary URL +- distro: dts: fix downloading blobs for Dell OptiPlex +- distro: dts: fix nomenclature for DES +- CHANGELOG: fixed typo + + +## [1.2.0] - 2023-05-10 + +### Added +- linux-yocto/dts.cfg: add IXGBE driver as module +- scripts: add script for local development + + +### Changed +- distro: dts: store flashrom logs in /var/local/flashrom.log file +- distro: openssh: disable ssh server by default +- dts: cloud_list: use curl with redirection +- dts: major changes in scripts for release 1.2.0 +- dts-distro: v1.2.0 bump +- CHANGELOG.md: release v1.2.0 + + +### Fixed +- workflows: fix existing ones, add develop + + +### Removed +- README.md: remove content and provide links to docs.dasharo.com +- recipes-dts: dts: removed client's specific scripts + + +## [1.1.1] - 2023-02-17 + +### Added +- ipxe-commands: added service able to run scripts (#21) +- dts-distro.conf: add support for iso building +- distro: initramfs: setup-live: add fix for VentoyOS UEFI mode use +- dasharo-deploy: add DDR5 option, add prototype of display_flashing_warning +- distro: dasharo-deploy: add error_check on using flashrom when restoring +- distro: dts: add progress bar for hcl report when init deploy +- distro: dts-distro: add wic.bmap generation to speed up dev flashing + + +### Changed +- Enable UEFI SB support via meta-secure-core layer (#20) +- Disabling flashing when Dasharo is on board (#25) +- README.md: make commands copypastable (#22) +- distro: system76-ectool: update refspec, use Dasharo fork +- recipes-dts/dts/dasharo-deploy/dasharo-deploy: use baseboard name for MSI +- dts: use reboot by default on dasharo deploy, print hash of used fw +- distro: dasharo-deploy: update error log +- distro: dts-distro: bump v1.1.1 +- distro: packagegroup-dts: install tpm2-tools + + +### Fixed +- dasharo-hcl-report: fix handling multiple default route (#18) +- distro: dasharo-deploy: fix path for SCH5545_FW used with T1650 model +- distro: dasharo-deploy: fix escaping from while loop +- distro: dasharo-hcl-report: fixes after tests + + +## [1.1.0] - 2022-11-02 + +### Added +- dasharo-hcl-report: add check on flash chip, fix determing mac address +- dts: add description for option 5 + + +### Changed +- Hcl report improvements (#8) +- CI Builder (#5) +- Implement Dasharo zero-touch init deployment (#14) +- distro: packagegroup-coreboot-utils: install missing packages +- distro: packagegroup-dts: install missing packages +- distro: bump v1.1.0-rc2 +- Enable firmware rollback from HCL report (#16) +- Drop CE from names + + +### Fixed +- dts: fix saving local report +- dasharo-deploy: fix typo in restore option +- workflows: fix yamls +- workflows: fix repo paths + + +## [1.0.2] - 2022-10-12 + +### Added +- distro: dts: add vendor menu with novacustom menu +- kernel: add cfg to silence terminal logs and enable GOOGLE_MEMCONSOLE_COREBOOT +- CHANGELOG_CE.md: add v1.0.2 changelog +- CHANGELOG_CE.md: add link for ec transition +- CHANGELOG_CE.md: add info about OS version in menu + + +### Changed +- distro: ec_transition: download fw from the internet instead of using local files +- dts: ec_transition: update sources of NV4x firmware +- dts-distro: bump to v1.0.2 +- dts: ec_transition: name fix and correctly use PROGRAMMER_BIOS variable +- dts: print OS version in main menu +- distro: ec_transition: update ec hash and version for NV4X +- distro: ec_transition: update ec hash and version for NV4X +- CHANGELOG_CE.md: update date + + +## [1.0.1] - 2022-09-02 + +### Changed +- Initial commit +- Initial public release +- Fix README + + +[unreleased]: https://github.com/Dasharo/meta-dts/compare/v1.2.23..HEAD +[1.2.23]: https://github.com/Dasharo/meta-dts/compare/v1.2.22..v1.2.23 +[1.2.22]: https://github.com/Dasharo/meta-dts/compare/v1.2.21..v1.2.22 +[1.2.21]: https://github.com/Dasharo/meta-dts/compare/v1.2.20..v1.2.21 +[1.2.20]: https://github.com/Dasharo/meta-dts/compare/v1.2.20-rc7..v1.2.20 +[1.2.20-rc7]: https://github.com/Dasharo/meta-dts/compare/v1.2.20-rc6..v1.2.20-rc7 +[1.2.20-rc6]: https://github.com/Dasharo/meta-dts/compare/v1.2.20-rc5..v1.2.20-rc6 +[1.2.20-rc5]: https://github.com/Dasharo/meta-dts/compare/v1.2.20-rc4..v1.2.20-rc5 +[1.2.20-rc4]: https://github.com/Dasharo/meta-dts/compare/v1.2.20-rc1..v1.2.20-rc4 +[1.2.20-rc1]: https://github.com/Dasharo/meta-dts/compare/v1.2.19..v1.2.20-rc1 +[1.2.19]: https://github.com/Dasharo/meta-dts/compare/v1.2.19-rc1..v1.2.19 +[1.2.19-rc1]: https://github.com/Dasharo/meta-dts/compare/v1.2.18..v1.2.19-rc1 +[1.2.18]: https://github.com/Dasharo/meta-dts/compare/v1.2.18-rc1..v1.2.18 +[1.2.18-rc1]: https://github.com/Dasharo/meta-dts/compare/v1.2.17..v1.2.18-rc1 +[1.2.17]: https://github.com/Dasharo/meta-dts/compare/v1.2.17-rc4..v1.2.17 +[1.2.17-rc4]: https://github.com/Dasharo/meta-dts/compare/v1.2.17-rc3..v1.2.17-rc4 +[1.2.17-rc3]: https://github.com/Dasharo/meta-dts/compare/v1.2.17-rc2..v1.2.17-rc3 +[1.2.17-rc2]: https://github.com/Dasharo/meta-dts/compare/v1.2.17-rc1..v1.2.17-rc2 +[1.2.17-rc1]: https://github.com/Dasharo/meta-dts/compare/v1.2.16..v1.2.17-rc1 +[1.2.16]: https://github.com/Dasharo/meta-dts/compare/v1.2.16-rc5..v1.2.16 +[1.2.16-rc5]: https://github.com/Dasharo/meta-dts/compare/v1.2.16-rc4..v1.2.16-rc5 +[1.2.16-rc4]: https://github.com/Dasharo/meta-dts/compare/v1.2.16-rc3..v1.2.16-rc4 +[1.2.16-rc3]: https://github.com/Dasharo/meta-dts/compare/v1.2.15..v1.2.16-rc3 +[1.2.15]: https://github.com/Dasharo/meta-dts/compare/v1.2.14..v1.2.15 +[1.2.14]: https://github.com/Dasharo/meta-dts/compare/v1.2.13..v1.2.14 +[1.2.13]: https://github.com/Dasharo/meta-dts/compare/v1.2.12..v1.2.13 +[1.2.12]: https://github.com/Dasharo/meta-dts/compare/v1.2.11..v1.2.12 +[1.2.11]: https://github.com/Dasharo/meta-dts/compare/v1.2.10..v1.2.11 +[1.2.10]: https://github.com/Dasharo/meta-dts/compare/v1.2.9..v1.2.10 +[1.2.9]: https://github.com/Dasharo/meta-dts/compare/v1.2.8..v1.2.9 +[1.2.8]: https://github.com/Dasharo/meta-dts/compare/v1.2.0..v1.2.8 +[1.2.0]: https://github.com/Dasharo/meta-dts/compare/v1.1.1..v1.2.0 +[1.1.1]: https://github.com/Dasharo/meta-dts/compare/v1.1.0..v1.1.1 +[1.1.0]: https://github.com/Dasharo/meta-dts/compare/v1.0.2..v1.1.0 +[1.0.2]: https://github.com/Dasharo/meta-dts/compare/v1.0.1..v1.0.2 + + diff --git a/cliff.toml b/cliff.toml new file mode 100644 index 00000000..1a13d77a --- /dev/null +++ b/cliff.toml @@ -0,0 +1,82 @@ +# git-cliff ~ configuration file +# https://git-cliff.org/docs/configuration + +[changelog] +# template for the changelog header +header = """ +# Changelog\n +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).\n +""" +# template for the changelog body +# https://keats.github.io/tera/docs/#introduction +body = """ +{% if version -%} + ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }} +{% else -%} + ## [Unreleased] +{% endif -%} +{% for group, commits in commits | filter(attribute="merge_commit", value=false) | group_by(attribute="group") %} + ### {{ group | upper_first }} + {% for commit in commits %} + {%- set short_message = commit.message | split(pat="\n") | first | trim -%} + - {{ short_message | trim }}\n\ + {% endfor %} +{% endfor %}\n +""" +# template for the changelog footer +footer = """ +{% for release in releases -%} + {% if release.version -%} + {% if release.previous.version -%} + [{{ release.version | trim_start_matches(pat="v") }}]: \ + https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}\ + /compare/{{ release.previous.version }}..{{ release.version }} + {% endif -%} + {% else -%} + [unreleased]: https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }}\ + /compare/{{ release.previous.version }}..HEAD + {% endif -%} +{% endfor %} + +""" +# remove the leading and trailing whitespace from the templates +trim = true + +[git] +# parse the commits based on https://www.conventionalcommits.org +conventional_commits = false +# filter out the commits that are not conventional +filter_unconventional = true +# process each line of a commit as an individual commit +split_commits = false +# regex for parsing and grouping commits +commit_parsers = [ + { message = "^.*: add", group = "Added" }, + { message = "^.*: support", group = "Added" }, + { message = "^.*: remove", group = "Removed" }, + { message = "^.*: delete", group = "Removed" }, + { message = "^test", group = "Fixed" }, + { message = "^fix", group = "Fixed" }, + { message = "^.*: fix", group = "Fixed" }, + { message = "^.*", group = "Changed" }, +] +# protect breaking changes from being skipped due to matching a skipping commit_parser +protect_breaking_commits = false +# filter out the commits that are not matched by commit parsers +filter_commits = false +# regex for matching git tags +tag_pattern = "v[0-9].*" +# regex for skipping tags +skip_tags = "v0.1.0-beta.1" +# regex for ignoring tags +ignore_tags = "" +# sort the tags topologically +topo_order = false +# sort the commits inside sections by oldest/newest order +sort_commits = "oldest" + +[remote.github] +owner="Dasharo" +repo="meta-dts" diff --git a/generate-changelog.sh b/generate-changelog.sh new file mode 100755 index 00000000..71c833d0 --- /dev/null +++ b/generate-changelog.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +RELEASE=$(grep '^DISTRO_VERSION ' ./meta-dts-distro/conf/distro/dts-distro.conf | cut -d'=' -f2 | tr -d ' "') + +docker run -t -v "$(pwd)":/app/ "orhunp/git-cliff:${TAG:-latest}" \ + --prepend CHANGELOG.md --unreleased --tag "$RELEASE" From 67f4c422b0206e2493438c0ee431b86644a2477e Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Tue, 20 Aug 2024 16:42:45 +0200 Subject: [PATCH 22/50] recipes-bsp/coreboot-utils: Use 4.21 as base version for coreboot-utils packages Signed-off-by: Pawel Langowski --- meta-dts-distro/recipes-bsp/coreboot-utils/cbfstool_git.bb | 2 -- meta-dts-distro/recipes-bsp/coreboot-utils/cbmem_git.bb | 2 -- meta-dts-distro/recipes-bsp/coreboot-utils/coreboot-utils.inc | 2 ++ meta-dts-distro/recipes-bsp/coreboot-utils/ectool_git.bb | 2 -- meta-dts-distro/recipes-bsp/coreboot-utils/ifdtool_git.bb | 2 -- meta-dts-distro/recipes-bsp/coreboot-utils/intelmetool_git.bb | 2 -- meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb | 2 -- meta-dts-distro/recipes-bsp/coreboot-utils/inteltool_git.bb | 2 -- meta-dts-distro/recipes-bsp/coreboot-utils/msrtool_git.bb | 1 - meta-dts-distro/recipes-bsp/coreboot-utils/nvramtool_git.bb | 2 -- meta-dts-distro/recipes-bsp/coreboot-utils/superiotool_git.bb | 2 -- 11 files changed, 2 insertions(+), 19 deletions(-) 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 e54779e0..55b67e4b 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/cbfstool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/cbfstool_git.bb @@ -2,8 +2,6 @@ require coreboot-utils.inc SUMMARY = "Tool for manipulating CBFS file" -PV = "1.0+git${SRCPV}" - 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 27ee373b..68f4eb24 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/cbmem_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/cbmem_git.bb @@ -4,8 +4,6 @@ SUMMARY = "CBMEM parser to read e.g. timestamps and console log" DEPENDS += "pciutils zlib" -PV = "1.0+git${SRCPV}" - EXTRA_OEMAKE = ' \ DESTDIR="${D}" \ PREFIX="${prefix}" \ 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 c8b90205..f3a54fed 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/coreboot-utils.inc +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/coreboot-utils.inc @@ -5,6 +5,8 @@ SECTION = "coreboot" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +PV = "4.21+git${SRCPV}" + SRC_URI = " \ git://github.com/Dasharo/coreboot.git;protocol=https;branch=dasharo-4.21\ " 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 4e676e97..0dba1c45 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/ectool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/ectool_git.bb @@ -2,8 +2,6 @@ require coreboot-utils.inc SUMMARY = "Dumps the RAM of a laptop's Embedded/Environmental Controller (EC)." -PV = "1.0+git${SRCPV}" - 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 4162563a..92df4cd7 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/ifdtool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/ifdtool_git.bb @@ -2,8 +2,6 @@ require coreboot-utils.inc SUMMARY = "Extract and dump Intel Firmware Descriptor information" -PV = "1.0+git${SRCPV}" - TARGET_CC_ARCH += "${LDFLAGS}" EXTRA_OEMAKE = ' \ 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 efb9370a..290039d9 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/intelmetool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/intelmetool_git.bb @@ -4,8 +4,6 @@ SUMMARY = "Dump interesting things about Management Engine even if hidden" DEPENDS += "pciutils zlib" -PV = "1.0+git${SRCPV}" - EXTRA_OEMAKE = ' \ DESTDIR="${D}" \ PREFIX="${prefix}" \ 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 9bde536d..167f5f76 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb @@ -7,8 +7,6 @@ SUMMARY = "\ LIC_FILES_CHKSUM = "file://../../COPYING;md5=751419260aa954499f7abaabaa882bbe" -PV = "1.0+git${SRCPV}" - GO_IMPORT = "github.com/dasharo/coreboot/" # we need to override SRC_URI from coreboot-utils.inc so it's unpacked in the 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 66323555..4294a52c 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/inteltool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/inteltool_git.bb @@ -7,8 +7,6 @@ SUMMARY = "\ DEPENDS += "pciutils zlib" -PV = "1.0+git${SRCPV}" - EXTRA_OEMAKE = ' \ DESTDIR="${D}" \ PREFIX="${prefix}" \ 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 8d9b530a..6736d2f5 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/msrtool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/msrtool_git.bb @@ -2,7 +2,6 @@ require coreboot-utils.inc SUMMARY = "Dumps chipset-specific MSR registers." DEPENDS += "pciutils" -PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git/util/msrtool" export PREFIX = "${prefix}" 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 e0be39b8..a8dcf100 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/nvramtool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/nvramtool_git.bb @@ -2,8 +2,6 @@ require coreboot-utils.inc SUMMARY = "Reads and writes coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM. " -PV = "1.0+git${SRCPV}" - EXTRA_OEMAKE = ' \ DESTDIR="${D}" \ PREFIX="${prefix}" \ 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 5c3197aa..4169f462 100644 --- a/meta-dts-distro/recipes-bsp/coreboot-utils/superiotool_git.bb +++ b/meta-dts-distro/recipes-bsp/coreboot-utils/superiotool_git.bb @@ -4,8 +4,6 @@ SUMMARY = "A user-space utility to detect Super I/O of a mainboard and provide d DEPENDS += "pciutils zlib" -PV = "1.0+git${SRCPV}" - EXTRA_OEMAKE = ' \ DESTDIR="${D}" \ PREFIX="${prefix}" \ From 3e74a554cae19e966b260f1c220ce75fb4b95ca1 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Wed, 30 Oct 2024 15:35:35 +0100 Subject: [PATCH 23/50] README: Link Zarhus release process Signed-off-by: Pawel Langowski --- README.md | 75 ++++++++----------------------------------------------- 1 file changed, 11 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index 987a2964..a5ff45b7 100644 --- a/README.md +++ b/README.md @@ -31,74 +31,21 @@ This section contains the technical aspects of the `DTS` release process. The recipients of this information should be those authorised to issue `DTS` releases. -Below are information on how to publish `production` and `develop` releases. +The basic release process can be found [here][zarhus-release-process] -* `Production` releases deploy images to GitHub Release pages and - `boot.3mdeb.com`/`boot.dasharo.com` pages to boot via iPXE. +Follow the first 6 steps from the document linked above. The remaining steps +will be performed automatically by CI. The pipeline of creating a `DTS` release +consists of two steps. -* `Develop` releases deploy images to GitHub Release pages, so not all users - will be able to use them via iPXE. +* The first step is done on GitHub Actions. Here the `DTS` image is built and + the binaries are pushed to `boot.dasharo.com`. -### How to publish a production release +* The second step is done on Gitea Actions. There the ipxe menu is pushed to + `boot.3mdeb.com` and the binaries are signed. Additionally, CI publishes the + release on `https://github.com/Dasharo/meta-dts/releases`, from + where binaries can be downloaded. - - -Please follow the steps below to release a new production `DTS` image. - -1. Make sure that everything that should go into the given release is merged to - `main`. - -1. Bump the version in `meta-dts-distro/conf/distro/dts-distro.conf` file. - - > Note: In cases where MINOR or MAJOR part of version is updated, please inform - one of the maintainers as there will be needed new keys to sign the binaries - in next step of CI/CD pipeline. - -1. Fill up the [CHANGELOG.md](./CHANGELOG.md) file with latest changes. - -1. Run [update_components.sh](./scripts/update_components.sh) script which will - update revision of Dasharo related recipes (e.g. - [dasharo-ectool](./meta-dts-distro/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb)), - create a tag and push it to the remote repository. - -From here, rest of the jobs should be carried out by the GitHub and Gitea -Actions. Whole pipeline of creating `DTS` release consists of two steps. - -* First is done on GitHub Actions. Here we update [Dasharo - components](./scripts/update_components.sh) build the `DTS` image and push - binaries to `boot.dasharo.com`. - -* Second is done on Gitea Actions. Here we push the ipxe menu to - `boot.3mdeb.com` and sign the `DTS` binaries. The last step of Gitea Actions - creates new release at the `https://github.com/Dasharo/meta-dts/releases` - from where binaries can be downloaded. - -### How to publish a develop release - -Please follow the steps below to release a new develop `DTS` image. - -1. Make sure that everything that should go into the given release is merged to - `develop`. - -1. Bump the version in `meta-dts-distro/conf/distro/dts-distro.conf` file by - adding `-rcX` suffix. - - > Note: X should increase every time new develop release is created. - -1. Create and push tag that match the newly bumped version. - -From here, rest of the jobs should be carried out by the GitHub and Gitea -Actions. Whole pipeline of creating `DTS` release consists of two steps. - -* First is done on GitHub Actions. Here we build the `DTS` image. - -* Second is done on Gitea Actions. Here we sign the `DTS` binaries and push - them to [boot.dasharo.com](https://boot.dasharo.com/dts) under the directory - named after rcX version. Also - [dts-rc.ipxe](http://boot.dasharo.com/dts/dts-rc.ipxe) is created so the - newest rc release is available over iPXE. +[zarhus-release-process]: https://docs.zarhus.com/development-process/standard-release-process ## Cukinia tests From bde9d9098a3c49df99a6d307aa3d2499ca819d68 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Mon, 18 Nov 2024 11:02:02 +0100 Subject: [PATCH 24/50] Change git-cliff config Signed-off-by: Pawel Langowski --- cliff.toml | 4 +--- generate-changelog.sh | 11 +++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cliff.toml b/cliff.toml index 1a13d77a..d8665c83 100644 --- a/cliff.toml +++ b/cliff.toml @@ -48,7 +48,7 @@ trim = true # parse the commits based on https://www.conventionalcommits.org conventional_commits = false # filter out the commits that are not conventional -filter_unconventional = true +filter_unconventional = false # process each line of a commit as an individual commit split_commits = false # regex for parsing and grouping commits @@ -68,8 +68,6 @@ protect_breaking_commits = false filter_commits = false # regex for matching git tags tag_pattern = "v[0-9].*" -# regex for skipping tags -skip_tags = "v0.1.0-beta.1" # regex for ignoring tags ignore_tags = "" # sort the tags topologically diff --git a/generate-changelog.sh b/generate-changelog.sh index 71c833d0..464f6f0d 100755 --- a/generate-changelog.sh +++ b/generate-changelog.sh @@ -1,6 +1,9 @@ #!/bin/bash -RELEASE=$(grep '^DISTRO_VERSION ' ./meta-dts-distro/conf/distro/dts-distro.conf | cut -d'=' -f2 | tr -d ' "') - -docker run -t -v "$(pwd)":/app/ "orhunp/git-cliff:${TAG:-latest}" \ - --prepend CHANGELOG.md --unreleased --tag "$RELEASE" +if [ $# -eq 1 ]; then + docker run -t -v "$(pwd)":/app/ "orhunp/git-cliff:${TAG:-latest}" \ + --prepend CHANGELOG.md --latest --github-token "$1" +else + docker run -t -v "$(pwd)":/app/ "orhunp/git-cliff:${TAG:-latest}" \ + --prepend CHANGELOG.md --latest +fi From bf4b05600e308b76db6fac531e2fa6b7d53246b3 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Mon, 18 Nov 2024 14:00:40 +0100 Subject: [PATCH 25/50] .github/workflows: Fix getting DTS_VER in manifest deployment Signed-off-by: Pawel Langowski --- .github/workflows/ci.yml | 2 +- .github/workflows/develop.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9610e08..be01d0f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,7 +105,7 @@ jobs: - name: Deploy manifest 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/ cp dts-base-image-genericx86-64.manifest dts-base-image-${DTS_VER}.manifest scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.manifest builder@10.1.40.2:boot/dts/${DTS_VER}/ diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 7ae2a19d..d6af155a 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -100,7 +100,7 @@ jobs: - name: Deploy manifest 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/ cp dts-base-image-genericx86-64.manifest dts-base-image-${DTS_VER}.manifest scp -i ~/.ssh/dts-ci-key dts-base-image-${DTS_VER}.manifest builder@10.1.40.2:boot/dts/${DTS_VER}/ From c1cf8dca75d8cb58faa0b60c7ba138354ad29511 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Tue, 19 Nov 2024 11:28:10 +0100 Subject: [PATCH 26/50] Move generate-changelog.sh to scripts Signed-off-by: Pawel Langowski --- generate-changelog.sh | 9 --------- scripts/generate-changelog.sh | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) delete mode 100755 generate-changelog.sh create mode 100755 scripts/generate-changelog.sh diff --git a/generate-changelog.sh b/generate-changelog.sh deleted file mode 100755 index 464f6f0d..00000000 --- a/generate-changelog.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [ $# -eq 1 ]; then - docker run -t -v "$(pwd)":/app/ "orhunp/git-cliff:${TAG:-latest}" \ - --prepend CHANGELOG.md --latest --github-token "$1" -else - docker run -t -v "$(pwd)":/app/ "orhunp/git-cliff:${TAG:-latest}" \ - --prepend CHANGELOG.md --latest -fi diff --git a/scripts/generate-changelog.sh b/scripts/generate-changelog.sh new file mode 100755 index 00000000..c88aba2b --- /dev/null +++ b/scripts/generate-changelog.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +REPO_DIR=$(git rev-parse --show-toplevel) +if [ $# -eq 1 ]; then + docker run -t -v "$REPO_DIR":/app/ "orhunp/git-cliff:${TAG:-latest}" \ + --prepend CHANGELOG.md --latest --github-token "$1" +else + docker run -t -v "$REPO_DIR":/app/ "orhunp/git-cliff:${TAG:-latest}" \ + --prepend CHANGELOG.md --latest +fi From 40c85c02360f423f3a993a2a638c332b0c63bca4 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Fri, 22 Nov 2024 11:04:14 +0100 Subject: [PATCH 27/50] Fill up CHANGELOG after rebase Signed-off-by: Pawel Langowski --- CHANGELOG.md | 131 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 119 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f941c55c..38f049ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,26 +2,133 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## [Unreleased] +## [2.0.1-rc3] - 2024-11-21 + +### Changed +- dts-scripts: Enhance verbose mode + collect cbmem console in hcl report +- dts-scripts: Add vbt to hcl report +- dts-scripts: Bump DPP versions for MSI + + +## [2.0.1-rc2] - 2024-11-04 + +### Changed +- kernel/linux-yocto: Add CONFIG_SERIAL_8250_DW +- recipes-extended: sbctl: add RDEPENDS to recipe +- flashrom: Add TGL chipset detection based on SPI PCI ID + + +## [2.0.1-rc1] - 2024-10-23 + +### Changed +- recipes-extended: sbctl: update sbctl to v0.15.4 +- dts-scripts: Print warning when creds don't support DPP packages + + +## [2.0.0] - 2024-09-30 + +### Changed +- Clean up changelog + ### Added -- workflows: add 'v' to DTS_VER +- Add support for ODROID-H4 +- Add support for NovaCustom V5x0TNx +- Add support for Dell Optiplex 7010/9010 +### Fixed +- Fix workflow errors + + +## [2.0.0-rc7] - 2024-09-23 + ### Changed -- workflows: get DTS_VER from tag not dts-distro.conf -- Rename python3-roca-detect_git_1.2.12.bb -- CHANGELOG: Reintroduce notes for v1.2.22 and v1.2.23 -- CHANGELOG: Fix kernel version for 2.0.0-rc1 -- kas-uefi-sb.yml: update to scarthgap -- Add generate-changed-recipes script + specify PV for git recipes -- .github/workflows: Deploy manifest to boot.dasharo.com -- Use git-cliff to generate changelog -- recipes-bsp/coreboot-utils: Use 4.21 as base version for coreboot-utils packages +- pre-commit: use upstream oelint +- recipes-dts: dts-scripts: Bump SRCREV (verbose mode and sending logs) + + +## [2.0.0-rc6] - 2024-09-12 + +### Changed +- 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 + + +### Added +- Add support for Dell Optiplex including DPP support + + +## [2.0.0-rc5] - 2024-08-28 + +### Changed +- .github/workflows: Use separate SSH config for deploy job +- distro: extended: minio-cli: amend absolete-license +- .oelint-ruleset.json: Set homepageping to info so pre-commit ci can run + + +## [2.0.0-rc4] - 2024-07-26 + +### Added +- Add minio-cli +- dts-scripts: add DES(DPP) packaging support + + +## [2.0.0-rc3] - 2024-07-16 + +### Changed +- dts-scripts: Change to rev removing separate EC update + + +## [2.0.0-rc2] - 2024-07-09 + +### Changed +- 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 +- dasharo-ectool: bump rev for Dasharo ACPI ID + +### Added +- Add and use python semver module to compare versions +- Add lshw + + +## [2.0.0-rc1] - 2024-07-08 + +### Added +- Add support for MTL +- Add txesbmantool, revision 235c946838dc8c619ff821c9791386d63f5cbd6a +- Add smmstoretool, revision 602653abed391ae1b1445ad86d0f05b8b5b678cb +- Add cpuid tool +- Add pre-commit configuration +- Add cukinia documentation + + +### Changed +- 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 +- 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 +- Updated Linux kernel to version 6.6.21 +- Don't use ICMP for network connection verification ### Fixed -- python3-roca-detect: fix missing dependencies +- dts-scripts: fix Intel regions backup +- Fixed scp not working without `-O` option + + +### Removed +- support: hidapi: delete ## [1.2.23] - 2024-06-27 From e4b9f7645d70012dfa9f32b5549b840fdbe7fa08 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Fri, 22 Nov 2024 11:12:14 +0100 Subject: [PATCH 28/50] Add extension to generate-changed-recipes Signed-off-by: Pawel Langowski --- .../{generate-changed-recipes => generate-changed-recipes.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename scripts/{generate-changed-recipes => generate-changed-recipes.py} (98%) diff --git a/scripts/generate-changed-recipes b/scripts/generate-changed-recipes.py similarity index 98% rename from scripts/generate-changed-recipes rename to scripts/generate-changed-recipes.py index 85aad1ed..10a80654 100755 --- a/scripts/generate-changed-recipes +++ b/scripts/generate-changed-recipes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python from pathlib import Path import os From 5da2417cee6054634000cfeb1a568fe6e2d31d01 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Fri, 22 Nov 2024 12:39:09 +0100 Subject: [PATCH 29/50] README: Explain parameter in generate-changelog.sh Signed-off-by: Pawel Langowski --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index a5ff45b7..499c07db 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,10 @@ consists of two steps. release on `https://github.com/Dasharo/meta-dts/releases`, from where binaries can be downloaded. +When generating the changelog, you can provide your GitHub access token as a +parameter to `generate-changelog.sh`. This will increase the cap on API call +rate, which may otherwise prevent you from running `git cliff`. + [zarhus-release-process]: https://docs.zarhus.com/development-process/standard-release-process ## Cukinia tests From 1a6d0b23363dd3ac1b3fdd3ebaae3cabb309df16 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Fri, 22 Nov 2024 12:47:34 +0100 Subject: [PATCH 30/50] .github/workflows/test.yml: Create hdd.qcow using `touch` Signed-off-by: Pawel Langowski --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9c8862e3..e6d8951a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,8 @@ jobs: id: run_qemu run: | cd open-source-firmware-validation/scripts/ci - qemu-img create -f qcow2 qemu-data/hdd.qcow 20G + mkdir qemu-data + touch qemu-data/hdd.qcow ./qemu-run.sh nographic os & - name: Create directory for logs shell: bash From 19c03d52753655681e2abc27e4b70c2dd46fb834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= Date: Wed, 20 Nov 2024 15:26:59 +0100 Subject: [PATCH 31/50] workflow: Fix build failure reported as success MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Iwanicki --- .github/workflows/build.yml | 14 +++++++------- .github/workflows/ci.yml | 1 - .github/workflows/develop.yml | 1 - .github/workflows/weekly.yml | 1 - 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e852d5a7..82940306 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,8 @@ jobs: build: runs-on: labels: dts-builder + env: + FAILED_ATTEMPTS: 0 steps: - name: Checkout meta-dts repo uses: actions/checkout@v4 @@ -31,17 +33,15 @@ jobs: break else echo "Build command failed on attempt $attempt" + echo "FAILED_ATTEMPTS=$attempt" >> $GITHUB_ENV if [ $attempt -lt 5 ]; then sleep 5 + else + exit 1 fi fi done - continue-on-error: true - name: Report build command + if: always() run: | - if [ ${{ steps.build_image.outcome }} == 'failure' ]; then - echo "All build attempts failed." - exit 1 - else - echo "At least one build attempt succeeded." - fi + echo "$FAILED_ATTEMPTS build attempts failed" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4af11cf9..a6ba4db6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,6 @@ jobs: cacheless: false deploy-images: name: Deploy DTS artifacts on boot.dasharo.com and GitHub Release - if: ${{ always() && contains(join(needs.*.result, ','), 'success') }} needs: build runs-on: labels: dts-builder diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index f5e2f923..36f137fb 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -12,7 +12,6 @@ jobs: cacheless: false deploy-images: name: Deploy DTS artifacts on boot.dasharo.com - if: ${{ always() && contains(join(needs.*.result, ','), 'success') }} needs: build runs-on: labels: dts-builder diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 88e12d81..59ddee1a 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -12,7 +12,6 @@ jobs: cacheless: true deploy-cache: name: Deploy cache on cache.dasharo.com - if: always() needs: build runs-on: labels: dts-builder From 710dcbebba1705798412095aab5d28d8b9cd849c Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Fri, 22 Nov 2024 13:15:21 +0100 Subject: [PATCH 32/50] dts-scripts: Improve UI/UX Signed-off-by: Pawel Langowski --- 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 6d92efea..74f67b4e 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 = "e757053cae37453cbd7dfaebf0f1a1676829fb25" +SRCREV = "9431daed0e5f60885109e7ff1f6eae51554fc5a9" S = "${WORKDIR}/git" From b43520ccc2112383aeb8a080f59f8a0bea0c16ec Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Fri, 22 Nov 2024 15:59:01 +0100 Subject: [PATCH 33/50] dts-distro.conf: bump to 2.1.0 Signed-off-by: Pawel Langowski --- 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 38d3fa26..4a671c62 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.1-rc2" +DISTRO_VERSION = "2.1.0" SDK_VENDOR = "-dtssdk" MAINTAINER = "3mdeb Sp. z o. o. " From 482f808f37c3fb157359d453b8f755f22cc8f3e7 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Fri, 22 Nov 2024 16:09:43 +0100 Subject: [PATCH 34/50] .github/workflows/test.yml: Fix job name in `needs` Signed-off-by: Pawel Langowski --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e6d8951a..7fb0f4ed 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: run-tests: name: Run DTS tests if: ${{ github.head_ref == 'develop' && contains(join(needs.*.result, ','), 'success') }} - needs: build + needs: build-dts runs-on: labels: dts-builder steps: From cd2e2858811e8dfe4f9173667ef7c97bb68c9e19 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Mon, 25 Nov 2024 08:49:27 +0100 Subject: [PATCH 35/50] .github/workflows/test.yml: Hotfix Signed-off-by: Pawel Langowski --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7fb0f4ed..f287dc54 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,7 +35,7 @@ jobs: imgfetch --name file_initrd dts-base-image-genericx86-64.cpio.gz\n kernel file_kernel root=/dev/nfs initrd=file_initrd\n boot" > ipxe/dts.ipxe - cd ipxe && python3-m http.server 4321 & + cd ipxe && python3 -m http.server 4321 & - name: Install requirements shell: bash run: | From 822657590377da31fbdd4351a2299ab8085e0278 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Mon, 25 Nov 2024 10:37:44 +0100 Subject: [PATCH 36/50] .github/workflows/test.yml: Add missing backslashes Signed-off-by: Pawel Langowski --- .github/workflows/test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f287dc54..20150e8c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -79,37 +79,37 @@ jobs: robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$MSI_DOWNLOAD \ -v dpp_logs_key:$MSI_LOGS -v netboot_utilities_support:True \ - -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe + -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ -i "msi" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_msi.log | grep "| PASS |\|| FAIL |" robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$MSI_HEADS_DOWNLOAD \ -v dpp_logs_key:$MSI_HEADS_LOGS -v netboot_utilities_support:True \ - -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe + -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ -i "msi_heads" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_msi_heads.log | grep "| PASS |\|| FAIL |" robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$OPTIPLEX_DOWNLOAD \ -v dpp_logs_key:$OPTIPLEX_LOGS -v netboot_utilities_support:True \ - -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe + -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ -i "optiplex" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_optiplex.log | grep "| PASS |\|| FAIL |" robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$NOVACUSTOM_HEADS_DOWNLOAD \ -v dpp_logs_key:$NOVACUSTOM_HEADS_LOGS -v netboot_utilities_support:True \ - -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe + -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ -i "novacustom_heads" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_nc_heads.log | grep "| PASS |\|| FAIL |" robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$PCENGINES_DOWNLOAD \ -v dpp_logs_key:$PCENGINES_LOGS -v netboot_utilities_support:True \ - -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe + -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ -i "pcengines" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_pcengines.log | grep "| PASS |\|| FAIL |" robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$PCENGINES_SEABIOS_DOWNLOAD \ -v dpp_logs_key:$PCENGINES_SEABIOS_LOGS -v netboot_utilities_support:True \ - -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe + -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ -i "pcengines_seabios" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_pcengines_seabios.log | grep "| PASS |\|| FAIL |" - name: Copy log shell: bash From 663ba0e06a473768dcc676bea0fa0c5f8f7130e9 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Wed, 27 Nov 2024 11:09:09 +0100 Subject: [PATCH 37/50] dts-scripts: Hotfix Signed-off-by: Pawel Langowski --- 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 74f67b4e..c244fc42 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 = "9431daed0e5f60885109e7ff1f6eae51554fc5a9" +SRCREV = "b37ff24598b2a2505ed9251e3bf229842dcdf153" S = "${WORKDIR}/git" From fc8ae35f69610cf2f9ca4f5dae2050179f20ca74 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Fri, 29 Nov 2024 15:18:38 +0100 Subject: [PATCH 38/50] dts-scripts: Use correct flashrom flags Signed-off-by: Pawel Langowski --- 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 c244fc42..1ca03178 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 = "b37ff24598b2a2505ed9251e3bf229842dcdf153" +SRCREV = "5046a68a6bb57353ab46fba291268f91b1e509ac" S = "${WORKDIR}/git" From 5b6bd5a07f848b46904f0f5dfd50ad7046794d53 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Wed, 4 Dec 2024 16:40:09 +0100 Subject: [PATCH 39/50] dts-distro.conf: Change PREFERRED_VERSION_flashrom Signed-off-by: Pawel Langowski --- 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 4a671c62..1b825da5 100644 --- a/meta-dts-distro/conf/distro/dts-distro.conf +++ b/meta-dts-distro/conf/distro/dts-distro.conf @@ -33,6 +33,6 @@ IMAGE_FSTYPES = "cpio.gz wic.gz wic.bmap iso" # Dasharo firmware is installed IMAGE_EFI_BOOT_FILES += "grub-efi-bootx64.efi;EFI/DTS/grubx64.efi" -PREFERRED_VERSION_flashrom = "git" +PREFERRED_VERSION_flashrom = "dasharo-v1.2.2+git%" PREFERRED_VERSION_fwupd = "2.0.1" APPEND += "quiet" From f5b42d19a71886f53109bc07fa6da1429dd44be9 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Thu, 5 Dec 2024 13:34:35 +0100 Subject: [PATCH 40/50] dts-scripts: Bump Optiplex version to 0.1.1 Signed-off-by: Pawel Langowski --- 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 1ca03178..7ad352a3 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 = "5046a68a6bb57353ab46fba291268f91b1e509ac" +SRCREV = "d2b611dacc9cbb75122b7803104734a28bce0442" S = "${WORKDIR}/git" From fd9b8e8973084db08f527339be1108a3f147c4ac Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Thu, 5 Dec 2024 13:38:12 +0100 Subject: [PATCH 41/50] Remove condition for running tests Signed-off-by: Pawel Langowski --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 20150e8c..7b8b5d8a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,6 @@ jobs: cacheless: false run-tests: name: Run DTS tests - if: ${{ github.head_ref == 'develop' && contains(join(needs.*.result, ','), 'success') }} needs: build-dts runs-on: labels: dts-builder From a413b053a94fac90e2a6ce851acf891eb84c0950 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Thu, 5 Dec 2024 14:00:46 +0100 Subject: [PATCH 42/50] .github/workflows/test.yml: Fix test tag names Signed-off-by: Pawel Langowski --- .github/workflows/test.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7b8b5d8a..bbf28fed 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -79,7 +79,7 @@ jobs: -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$MSI_DOWNLOAD \ -v dpp_logs_key:$MSI_LOGS -v netboot_utilities_support:True \ -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ - -i "msi" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_msi.log | grep "| PASS |\|| FAIL |" + -i "msi_comm" -i "msi_dpp" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_msi.log | grep "| PASS |\|| FAIL |" robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$MSI_HEADS_DOWNLOAD \ @@ -91,25 +91,20 @@ jobs: -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$OPTIPLEX_DOWNLOAD \ -v dpp_logs_key:$OPTIPLEX_LOGS -v netboot_utilities_support:True \ -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ - -i "optiplex" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_optiplex.log | grep "| PASS |\|| FAIL |" + -i "optiplex_dpp" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_optiplex.log | grep "| PASS |\|| FAIL |" robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$NOVACUSTOM_HEADS_DOWNLOAD \ -v dpp_logs_key:$NOVACUSTOM_HEADS_LOGS -v netboot_utilities_support:True \ -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ - -i "novacustom_heads" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_nc_heads.log | grep "| PASS |\|| FAIL |" + -i "novacustom_heads" -i "novacustom_comm" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_nc_heads.log | grep "| PASS |\|| FAIL |" robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$PCENGINES_DOWNLOAD \ -v dpp_logs_key:$PCENGINES_LOGS -v netboot_utilities_support:True \ -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ - -i "pcengines" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_pcengines.log | grep "| PASS |\|| FAIL |" + -i "pcengines_dpp" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_pcengines.log | grep "| PASS |\|| FAIL |" - robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ - -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$PCENGINES_SEABIOS_DOWNLOAD \ - -v dpp_logs_key:$PCENGINES_SEABIOS_LOGS -v netboot_utilities_support:True \ - -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ - -i "pcengines_seabios" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_pcengines_seabios.log | grep "| PASS |\|| FAIL |" - name: Copy log shell: bash env: From 9055627fd9939c1f58e5b2f05a8b78f1adae8d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= Date: Thu, 5 Dec 2024 15:34:31 +0100 Subject: [PATCH 43/50] workflow: copy logs on success and failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Iwanicki --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bbf28fed..271670a1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -107,6 +107,7 @@ jobs: - name: Copy log shell: bash + if: ${{ !cancelled() }} env: LOG_DIR: ${{ steps.log_dirs.outputs.directory }} run: | From 18dd7b54e6a66fe3ff035cada6ce65c2c27722ea Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Fri, 6 Dec 2024 08:28:07 +0100 Subject: [PATCH 44/50] workflows/test.yml: Change qemu disk extension Signed-off-by: Pawel Langowski --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 271670a1..ae8f033a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,7 @@ jobs: run: | cd open-source-firmware-validation/scripts/ci mkdir qemu-data - touch qemu-data/hdd.qcow + touch qemu-data/hdd.qcow2 ./qemu-run.sh nographic os & - name: Create directory for logs shell: bash From 42e0840145c54cbef694d1dcf76fb2fd9f8b40aa Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Fri, 6 Dec 2024 12:03:01 +0100 Subject: [PATCH 45/50] workflows/test.yml: Set `boot_dts_from_ipxe_shell:True` in tests Signed-off-by: Pawel Langowski --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ae8f033a..e4d0f4bf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -77,31 +77,31 @@ jobs: robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$MSI_DOWNLOAD \ - -v dpp_logs_key:$MSI_LOGS -v netboot_utilities_support:True \ + -v dpp_logs_key:$MSI_LOGS -v boot_dts_from_ipxe_shell:True \ -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ -i "msi_comm" -i "msi_dpp" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_msi.log | grep "| PASS |\|| FAIL |" robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$MSI_HEADS_DOWNLOAD \ - -v dpp_logs_key:$MSI_HEADS_LOGS -v netboot_utilities_support:True \ + -v dpp_logs_key:$MSI_HEADS_LOGS -v boot_dts_from_ipxe_shell:True \ -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ -i "msi_heads" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_msi_heads.log | grep "| PASS |\|| FAIL |" robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$OPTIPLEX_DOWNLOAD \ - -v dpp_logs_key:$OPTIPLEX_LOGS -v netboot_utilities_support:True \ + -v dpp_logs_key:$OPTIPLEX_LOGS -v boot_dts_from_ipxe_shell:True \ -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ -i "optiplex_dpp" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_optiplex.log | grep "| PASS |\|| FAIL |" robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$NOVACUSTOM_HEADS_DOWNLOAD \ - -v dpp_logs_key:$NOVACUSTOM_HEADS_LOGS -v netboot_utilities_support:True \ + -v dpp_logs_key:$NOVACUSTOM_HEADS_LOGS -v boot_dts_from_ipxe_shell:True \ -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ -i "novacustom_heads" -i "novacustom_comm" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_nc_heads.log | grep "| PASS |\|| FAIL |" robot -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v snipeit:no \ -v dpp_password:$DPP_PASSWORD -v dpp_download_key:$PCENGINES_DOWNLOAD \ - -v dpp_logs_key:$PCENGINES_LOGS -v netboot_utilities_support:True \ + -v dpp_logs_key:$PCENGINES_LOGS -v boot_dts_from_ipxe_shell:True \ -v dts_ipxe_link:http://${ip_addr}:4321/dts.ipxe \ -i "pcengines_dpp" dts/dts-e2e.robot 2>&1 | tee $LOG_DIR/output_pcengines.log | grep "| PASS |\|| FAIL |" From 0aafcf62d6149de9757876a6375002365b887164 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Fri, 6 Dec 2024 12:59:41 +0100 Subject: [PATCH 46/50] workflows: test.yml: Clean up all files Signed-off-by: Pawel Langowski --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e4d0f4bf..d567957d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -122,4 +122,4 @@ jobs: - name: Cleanup after tests shell: bash run: | - rm -rf open-source-firmware-validation meta-dts build ipxe + rm -rf $GITHUB_WORKSPACE; mkdir $GITHUB_WORKSPACE From 84f0e76d29ac6926ae4b13b6d438515f9f24bfcb Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Fri, 6 Dec 2024 14:12:33 +0100 Subject: [PATCH 47/50] .github/workflows: Use ipxe-run.sh to run ipxe server Signed-off-by: Pawel Langowski --- .github/workflows/test.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d567957d..83849c18 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,16 +25,8 @@ jobs: - name: Run IPXE server shell: bash run: | - mkdir ipxe - cp build/tmp/deploy/images/genericx86-64/dts-base-image-genericx86-64.cpio.gz ipxe - cp build/tmp/deploy/images/genericx86-64/bzImage ipxe - echo -e "\n - #!ipxe\n - imgfetch --name file_kernel bzImage\n - imgfetch --name file_initrd dts-base-image-genericx86-64.cpio.gz\n - kernel file_kernel root=/dev/nfs initrd=file_initrd\n - boot" > ipxe/dts.ipxe - cd ipxe && python3 -m http.server 4321 & + cd open-source-firmware-validation + ./scripts/ci/ipxe-run.sh build/tmp/deploy/images/genericx86-64/dts-base-image-genericx86-64.cpio.gz build/tmp/deploy/images/genericx86-64/bzImage & - name: Install requirements shell: bash run: | From 629bc4cb64ea30f2d8d9308aaa9f30cd7bf03cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= Date: Fri, 6 Dec 2024 16:36:05 +0100 Subject: [PATCH 48/50] dts-scripts: fix SRCREV to use merge commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes mistake made in f5b42d19a71886f53109bc07fa6da1429dd44be9 Signed-off-by: Michał Iwanicki --- 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 7ad352a3..c77f49d4 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 = "d2b611dacc9cbb75122b7803104734a28bce0442" +SRCREV = "c7b8d036f549c41f848ee254ba309baf762835d5" S = "${WORKDIR}/git" From a546c0d40031147e2b81c810b602efcd3d369657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Iwanicki?= Date: Fri, 6 Dec 2024 18:49:13 +0100 Subject: [PATCH 49/50] workflow: fix build artifact paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Iwanicki --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 83849c18..d1d8ee20 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ jobs: shell: bash run: | cd open-source-firmware-validation - ./scripts/ci/ipxe-run.sh build/tmp/deploy/images/genericx86-64/dts-base-image-genericx86-64.cpio.gz build/tmp/deploy/images/genericx86-64/bzImage & + ./scripts/ci/ipxe-run.sh ../build/tmp/deploy/images/genericx86-64/dts-base-image-genericx86-64.cpio.gz ../build/tmp/deploy/images/genericx86-64/bzImage & - name: Install requirements shell: bash run: | From 0795508d026a009491115788cbc4fa0e560309a8 Mon Sep 17 00:00:00 2001 From: Pawel Langowski Date: Mon, 9 Dec 2024 14:36:53 +0100 Subject: [PATCH 50/50] CHANGELOG: Fix links + add changelog for v2.1.0 Signed-off-by: Pawel Langowski --- CHANGELOG.md | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38f049ac..54fc3aa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,56 @@ +# Changelog + All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [2.1.0] - 2024-12-09 + +### Added +- recipes-gnome: gcab: add bbapend that disable qa tests +- recipes-kernel: linux-yocto: add efivars.cfg back to SRC_URI +- distro: recipes-kernel: linux-yocto: add capsule update configuration + + +### Changed +- conf/distro/dts-distro.conf: ROOT_HOME was missing +- recipes-bsp: txe-secure-boot: smmstoretool fix buildpaths warning +- recipes-bsp: coreboot-utils: nvramtool - Fix buildpath warning +- recipes-connectivity: wolfssl: Ignore [buildpaths] QA ISSUE +- recipes-gnome: gcab: use insane_skip instead of disabling whole qa check +- recipes-core: base-files: Mount efivars by default. Needed by FUM +- distro: recipes-dts: dts-scripts: bump revision +- Add generate-changed-recipes script + specify PV for git recipes +- .github/workflows: Deploy manifest to boot.dasharo.com +- Use git-cliff to generate changelog +- recipes-bsp/coreboot-utils: Use 4.21 as base version for coreboot-utils packages +- README: Link Zarhus release process +- Change git-cliff config +- .github/workflows: Fix getting DTS_VER in manifest deployment +- Move generate-changelog.sh to scripts +- Fill up CHANGELOG after rebase +- Add extension to generate-changed-recipes +- README: Explain parameter in generate-changelog.sh +- .github/workflows: Add workflow with DTS tests +- .github/workflows: Add build.yml reusable workflow +- dts-distro.conf: bump to 2.1.0 +- dts-scripts: Improve UI/UX +- dts-scripts: Use correct flashrom flags +- dts-distro.conf: Change PREFERRED_VERSION_flashrom +- Remove condition for running tests +- dts-scripts: Bump Optiplex version to 0.1.1 + + +### Fixed +- recipes-bsp/coreboot-utils/intelp2m_git.bb: fix buildpath error +- workflow: fix build artifact paths + + +### Removed +- linux-yocto: remove deprecated kconfig entries +- recipes-bsp: intelp2m: remove useless 'go version' command + + ## [2.0.1-rc3] - 2024-11-21 ### Changed @@ -917,7 +966,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix README -[unreleased]: https://github.com/Dasharo/meta-dts/compare/v1.2.23..HEAD +[2.1.0]: https://github.com/Dasharo/meta-dts/compare/v2.0.1-rc3..v2.1.0 +[2.0.1-rc3]: https://github.com/Dasharo/meta-dts/compare/v2.0.1-rc2..v2.0.1-rc3 +[2.0.1-rc2]: https://github.com/Dasharo/meta-dts/compare/v2.0.1-rc1..v2.0.1-rc2 +[2.0.1-rc1]: https://github.com/Dasharo/meta-dts/compare/v2.0.0..v2.0.1-rc1 +[2.0.0]: https://github.com/Dasharo/meta-dts/compare/v2.0.0-rc7..v2.0.0 +[2.0.0-rc7]: https://github.com/Dasharo/meta-dts/compare/v2.0.0-rc6..v2.0.0-rc7 +[2.0.0-rc6]: https://github.com/Dasharo/meta-dts/compare/v2.0.0-rc5..v2.0.0-rc6 +[2.0.0-rc5]: https://github.com/Dasharo/meta-dts/compare/v2.0.0-rc4..v2.0.0-rc5 +[2.0.0-rc4]: https://github.com/Dasharo/meta-dts/compare/v2.0.0-rc3..v2.0.0-rc4 +[2.0.0-rc3]: https://github.com/Dasharo/meta-dts/compare/v2.0.0-rc2..v2.0.0-rc3 +[2.0.0-rc2]: https://github.com/Dasharo/meta-dts/compare/v2.0.0-rc1..v2.0.0-rc2 +[2.0.0-rc1]: https://github.com/Dasharo/meta-dts/compare/v1.2.23..v2.0.0-rc1 [1.2.23]: https://github.com/Dasharo/meta-dts/compare/v1.2.22..v1.2.23 [1.2.22]: https://github.com/Dasharo/meta-dts/compare/v1.2.21..v1.2.22 [1.2.21]: https://github.com/Dasharo/meta-dts/compare/v1.2.20..v1.2.21