Merge pull request #2 from zarhus/move-recipes

m-iwanicki · web-flow · commit e7ad6314f9ee · 2024-12-12T11:12:08.000+01:00
Added recipes from meta-dts-distro to meta-coreboot as part of migratiom
diff --git a/.codespellrc b/.codespellrc
@@ -1,3 +1,3 @@
 [codespell]
 exclude-file = .codespellx
-ignore-words-list = "FPT,FTP,fpt,ftp"
+ignore-words-list = FPT,FTP,fpt,ftp,crate
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -46,10 +46,10 @@ repos:
         args: [--fix]
 
   - repo: https://github.com/priv-kweihmann/oelint-adv
-    rev: 6.5.6
+    rev: 6.6.2
     hooks:
       - id: oelint-adv
-        args: [--rulefile=.oelint-ruleset.json, --hide=info, --quiet, --fix]
+        args: [--rulefile=.oelint-ruleset.json, --hide=info, --quiet]
         name: Advanced oelint
         description: Based on the OpenEmbedded Styleguide and work done by oe-stylize-tool this module offers a (nearly) complete linter for bitbake-recipes.
         entry: oelint-adv
diff --git a/conf/layer.conf b/conf/layer.conf
@@ -1,12 +1,13 @@
 BBPATH .= ":${LAYERDIR}"
 
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
+            ${LAYERDIR}/recipes-*/*/*.bbappend \
+            "
 
 BBFILE_COLLECTIONS += "coreboot"
-BBFILE_PATTERN_dasharo = "^${LAYERDIR}/"
-BBFILE_PRIORITY_dasharo = "85"
+BBFILE_PATTERN_coreboot = "^${LAYERDIR}/"
+BBFILE_PRIORITY_coreboot = "85"
 
-LAYERVERSION_dasharo = "1"
+LAYERVERSION_coreboot = "1"
 
-LAYERSERIES_COMPAT_meta-dasharo = "scarthgap master"
+LAYERSERIES_COMPAT_coreboot = "scarthgap master"
diff --git a/recipes-bsp/coreboot-utils/cbfstool_git.bb b/recipes-bsp/coreboot-utils/cbfstool_git.bb
@@ -0,0 +1,28 @@
+require coreboot-utils.inc
+
+SUMMARY = "Tool for manipulating CBFS file"
+
+SRC_URI += " \
+    git://review.coreboot.org/vboot.git;destsuffix=git/3rdparty/vboot;name=vboot;protocol=https;branch=main \
+    "
+
+SRCREV_vboot = "0c11187c755394683d1b75bdb103cb1959fa6d40"
+SRCREV_FORMAT = "vboot"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+EXTRA_OEMAKE = " \
+    DESTDIR=\"${D}\" \
+    PREFIX=\"${prefix}\" \
+"
+
+INSANE_SKIP:${PN} = "textrel"
+
+do_compile () {
+    oe_runmake -C util/cbfstool cbfstool
+}
+
+do_install () {
+    install -d ${D}/${sbindir}
+    install ${S}/util/${PN}/${PN} ${D}/${sbindir}
+}
diff --git a/recipes-bsp/coreboot-utils/cbmem_git.bb b/recipes-bsp/coreboot-utils/cbmem_git.bb
@@ -0,0 +1,18 @@
+require coreboot-utils.inc
+
+SUMMARY = "CBMEM parser to read e.g. timestamps and console log"
+
+DEPENDS += "pciutils zlib"
+
+EXTRA_OEMAKE = ' \
+               DESTDIR="${D}" \
+               PREFIX="${prefix}" \
+               '
+
+do_compile () {
+  oe_runmake -C util/cbmem
+}
+
+do_install () {
+  oe_runmake -C util/cbmem install
+}
diff --git a/recipes-bsp/coreboot-utils/coreboot-utils.inc b/recipes-bsp/coreboot-utils/coreboot-utils.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "coreboot tools"
+HOMEPAGE = "https://doc.coreboot.org/util.html"
+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\
+    "
+
+SRCREV = "d08d5eaa98b1204b5e665d3ae4f63fb6f84a0d77"
+
+S = "${WORKDIR}/git"
diff --git a/recipes-bsp/coreboot-utils/ectool_git.bb b/recipes-bsp/coreboot-utils/ectool_git.bb
@@ -0,0 +1,16 @@
+require coreboot-utils.inc
+
+SUMMARY = "Dumps the RAM of a laptop's Embedded/Environmental Controller (EC)."
+
+EXTRA_OEMAKE = ' \
+               DESTDIR="${D}" \
+               PREFIX="${prefix}" \
+               '
+
+do_compile () {
+  oe_runmake -C util/ectool
+}
+
+do_install () {
+  oe_runmake -C util/ectool install
+}
diff --git a/recipes-bsp/coreboot-utils/files/0001-Makefile-disable-deprecated-warnigs-as-errors.patch b/recipes-bsp/coreboot-utils/files/0001-Makefile-disable-deprecated-warnigs-as-errors.patch
@@ -0,0 +1,25 @@
+From 2c095fae49351a6be86934658e20de0e9f985061 Mon Sep 17 00:00:00 2001
+From: wkawka <wiktor.kawka@3mdeb.com>
+Date: Fri, 16 Sep 2022 11:09:29 +0200
+Subject: [PATCH] Makefile: disable deprecated warnings as errors
+
+Signed-off-by: wkawka <wiktor.kawka@3mdeb.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 7f38bd6b..e3615a11 100644
+--- a/Makefile
++++ b/Makefile
+@@ -124,7 +124,7 @@ endif
+ # Provide default CC and CFLAGS for firmware builds; if you have any -D flags,
+ # please add them after this point (e.g., -DVBOOT_DEBUG).
+ DEBUG_FLAGS := $(if ${DEBUG},-g -Og,-g -Os)
+-WERROR := -Werror
++WERROR := -Werror -Wno-deprecated-declarations
+ FIRMWARE_FLAGS := -nostdinc -ffreestanding -fno-builtin -fno-stack-protector
+ COMMON_FLAGS := -pipe ${WERROR} -Wall -Wstrict-prototypes -Wtype-limits \
+ 	-Wundef -Wmissing-prototypes -Wno-trigraphs -Wredundant-decls -Wshadow \
+-- 
+2.25.1
diff --git a/recipes-bsp/coreboot-utils/futil_git.bb b/recipes-bsp/coreboot-utils/futil_git.bb
@@ -0,0 +1,53 @@
+SUMMARY = "\
+    Firmware utility tool, used to create, sign, and validate Chrome \
+    OS images."
+
+HOMEPAGE = "https://github.com/Dasharo/vboot"
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=562c740877935f40b262db8af30bca36"
+
+DEPENDS += " \
+    openssl \
+    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 \
+"
+SRCREV = "dc68f9f1b56d92f76026dca490e79493599ff4cf"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+RDEPENDS:${PN} += " \
+    bash \
+"
+
+EXTRA_OEMAKE = " \
+    DESTDIR=\"${D}\" \
+    PREFIX=\"${prefix}\"\
+"
+
+INSANE_SKIP:${PN} = "textrel"
+
+do_compile() {
+  oe_runmake futil
+}
+
+do_install() {
+    # we only install futility binary and couple of scripts that are used by
+    # dasharo-deploy script
+    install -d ${D}/${sbindir}
+    install -d ${D}/${bindir}
+    install -m 755 ${S}/build/futility/futility ${D}/${bindir}
+    install ${S}/scripts/image_signing/resign_firmwarefd.sh ${D}/${sbindir}
+    install ${S}/scripts/image_signing/common_minimal.sh ${D}/${sbindir}
+    install ${S}/scripts/image_signing/sign_firmware.sh ${D}/${sbindir}
+}
diff --git a/recipes-bsp/coreboot-utils/ifdtool_git.bb b/recipes-bsp/coreboot-utils/ifdtool_git.bb
@@ -0,0 +1,18 @@
+require coreboot-utils.inc
+
+SUMMARY = "Extract and dump Intel Firmware Descriptor information"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+EXTRA_OEMAKE = ' \
+               DESTDIR="${D}" \
+               PREFIX="${prefix}" \
+               '
+
+do_compile () {
+  oe_runmake -C util/ifdtool
+}
+
+do_install () {
+  oe_runmake -C util/ifdtool install
+}
diff --git a/recipes-bsp/coreboot-utils/intelmetool_git.bb b/recipes-bsp/coreboot-utils/intelmetool_git.bb
@@ -0,0 +1,20 @@
+require coreboot-utils.inc
+
+SUMMARY = "Dump interesting things about Management Engine even if hidden"
+
+DEPENDS += "pciutils zlib"
+
+EXTRA_OEMAKE = ' \
+               DESTDIR="${D}" \
+               PREFIX="${prefix}" \
+               '
+
+TARGET_CFLAGS += "-I../../src/commonlib/bsd/include"
+
+do_compile () {
+  oe_runmake -C util/intelmetool
+}
+
+do_install () {
+  oe_runmake -C util/intelmetool install
+}
diff --git a/recipes-bsp/coreboot-utils/intelp2m_git.bb b/recipes-bsp/coreboot-utils/intelp2m_git.bb
@@ -0,0 +1,34 @@
+require coreboot-utils.inc
+
+SUMMARY = "\
+    Converts the configuration DW0/1 registers value from an inteltool \
+    dump to coreboot macros.\
+"
+
+LIC_FILES_CHKSUM = "file://../../COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+GO_IMPORT = "github.com/dasharo/coreboot/"
+
+# we need to override SRC_URI from coreboot-utils.inc so it's unpacked in the
+# directory as expected by the go bbclass
+SRC_URI = " \
+    git://github.com/dasharo/coreboot.git;protocol=https;branch=dasharo-4.21;destsuffix=${GO_IMPORT} \
+    "
+
+S = "${WORKDIR}/${GO_IMPORT}/util/intelp2m"
+
+inherit goarch
+inherit go
+
+do_compile() {
+    export GOARCH="${TARGET_GOARCH}"
+
+    cd ${S}
+
+    go build -trimpath -v -o intelp2m
+}
+
+do_install() {
+    install -d ${D}/${sbindir}
+    install ${S}/${PN} ${D}/${sbindir}
+}
diff --git a/recipes-bsp/coreboot-utils/inteltool_git.bb b/recipes-bsp/coreboot-utils/inteltool_git.bb
@@ -0,0 +1,21 @@
+require coreboot-utils.inc
+
+SUMMARY = "\
+    Provides information about the Intel CPU/chipset hardware \
+    configuration (register contents, MSRs, etc).\
+"
+
+DEPENDS += "pciutils zlib"
+
+EXTRA_OEMAKE = ' \
+               DESTDIR="${D}" \
+               PREFIX="${prefix}" \
+               '
+
+do_compile () {
+  oe_runmake -C util/inteltool
+}
+
+do_install () {
+  oe_runmake -C util/inteltool install
+}
diff --git a/recipes-bsp/coreboot-utils/msrtool_git.bb b/recipes-bsp/coreboot-utils/msrtool_git.bb
@@ -0,0 +1,7 @@
+require coreboot-utils.inc
+
+SUMMARY = "Dumps chipset-specific MSR registers."
+DEPENDS += "pciutils"
+S = "${WORKDIR}/git/util/msrtool"
+export PREFIX = "${prefix}"
+inherit autotools-brokensep
diff --git a/recipes-bsp/coreboot-utils/nvramtool_git.bb b/recipes-bsp/coreboot-utils/nvramtool_git.bb
@@ -0,0 +1,18 @@
+require coreboot-utils.inc
+
+SUMMARY = "Reads and writes coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM. "
+
+EXTRA_OEMAKE = ' \
+               DESTDIR="${D}" \
+               PREFIX="${prefix}" \
+               '
+
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+do_compile () {
+  oe_runmake -C util/nvramtool
+}
+
+do_install () {
+  oe_runmake -C util/nvramtool install
+}
diff --git a/recipes-bsp/coreboot-utils/superiotool_git.bb b/recipes-bsp/coreboot-utils/superiotool_git.bb
@@ -0,0 +1,18 @@
+require coreboot-utils.inc
+
+SUMMARY = "A user-space utility to detect Super I/O of a mainboard and provide detailed information about the register contents of the Super I/O. "
+
+DEPENDS += "pciutils zlib"
+
+EXTRA_OEMAKE = ' \
+               DESTDIR="${D}" \
+               PREFIX="${prefix}" \
+               '
+
+do_compile () {
+  oe_runmake -C util/superiotool
+}
+
+do_install () {
+  oe_runmake -C util/superiotool install
+}
diff --git a/recipes-bsp/coreboot-utils/txesbmantool_git.bb b/recipes-bsp/coreboot-utils/txesbmantool_git.bb
@@ -0,0 +1,44 @@
+SUMMARY = "Utility for generating TXE Secure Boot manifests"
+HOMEPAGE = "https://github.com/Dasharo/coreboot"
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "\
+    file://${WORKDIR}/git/LICENSES/GPL-2.0-only.txt;md5=5430828348d2cf7d4b5e8395f774a68e\
+"
+
+DEPENDS += "wolfssl"
+
+PV = "1.0+git${SRCPV}"
+
+SRC_URI = "\
+    git://github.com/Dasharo/coreboot.git;branch=dasharo;protocol=https\
+"
+
+SRCREV = "4706227e009b758a1bebace99f5bfba431874d7a"
+
+S = "${WORKDIR}/git/util/txesbmantool"
+
+inherit pkgconfig
+
+EXTRA_OEMAKE = ' \
+               DESTDIR="${D}" \
+               PREFIX="${prefix}" \
+               '
+
+do_configure:prepend(){
+    export PKG_CONFIG_PATH="${STAGING_LIBDIR}/pkgconfig:${STAGING_DIR_HOST}/usr/lib/pkgconfig"
+}
+
+do_compile:prepend() {
+    export PKG_CONFIG_PATH="${STAGING_LIBDIR}/pkgconfig:${STAGING_DIR_HOST}/usr/lib/pkgconfig"
+}
+
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install
+}
+
+INSANE_SKIP:${PN} += "ldflags"
+
+FILES:${PN} += "\
+    ${bindir}/txesbmantool\
+"
diff --git a/recipes-bsp/packagegroups/packagegroup-coreboot-utils.bb b/recipes-bsp/packagegroups/packagegroup-coreboot-utils.bb
