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