Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,24 @@ repos:
- commit-msg

- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
rev: v2.4.1
hooks:
- id: codespell

- repo: https://github.com/adrienverge/yamllint
rev: v1.35.1
rev: v1.37.1
hooks:
- id: yamllint
args: [-c=.yamllint]

- repo: https://github.com/3mdeb/hooks
rev: v0.1.3
rev: v0.1.7
hooks:
- id: namespell
args: [--fix]

- repo: https://github.com/priv-kweihmann/oelint-adv
rev: 6.6.2
rev: 8.1.2
hooks:
- id: oelint-adv
args: [--rulefile=.oelint-ruleset.json, --hide=info, --quiet]
Expand Down
4 changes: 4 additions & 0 deletions conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ BBFILE_PRIORITY_dasharo = "80"
LAYERVERSION_dasharo = "1"

LAYERSERIES_COMPAT_dasharo = "scarthgap master"

# See this comment:
# https://github.com/Dasharo/meta-dasharo/pull/7#issuecomment-3052659291
PREFERRED_VERSION_converged-security-suite = "2.6.0"
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
SUMMARY = "Converged Security Suite's txt-suite"
HOMEPAGE = "https://github.com/9elements/converged-security-suite"
SECTION = "devel"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"

SRC_URI = "https://github.com/9elements/converged-security-suite/releases/download/v2.6.0/txt-suite"
SRC_URI[sha256sum] = "1fc1ddae8369ae7938abaca797491b99f56d3f3acd5e951dc368c33482662eaa"

S = "${WORKDIR}"

do_install() {
install -d ${D}${bindir}
# install -m 0755 ${S}/amd-suite ${D}${bindir}
# install -m 0755 ${S}/bg-prov ${D}${bindir}
# install -m 0755 ${S}/bg-suite ${D}${bindir}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about adding bg-suite binary to the layer as was done here https://github.com/Dasharo/meta-dts/blob/2a634e361986aa16286469efd8c879191027458e/meta-dts-distro/recipes-tests/converged-security-suite/bg-suite_2.7.0.bb#L7 ? Consider adding it so we will include this package in DTS later.

@macpijan macpijan Oct 24, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about adding bg-suite binary to the layer

I think that adding any binary to the layer is a truly terrible idea.
We can fetch this binary via SRC_URI from somewhere - if we cannot build it in yocto.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or the place where this binary was taken from.

@macpijan macpijan Oct 24, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is no upstream release, you can possibly upload this binary to GH release in our fork.

# install -m 0755 ${S}/pcr0tool ${D}${bindir}
# install -m 0755 ${S}/txt-prov ${D}${bindir}
install -m 0755 ${S}/txt-suite ${D}${bindir}
}

PACKAGES =+ "${PN}-amd ${PN}-bg ${PN}-txt ${PN}-tools"

FILES:${PN}-amd += "${bindir}/amd-suite"
FILES:${PN}-bg += "${bindir}/bg-prov ${bindir}/bg-suite"
FILES:${PN}-txt += "${bindir}/txt-prov ${bindir}/txt-suite"
FILES:${PN}-tools += "${bindir}/pcr0tool"
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
SUMMARY = "Converged Security Suite's txt-suite"
HOMEPAGE = "https://github.com/9elements/converged-security-suite"
SECTION = "devel"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"

SRC_URI = "https://github.com/9elements/${BPN}/releases/download/v${PV}/artifacts-amd64.zip"
SRC_URI[sha256sum] = "58362a5976e68c31e20ecd34338683826c920bb2f34c717dd693aecbb1f7db3d"

S = "${WORKDIR}"

do_install() {
install -d ${D}${bindir}
install -m 0755 ${S}/amd-suite ${D}${bindir}
install -m 0755 ${S}/bg-prov ${D}${bindir}
install -m 0755 ${S}/bg-suite ${D}${bindir}
install -m 0755 ${S}/pcr0tool ${D}${bindir}
install -m 0755 ${S}/txt-prov ${D}${bindir}
install -m 0755 ${S}/txt-suite ${D}${bindir}
}

PACKAGES =+ "${PN}-amd ${PN}-bg ${PN}-txt ${PN}-tools"

FILES:${PN}-amd += "${bindir}/amd-suite"
FILES:${PN}-bg += "${bindir}/bg-prov ${bindir}/bg-suite"
FILES:${PN}-txt += "${bindir}/txt-prov ${bindir}/txt-suite"
FILES:${PN}-tools += "${bindir}/pcr0tool"