diff --git a/.codespellrc b/.codespellrc new file mode 100644 index 0000000..ea58905 --- /dev/null +++ b/.codespellrc @@ -0,0 +1,3 @@ +[codespell] +exclude-file = .codespellx +ignore-words-list = crate, hsi diff --git a/.codespellx b/.codespellx new file mode 100644 index 0000000..e69de29 diff --git a/.conform.yaml b/.conform.yaml new file mode 100644 index 0000000..f96e4e0 --- /dev/null +++ b/.conform.yaml @@ -0,0 +1,16 @@ +--- +policies: + - type: commit + spec: + header: + length: 80 + imperative: false + invalidLastCharacters: . + body: + required: false + dco: true + gpg: + required: true + spellcheck: + locale: US + maximumOfOneCommit: false diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index 61c46a5..1ad0b39 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -26,9 +26,9 @@ assignees: '' **How to reproduce** Steps to reproduce the behavior: -1. -2. -3. +1. +2. +3. **Expected behavior** diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 3ba13e0..bd9dfe4 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1 +1,2 @@ +--- blank_issues_enabled: false diff --git a/.github/ISSUE_TEMPLATE/question-or-support-request.md b/.github/ISSUE_TEMPLATE/question-or-support-request.md index 9abf7cb..9bcc9fb 100644 --- a/.github/ISSUE_TEMPLATE/question-or-support-request.md +++ b/.github/ISSUE_TEMPLATE/question-or-support-request.md @@ -13,4 +13,3 @@ assignees: '' **Question text** - diff --git a/.github/ISSUE_TEMPLATE/task.md b/.github/ISSUE_TEMPLATE/task.md index e8db78a..25a009b 100644 --- a/.github/ISSUE_TEMPLATE/task.md +++ b/.github/ISSUE_TEMPLATE/task.md @@ -21,4 +21,3 @@ assignees: '' **Additional context** - diff --git a/.markdownlint.yml b/.markdownlint.yml new file mode 100644 index 0000000..a17a36b --- /dev/null +++ b/.markdownlint.yml @@ -0,0 +1,196 @@ +--- +# Documentation: +# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md + +# Default state for all rules +default: false + +# MD001/heading-increment/header-increment - Heading levels should only increment by one level at a time +MD001: true + +# MD002/first-heading-h1/first-header-h1 - First heading should be a top-level heading +MD002: + # Heading level + level: 1 + +# MD003/heading-style/header-style - Heading style + +MD003: + # Heading style + # # ATX style H1 + style: "atx" + +# MD004/ul-style - Unordered list style +MD004: + # List style + style: "sublist" + +# MD005/list-indent - Inconsistent indentation for list items at the same level +MD005: true + +# MD006/ul-start-left - Consider starting bulleted lists at the beginning of the line +MD006: true + +# MD007/ul-indent - Unordered list indentation +MD007: + # Spaces for indent + indent: 4 + # Whether to indent the first level of the list + start_indented: false + +# MD009/no-trailing-spaces - Trailing spaces +MD009: + # Spaces for line break + br_spaces: 2 + # Allow spaces for empty lines in list items + list_item_empty_lines: false + # Include unnecessary breaks + strict: false + +# MD010/no-hard-tabs - Hard tabs +MD010: + # Include code blocks + code_blocks: false + # Number of spaces for each hard tab + spaces_per_tab: 1 + +# MD011/no-reversed-links - Reversed link syntax +MD011: true + +# MD012/no-multiple-blanks - Multiple consecutive blank lines +MD012: + # Consecutive blank lines + maximum: 1 +# MD013/line-length - Line length +# +MD013: + # Number of characters + line_length: 80 + # Number of characters for headings + heading_line_length: 80 + # Number of characters for code blocks + code_block_line_length: 160 + # Include code blocks + code_blocks: false + # Include tables + tables: false + # Include headings + headings: true + # Strict length checking (e.g. allow for longer URLs) + strict: false + # Stern length checking + stern: false + +# MD014/commands-show-output - Dollar signs used before commands without showing output +# TODO: set false for now but we should consider enabling it +# https://cirosantilli.com/markdown-style-guide#dollar-signs-in-shell-code +MD014: false + +# MD018/no-missing-space-atx - No space after hash on atx style heading +MD018: true + +# MD019/no-multiple-space-atx - Multiple spaces after hash on atx style heading +MD019: true + +# MD022/blanks-around-headings/blanks-around-headers - Headings should be surrounded by blank lines +MD022: + # Blank lines above heading + lines_above: 1 + # Blank lines below heading + lines_below: 1 + +# MD023/heading-start-left/header-start-left - Headings must start at the beginning of the line +MD023: true + +# MD025/single-title/single-h1 - Multiple top-level headings in the same document +# TODO: consider enabling it + +# MD026/no-trailing-punctuation - Trailing punctuation in heading +MD026: + # Punctuation characters + punctuation: ".,;:!。，；：！" + +# MD027/no-multiple-space-blockquote - Multiple spaces after blockquote symbol +MD027: true + +# MD028/no-blanks-blockquote - Blank line inside blockquote +MD028: true + +# MD029/ol-prefix - Ordered list item prefix +MD029: + # List style + style: "one_or_ordered" + +# MD030/list-marker-space - Spaces after list markers +MD030: + # Spaces for single-line unordered list items + ul_single: 1 + # Spaces for single-line ordered list items + ol_single: 1 + # Spaces for multi-line unordered list items + ul_multi: 1 + # Spaces for multi-line ordered list items + ol_multi: 1 + +# MD031/blanks-around-fences - Fenced code blocks should be surrounded by blank lines +MD031: + # Include list items + list_items: true + +# MD033/no-inline-html - Inline HTML +MD033: + # Allowed elements + allowed_elements: ["br", "center", "img", "script", "form", "input"] + +# MD034/no-bare-urls - Bare URL used +MD034: true + +# MD035/hr-style - Horizontal rule style +MD035: + # Horizontal rule style + style: "---" + +# MD037/no-space-in-emphasis - Spaces inside emphasis markers +MD037: true + +# MD038/no-space-in-code - Spaces inside code span elements +MD038: true + +# MD039/no-space-in-links - Spaces inside link text +MD039: true + +# MD040/fenced-code-language - Fenced code blocks should have a language specified +MD040: true + +# MD041/first-line-heading/first-line-h1 - First line in a file should be a top-level heading +MD041: + # Heading level + level: 1 + # RegExp for matching title in front matter + front_matter_title: "^\\s*title\\s*[:=]" + +# MD042/no-empty-links - No empty links +MD042: true + +# MD046/code-block-style - Code block style +MD046: + # Block style + style: "fenced" + +# MD047/single-trailing-newline - Files should end with a single newline character +MD047: true + +# MD048/code-fence-style - Code fence style +MD048: + # Code fence style + style: "backtick" + +# MD049/emphasis-style - Emphasis style should be consistent +MD049: + # Emphasis style should be consistent + style: "underscore" + +# MD050/strong-style - Strong style should be consistent +MD050: + # Strong style should be consistent + style: "asterisk" diff --git a/.markdownlintignore b/.markdownlintignore new file mode 100644 index 0000000..bdb4045 --- /dev/null +++ b/.markdownlintignore @@ -0,0 +1,2 @@ +.github/ISSUE_TEMPLATE/** +CHANGELOG.md diff --git a/.oelint-ruleset.json b/.oelint-ruleset.json new file mode 100644 index 0000000..68b2b02 --- /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": "info", + "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..1820e20 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,72 @@ +--- +default_stages: [pre-commit] + +default_install_hook_types: [pre-commit, commit-msg] +exclude: .*\.(patch)|(diff)$ + +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.6.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.35.1 + hooks: + - id: yamllint + args: [-c=.yamllint] + + - repo: https://github.com/igorshubovych/markdownlint-cli + rev: v0.41.0 + hooks: + - id: markdownlint + - id: markdownlint-fix + + - repo: https://github.com/talos-systems/conform + rev: v0.1.0-alpha.30 + 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/priv-kweihmann/oelint-adv + rev: 5.7.2 + 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.3.0 + hooks: + - id: codespell + + - repo: https://github.com/3mdeb/hooks + rev: v0.1.2 + hooks: + - id: namespell + args: [--fix] + exclude: README.md + +ci: + autoupdate_commit_msg: 'pre-commit: autoupdate hooks' + autofix_prs: false + # docker is not supported on pre-commit.ci + skip: [shellcheck] diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..5eab4d1 --- /dev/null +++ b/.yamllint @@ -0,0 +1,19 @@ +--- +extends: default + +rules: + comments: + require-starting-space: true + ignore-shebangs: true + min-spaces-from-content: 2 + document-start: + present: true + level: error + indentation: + spaces: 2 + line-length: disable + truthy: + check-keys: false + key-duplicates: + ignore: | + */ser2net/ser2net/ser2net.yaml diff --git a/README.md b/README.md index e0bd3dd..b1bc565 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -meta-rte -======== +# meta-rte # Meta-RTE Yocto BSP documentation @@ -28,18 +27,18 @@ inside container, via the [kas-container] script. * [kas-container] installation: -``` +```sh wget -O ~/bin/kas-container https://raw.githubusercontent.com/siemens/kas/master/kas-container chmod +x ~/bin/kas-container ``` ## Build -``` +```sh mkdir rte-sdk cd rte-sdk git clone https://github.com/3mdeb/meta-rte.git -kas-container build meta-rte/kas.yml +KAS_IMAGE_VERSION="4.2" kas-container build meta-rte/kas.yml ``` ## Flash @@ -51,19 +50,19 @@ There are two main ways to flash an image, etcher and bmaptool. The easiest way to flash image on all system platforms is to use `etcher`. It is multi-platform application that is available for Linux, Windows or macOS. -- Download and install [etcher](https://etcher.io/). +* Download and install [etcher](https://etcher.io/). -- Insert the SD card to the SD card reader of your host PC. +* Insert the SD card to the SD card reader of your host PC. -- Run etcher. +* Run etcher. -- Click on `Select Image` and select built image. There is no need to unpack +* Click on `Select Image` and select built image. There is no need to unpack the image first. The SD card reader should be picked automatically. If more than one readers are present, click on `Change` and select the one you want to use. -- When confirmed, click on the `Flash` button to start flashing procedure. +* When confirmed, click on the `Flash` button to start flashing procedure. ### bmaptool @@ -72,12 +71,14 @@ depending on the package manager your system uses, use one of the following commands: **for Ubuntu:** -``` + +```sh sudo apt install bmap-tools ``` **for Fedora:** -``` + +```sh sudo dnf install bmap-tools ``` @@ -85,10 +86,10 @@ you can then download the latest image from the [releases](https://github.com/3mdeb/meta-rte/releases) page. You should download both the `.wic.bmap` and `.wic.gz` files. -Once you have chosen the version you want and downloaded it (both files), you can then -flash it using bmaptool, like this: +Once you have chosen the version you want and downloaded it (both files), you +can then flash it using bmaptool, like this: -``` +```sh bmaptool copy --bmap /path/to/example.wic.bmap /path/to/example.wic.gz /dev/sdX ``` @@ -99,7 +100,7 @@ what your SD card is called. ## Login to the system -``` +```sh Login: root Password: meta-rte ``` @@ -110,28 +111,31 @@ To perform update on platform we will use [SWUpdate](https://sbabic.github.io/swupdate/index.html) software already installed on OS. -- Download latest available .swu update image from [releases +* Download latest available .swu update image from [releases page](https://github.com/3mdeb/meta-rte/releases). -- Provide anyhow downloaded .swu update image to device, for example using scp +* Provide anyhow downloaded .swu update image to device, for example using scp + ```shell $ scp path/to/swu/file.swu root@RTE_IP:/path/to/deploy/file/ ``` >Note: you can check RTE_IP by running `ip a` command on RTE. -- Check active partition, run `findmnt /` command on RTE +* Check active partition, run `findmnt /` command on RTE + ```shell # findmnt / TARGET SOURCE FSTYPE OPTIONS / /dev/mmcblk0p2 ext4 rw,relatime ``` -- Now run `swupdate` command, for flag `-e` we need to provide an inactive +* Now run `swupdate` command, for flag `-e` we need to provide an inactive partition which in this case is `mmcblk0p3`. If `findmnt /` command would return `mmcblk0p3` then `mmcblk0p2` should be provided for `-e`. Flag `-i` is used to provide update image stored locally and `-v` will cause to print debug logs. + ```shell # swupdate -e "rte,mmcblk0p3" -i /path/to/file.swu -v Swupdate v2020.04.0 @@ -144,8 +148,9 @@ installed on OS. [DEBUG] : SWUPDATE running : [postupdate] : Running Post-update command ``` -- After success reboot the board. Platform should start from diferrent partition +* After success reboot the board. Platform should start from different partition and updated system. This can be verified by running `cat /etc/os-release`. + ```shell # cat /etc/os-release ID=rte @@ -155,7 +160,7 @@ installed on OS. PRETTY_NAME="RTE (Remote Test Environment Distro) 0.7.4-rc1 (rocko)" ``` -- From now, updated partition will be set as active, so every next reboot will +* From now, updated partition will be set as active, so every next reboot will cause to boot updated OS. ## OpenVPN @@ -169,13 +174,13 @@ SD card with the name `rte.conf`. You can access the DUT's serial connection from the RS232/UART port at `/dev/ttyS1`, for example, through Minicom: -``` +```sh # minicom -D /dev/ttyS1 ``` All possible devices can be listed using following command: -``` +```sh # ls /dev/tty* ``` @@ -185,14 +190,14 @@ It is also possible to use telnet communication via RTE. On RTE there is serial to network proxy service called `ser2net`. Its status can be seen by running a command: -``` +```sh # systemctl -all | grep ser2net ser2net.service loaded active running ``` Service configuration is placed here: -``` +```sh # cat /etc/ser2net.conf 13542:telnet:16000:/dev/ttyS1:115200 8DATABITS NONE 1STOPBIT 13541:telnet:16000:/dev/ttyUSB0:115200 8DATABITS NONE 1STOPBIT @@ -203,13 +208,13 @@ indicates the path to the device with which the connection is made. Serial connection with the device can be established by command: -``` +```sh $ telnet ``` for example: -``` +```sh $ telnet 192.168.4.170 13541 ``` diff --git a/conf/distro/rte.conf b/conf/distro/rte.conf index 378bf83..3232048 100644 --- a/conf/distro/rte.conf +++ b/conf/distro/rte.conf @@ -1,7 +1,7 @@ DISTRO = "rte" DISTRO_NAME = "RTE (Remote Test Environment Distro)" -DISTRO_VERSION = "0.7.5" -DISTRO_CODENAME = "dunfell" +DISTRO_VERSION = "0.8" +DISTRO_CODENAME = "scarthgap" SDK_VENDOR = "-rtesdk" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" @@ -15,14 +15,14 @@ DISTRO_VERSION[vardepsexclude] = "DATE" SDK_VERSION[vardepsexclude] = "DATE" # Override these in poky based distros -RTE_DEFAULT_DISTRO_FEATURES = "largefile systemd" +RTE_DEFAULT_DISTRO_FEATURES = "largefile systemd usrmerge" RTE_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" RTE_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-modules kernel-devicetree" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${RTE_DEFAULT_DISTRO_FEATURES}" -# explicitely use systemd and disable sysvinit completely +# explicitly use systemd and disable sysvinit completely VIRTUAL-RUNTIME_init_manager = "systemd" VIRTUAL-RUNTIME_initscripts = "" VIRTUAL-RUNTIME_syslog = "" @@ -31,12 +31,10 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit pulseaudio" #################################### ### orange-pi-zero custom config ### #################################### -IMAGE_FSTYPES_orange-pi-zero = "wic.gz wic.bmap" -WIC_CREATE_EXTRA_ARGS = "--no-fstab-update" -KERNEL_IMAGETYPE_orange-pi-zero = "zImage" -IMAGE_BOOT_FILES_orange-pi-zero = " ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE} boot.scr" +PERSISTENT_DATA_DIR = "/data" +IMAGE_FSTYPES:orange-pi-zero = "wic.gz wic.bmap" WKS_FILES = "sunxi-mmc-spl.wks" -WKS_FILE_DEPENDS_append = " u-boot" +WKS_FILE_DEPENDS:append = " u-boot e2fsprogs-native" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" @@ -45,7 +43,7 @@ DISTRO_EXTRA_RDEPENDS += " ${RTE_DEFAULT_EXTRA_RDEPENDS}" DISTRO_EXTRA_RRECOMMENDS += " ${RTE_DEFAULT_EXTRA_RRECOMMENDS}" POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPL-3.0", "", "packagegroup-core-device-devel",d)}" -DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" +DISTRO_EXTRA_RDEPENDS:append:qemuarm = " ${POKYQEMUDEPS}" # Add some rootfs extra space to store apu binaries for example (100MB) IMAGE_ROOTFS_EXTRA_SPACE = "102400" @@ -54,7 +52,7 @@ TCLIBCAPPEND = "" WIC_CREATE_EXTRA_ARGS = "\ --rootfs-dir rootfs-main=${IMAGE_ROOTFS} \ - --rootfs-dir rootfs-data=${IMAGE_ROOTFS}/data \ + --rootfs-dir rootfs-data=${IMAGE_ROOTFS}${PERSISTENT_DATA_DIR} \ " QEMU_TARGETS ?= "arm" @@ -74,7 +72,7 @@ ftp://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ http://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ https://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" -# The CONNECTIVITY_CHECK_URI's are used to test whether we can succesfully +# The CONNECTIVITY_CHECK_URI's are used to test whether we can successfully # fetch from the network (and warn you if not). To disable the test set # the variable to be empty. # Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master @@ -101,8 +99,8 @@ INHERIT += "poky-sanity" WARN_TO_ERROR_QA = "already-stripped compile-host-path install-host-path \ installed-vs-shipped ldflags pn-overrides rpaths staticdev \ useless-rpaths" -WARN_QA_remove = "${WARN_TO_ERROR_QA}" -ERROR_QA_append = " ${WARN_TO_ERROR_QA}" +WARN_QA:remove = "${WARN_TO_ERROR_QA}" +ERROR_QA:append = " ${WARN_TO_ERROR_QA}" require conf/distro/include/poky-world-exclude.inc require conf/distro/include/no-static-libs.inc @@ -110,4 +108,4 @@ require conf/distro/include/yocto-uninative.inc INHERIT += "uninative" # U-boot -PREFERRED_VERSION_u-boot = "2020.04" +PREFERRED_VERSION_u-boot = "2024.01" diff --git a/conf/layer.conf b/conf/layer.conf index 79972e5..4febb2e 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -14,4 +14,4 @@ LAYERVERSION_rte = "1" LAYERDEPENDS_rte = "core" -LAYERSERIES_COMPAT_rte = "dunfell master" +LAYERSERIES_COMPAT_rte = "scarthgap master" diff --git a/docs/development.md b/docs/development.md index 48286e8..3e6e23a 100644 --- a/docs/development.md +++ b/docs/development.md @@ -1,5 +1,4 @@ -RTE Yocto - Development process description ------------------------- +# RTE Yocto - Development process description ## Intro @@ -15,7 +14,7 @@ repository. Tags in this repository correspond to the releases of the whole `RTE Yocto BSP`. The content (meta layers and their revisions) of given `RTE Yocto BSP` release is defined by the [kas file](https://gitlab.com/3mdeb/rte/meta-rte/blob/master/kas.yml). -Desciption of kas file add project configuration can be found +Description of kas file add project configuration can be found [here](https://kas.readthedocs.io/en/0.19.0/userguide.html#project-configuration). ## Prerequisites @@ -31,8 +30,8 @@ Minimal recommended hardware is: ### Software requirements -* Linux distribution with [Docker](https://docs.docker.com/install/) installed -* [kas](https://github.com/siemens/kas) installed. The preferred way is to use +- Linux distribution with [Docker](https://docs.docker.com/install/) installed +- [kas](https://github.com/siemens/kas) installed. The preferred way is to use it inside container, via the [kas-docker script](https://github.com/siemens/kas/blob/master/kas-docker). Check [meta-rte prerequisites](https://gitlab.com/3mdeb/rte/meta-rte#prerequisites) @@ -45,7 +44,7 @@ in `meta-rte` repository. ### Building images -``` +```sh mkdir rte-sdk cd rte-sdk git clone git@gitlab.com:3mdeb/rte/meta-rte.git @@ -56,7 +55,7 @@ It will clone layers defined in `kas file`, set up everything and build recipes defined in `target` section in kas file. After the `RTE Yocto BSP` has been set up, the `rte-sdk` content can look like: -``` +```sh rte-sdk ├── build ├── meta-openembedded @@ -77,10 +76,9 @@ built images) can be found in `build/tmp/deploy/images/orange-pi-zero`. is a set of metadata to build given component. A recipe can build be used to build a small package, Linux kernel, or even the whole image. - Alternatively, you can invoke usual bitbake steps manually, e.g.: -``` +```sh SHELL=bash kas-docker --ssh-dir ~/.ssh/ssh-keys shell meta-rte/kas.yml -c 'bitbake core-image-minimal-swu' ``` @@ -92,4 +90,4 @@ shown above. Once you are familiar with the `RTE Yocto - Development process description`, you can continue with the: -* [release process](release.md) +- [release process](release.md) diff --git a/docs/layer-description.md b/docs/layer-description.md index b1a9e1b..1836487 100644 --- a/docs/layer-description.md +++ b/docs/layer-description.md @@ -4,7 +4,7 @@ [3mdeb's RTE](https://shop.3mdeb.com/product/rte/). The structure of the meta-rte layer looks like below: -``` +```sh meta-rte ├── CHANGELOG.md ├── conf @@ -55,31 +55,36 @@ introduced there. ## conf -A [conf driectory](https://gitlab.com/3mdeb/rte/meta-rte/blob/master/conf) +A [conf directory](https://gitlab.com/3mdeb/rte/meta-rte/blob/master/conf) contains distro configuration file `rte.conf` and layer configuration file `layer.conf`. ## recipes-bsp ### u-boot + [U-Boot bbappend file](https://gitlab.com/3mdeb/rte/meta-rte/blob/master/recipes-bsp/u-boot/u-boot_%25.bbappend) is used to apply custom patches and two important files: * [fw_env.config](https://gitlab.com/3mdeb/rte/meta-rte/blob/master/recipes-bsp/u-boot/u-boot/orange-pi-zero/fw_env.config), which contains the environment location on the `MMC` block device + * [boot.cmd](https://gitlab.com/3mdeb/rte/meta-rte/blob/master/recipes-bsp/u-boot/u-boot/orange-pi-zero/boot.cmd) - U-Boot boot script to load the Linux kernel and device tree from proper partition and pass the bootargs to the Linux kernel. ## recipes-connectivity + ### ser2net + Recipe installing custom configuration file with specific uart devices and -service for ser2net deamon. +service for ser2net daemon. ## recipes-core ### base-files + System hostname and [/etc/fstab](https://gitlab.com/3mdeb/rte/meta-rte/blob/master/recipes-core/base-files/base-files/fstab) file are configured there - partition for `/boot/bootpart` and `/storage` are mounted here. @@ -105,9 +110,10 @@ Place for definition of udev rules. For now `debug_uart_converter`, `rs_485_converter`, `can_converter` are defined. ## recipes-coreboot + ### coreboot-utils -Coreboot utils installation: `cbfstool`, `ifdtool` +coreboot utils installation: `cbfstool`, `ifdtool` ## recipes-devtools @@ -116,6 +122,7 @@ Coreboot utils installation: `cbfstool`, `ifdtool` * stlink ## recipes-extended + ### images Recipes for the `SWU` images, which allow to upgrade the system using the @@ -153,21 +160,22 @@ Recipes for `RTE REST API` server ### gorilla-mux -Recipes for `gorilla-mux ` - powerful URL router and dispatcher for golang. - +Recipes for `gorilla-mux` - powerful URL router and dispatcher for golang. ## recipes-kernel + ### linux Provides the recipe for the linux-yocto-mainline, patches and custom defconfig. ## recipes-support + ### swupdate We use SWUpdate as the utility to upgrade our system. The directory contains build configuration and some patches: -``` +```sh swupdate ├── files │   ├── defconfig diff --git a/docs/release.md b/docs/release.md index a674914..0d616a9 100644 --- a/docs/release.md +++ b/docs/release.md @@ -49,7 +49,7 @@ the [pre-release semver versioning scheme](https://semver.org/#spec-item-9). Generally, in `RTE` software project we shall use the following scheme for `release candidates`: -``` +```sh MAJOR.MINOR.PATCH-rc.RC_ID ``` diff --git a/docs/rte-mac-setup.md b/docs/rte-mac-setup.md index a540e64..f88fbd8 100644 --- a/docs/rte-mac-setup.md +++ b/docs/rte-mac-setup.md @@ -1,32 +1,40 @@ -# Setup MAC adress at U-Boot +# Setup MAC address at U-Boot After flashing the card with the new image, the `MAC` will be generated from the board's `Serial ID` and stored in `U-Boot`'s environment variable on the first boot. -If no `Serial ID` is found in U-Boot environment, tha `MAC` will be regenerated. +If no `Serial ID` is found in U-Boot environment, the `MAC` will be regenerated. If `Serial ID` change (e.g. by booting the SD card on another device), the `MAC` will be regenerated again. -If `Serial ID` is the same, only unset `MAC` addresses will be generated. +If `Serial ID` is the same, only unset `MAC` addresses will be generated. You can change the address by modifying the variable from `U-Boot` command line. Execute the following instructions: 1. Stop loading the `U-Boot` by hitting any key: - ``` + + ```sh Hit any key to stop autoboot: 0 ``` + 2. Overwrite the variable `ethaddres`: - ``` + + ```sh => setenv ethaddr 9a:08:5d:c7:cb:ce ``` + 3. Save changes: - ``` + + ```sh => saveenv ``` + 4. Restart the platform: - ``` + + ```sh => run bootcmd ``` + > Note: If `Serial ID` change, you will lost your custom `MAC`. diff --git a/generate-changelog.sh b/generate-changelog.sh index dc2b75b..acaf690 100755 --- a/generate-changelog.sh +++ b/generate-changelog.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -it -v $(pwd):$(pwd) -w $(pwd) macpijan/auto-changelog \ +docker run -it -v "$(pwd):$(pwd)" -w "$(pwd)" macpijan/auto-changelog \ --template keepachangelog --output CHANGELOG.md --unreleased --commit-limit=0 diff --git a/kas.yml b/kas.yml index ab65aeb..61770bf 100644 --- a/kas.yml +++ b/kas.yml @@ -1,3 +1,4 @@ +--- header: version: 2 @@ -12,7 +13,7 @@ repos: poky: url: https://git.yoctoproject.org/git/poky - refspec: 40e448301edf142dc00a0ae6190017adac1e57b2 + refspec: f7def85be9f99dcb4ba488bead201f670304379b layers: meta: meta-poky: @@ -24,11 +25,18 @@ repos: meta-sunxi: url: https://github.com/linux-sunxi/meta-sunxi - refspec: 37bfb7c8cdfb648b266c2edb7255297ec2043fe7 + refspec: 8f5b915749709f21c2af543fdcde0898aff60154 + + meta-arm: + url: https://git.yoctoproject.org/git/meta-arm + refspec: 58268ddccbe2780de28513273e15193ee949987b + layers: + meta-arm: + meta-arm-toolchain: meta-openembedded: url: http://git.openembedded.org/meta-openembedded - refspec: 2a5c534d2b9f01e9c0f39701fccd7fc874945b1c + refspec: 78a14731cf0cf38a19ff8bd0e9255b319afaf3a7 layers: meta-oe: meta-python: @@ -36,7 +44,7 @@ repos: meta-swupdate: url: https://github.com/sbabic/meta-swupdate - refspec: 4c82d83feacb1ad24f8e15ded5ed1a651708dd98 + refspec: a924d4bfd9dd54638ac8348d3f2845339f789770 bblayers_conf_header: standard: | @@ -48,7 +56,7 @@ local_conf_header: CONF_VERSION = "1" PACKAGE_CLASSES = "package_rpm" SDKMACHINE = "x86_64" - USER_CLASSES = "buildstats image-mklibs image-prelink" + USER_CLASSES = "buildstats" PATCHRESOLVE = "noop" debug-tweaks: | EXTRA_IMAGE_FEATURES = "debug-tweaks" @@ -58,7 +66,7 @@ local_conf_header: STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" diff --git a/patches/0001-do-not-remove-wic-partitions.patch b/patches/0001-do-not-remove-wic-partitions.patch index 1589c40..64329df 100644 --- a/patches/0001-do-not-remove-wic-partitions.patch +++ b/patches/0001-do-not-remove-wic-partitions.patch @@ -1,35 +1,30 @@ -commit 4143b38e05ed7e28c1007c6181035c6f342597ad -Author: kas -Date: Tue Sep 8 08:55:55 2020 +0000 - - msg - -diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass -index b83308b45cb5..b8d3ad55586f 100644 ---- a/meta/classes/image_types_wic.bbclass -+++ b/meta/classes/image_types_wic.bbclass -@@ -34,7 +34,15 @@ IMAGE_CMD_wic () { - fi - - BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$build_wic/" ${WIC_CREATE_EXTRA_ARGS} -- mv "$build_wic/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" +diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass +index cf3be909b30c..b7fcfc62605d 100644 +--- a/meta/classes-recipe/image_types_wic.bbclass ++++ b/meta/classes-recipe/image_types_wic.bbclass +@@ -88,7 +88,16 @@ IMAGE_CMD:wic () { + esac + shift + done +- mv "$build_wic/$(basename "${wks%.wks}")"*.${IMAGER} "$out.wic" ++ cp "$build_wic/$(basename "${wks%.wks}")"*.${IMAGER} "$out.wic" + wks_basename="$(basename "${wks%.wks}")" -+ mv "$build_wic/$wks_basename"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" ++ cp "$build_wic/$wks_basename"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" + for partition in "$build_wic/$wks_basename"*.direct.p2; do + partition_basename="$(basename "$partition")" + ext="${partition_basename##*.}" + gzip -f -9 -k "$partition" + partition_image_basename="${IMAGE_BASENAME}-${MACHINE}".direct."$ext" -+ mv "$partition".gz "${DEPLOY_DIR_IMAGE}/$partition_image_basename".gz ++ cp "$partition".gz "${DEPLOY_DIR_IMAGE}/$partition_image_basename".gz + done } - IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR" + IMAGE_CMD:wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR" do_image_wic[cleandirs] = "${WORKDIR}/build-wic" diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py -index 2d06c242b6fe..7eb0d8dc2a6b 100644 +index a1d152659b62..fbbea1299fc8 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py -@@ -261,8 +261,7 @@ class DirectPlugin(ImagerPlugin): +@@ -270,8 +270,7 @@ class DirectPlugin(ImagerPlugin): return "/dev/%s%s%-d" % (part.disk, suffix, part.realnum) def cleanup(self): @@ -39,4 +34,3 @@ index 2d06c242b6fe..7eb0d8dc2a6b 100644 # Move results to the output dir if not os.path.exists(self.outdir): - diff --git a/recipes-bsp/flashrom/flashrom_1.3.0.bb b/recipes-bsp/flashrom/flashrom_1.3.0.bb deleted file mode 100644 index f0b35aa..0000000 --- a/recipes-bsp/flashrom/flashrom_1.3.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" -LICENSE = "GPLv2" -HOMEPAGE = "http://flashrom.org" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "pciutils libusb libusb-compat" - -SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2" -SRC_URI[md5sum] = "dd2727f8fa05a4517689ca4f9d87e600" -SRC_URI[sha256sum] = "a053234453ccd012e79f3443bdcc61625cf97b7fd7cb4cdd8bfbffbe8b149623" - -S = "${WORKDIR}/flashrom-v${PV}" - -inherit pkgconfig - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install -} diff --git a/recipes-bsp/flashrom/flashrom_1.4.0.bb b/recipes-bsp/flashrom/flashrom_1.4.0.bb new file mode 100644 index 0000000..358e365 --- /dev/null +++ b/recipes-bsp/flashrom/flashrom_1.4.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" +HOMEPAGE = "http://flashrom.org" +LICENSE = "GPL-2.0-or-later" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "pciutils libusb libusb-compat" + +SRC_URI = "https://download.flashrom.org/releases/flashrom-${PV}.tar.xz" +SRC_URI[sha256sum] = "ad7ee1b49239c6fb4f8f55e36706fcd731435db1a4bd2fab3d80f1f72508ccee" + +S = "${WORKDIR}/flashrom-${PV}" + +inherit pkgconfig meson bash-completion diff --git a/recipes-bsp/u-boot/u-boot/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch b/recipes-bsp/u-boot/u-boot/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch deleted file mode 100644 index 996b781..0000000 --- a/recipes-bsp/u-boot/u-boot/0001-nanopi_neo_air_defconfig-Enable-eMMC-support.patch +++ /dev/null @@ -1,22 +0,0 @@ -From d77bd74afc14f14cdc2c037e8725d76b42f7e19f Mon Sep 17 00:00:00 2001 -From: Cezary Sobczak -Date: Thu, 14 Jan 2021 10:12:35 +0100 -Subject: [PATCH] nanopi_neo_air_defconfig-Enable-eMMC-support - -Signed-off-by: Cezary Sobczak ---- - configs/nanopi_neo_air_defconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configs/nanopi_neo_air_defconfig b/configs/nanopi_neo_air_defconfig -index 5f79191af0f9..b162eba9f992 100644 ---- a/configs/nanopi_neo_air_defconfig -+++ b/configs/nanopi_neo_air_defconfig -@@ -9,3 +9,4 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-neo-air" - CONFIG_CONSOLE_MUX=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_OHCI_HCD=y -+CONFIG_MMC_SUNXI_SLOT_EXTRA=2 --- -2.17.1 - diff --git a/recipes-bsp/u-boot/u-boot/0002-orangepi_zero_defconfig-lower-DRAM_CLK-to-408.patch b/recipes-bsp/u-boot/u-boot/0001-orangepi_zero_defconfig-lower-DRAM_CLK-to-408.patch similarity index 71% rename from recipes-bsp/u-boot/u-boot/0002-orangepi_zero_defconfig-lower-DRAM_CLK-to-408.patch rename to recipes-bsp/u-boot/u-boot/0001-orangepi_zero_defconfig-lower-DRAM_CLK-to-408.patch index f3fab05..2ad62d2 100644 --- a/recipes-bsp/u-boot/u-boot/0002-orangepi_zero_defconfig-lower-DRAM_CLK-to-408.patch +++ b/recipes-bsp/u-boot/u-boot/0001-orangepi_zero_defconfig-lower-DRAM_CLK-to-408.patch @@ -1,26 +1,25 @@ -From fcb1a1b6be155873ca84b4be66eeb6e98fea038d Mon Sep 17 00:00:00 2001 +From 4d57fe8c8cac9e9919f407ee23613289d3807982 Mon Sep 17 00:00:00 2001 From: Cezary Sobczak Date: Thu, 14 Jan 2021 10:24:55 +0100 Subject: [PATCH 1/2] orangepi_zero_defconfig-lower-DRAM_CLK-to-408 +Upstream-Status: Pending Signed-off-by: Cezary Sobczak +Signed-off-by: Tymoteusz Burak --- configs/orangepi_zero_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig -index 998c95d151a5..f2f50a882f61 100644 +index f7f3bfbcc4..03463ee7b1 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig -@@ -2,7 +2,7 @@ CONFIG_ARM=y - CONFIG_ARCH_SUNXI=y +@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y + CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-zero" CONFIG_SPL=y CONFIG_MACH_SUN8I_H3=y -CONFIG_DRAM_CLK=624 +CONFIG_DRAM_CLK=408 # CONFIG_VIDEO_DE2 is not set CONFIG_SPL_SPI_SUNXI=y - CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-zero" --- -2.17.1 - + # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set diff --git a/recipes-bsp/u-boot/u-boot/0003-orangepi_zero_defconfig-configure-CLK_FREQ.patch b/recipes-bsp/u-boot/u-boot/0002-orangepi_zero_defconfig-configure-CLK_FREQ.patch similarity index 68% rename from recipes-bsp/u-boot/u-boot/0003-orangepi_zero_defconfig-configure-CLK_FREQ.patch rename to recipes-bsp/u-boot/u-boot/0002-orangepi_zero_defconfig-configure-CLK_FREQ.patch index 6fbd671..3ea0906 100644 --- a/recipes-bsp/u-boot/u-boot/0003-orangepi_zero_defconfig-configure-CLK_FREQ.patch +++ b/recipes-bsp/u-boot/u-boot/0002-orangepi_zero_defconfig-configure-CLK_FREQ.patch @@ -1,22 +1,21 @@ -From 70183d131207d4b25533ecb0366c5d5be3d9b840 Mon Sep 17 00:00:00 2001 +From 9e0a29df289242fd8f712a952264b9ade62f932d Mon Sep 17 00:00:00 2001 From: Cezary Sobczak Date: Thu, 14 Jan 2021 10:25:18 +0100 Subject: [PATCH 2/2] orangepi_zero_defconfig-configure-CLK_FREQ +Upstream-Status: Pending Signed-off-by: Cezary Sobczak +Signed-off-by: Tymoteusz Burak --- configs/orangepi_zero_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig -index f2f50a882f61..20969e763904 100644 +index 03463ee7b1..d1386efa31 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig -@@ -11,3 +11,4 @@ CONFIG_CONSOLE_MUX=y - CONFIG_SUN8I_EMAC=y +@@ -14,3 +14,4 @@ CONFIG_SUN8I_EMAC=y + CONFIG_SPI=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y +CONFIG_SYS_CLK_FREQ=480000000 --- -2.17.1 - diff --git a/recipes-bsp/u-boot/u-boot/0004-sun8i-disable-Vendor-Parameter-Protection.patch b/recipes-bsp/u-boot/u-boot/0003-sun8i-disable-Vendor-Parameter-Protection.patch similarity index 51% rename from recipes-bsp/u-boot/u-boot/0004-sun8i-disable-Vendor-Parameter-Protection.patch rename to recipes-bsp/u-boot/u-boot/0003-sun8i-disable-Vendor-Parameter-Protection.patch index 174f527..01606e6 100644 --- a/recipes-bsp/u-boot/u-boot/0004-sun8i-disable-Vendor-Parameter-Protection.patch +++ b/recipes-bsp/u-boot/u-boot/0003-sun8i-disable-Vendor-Parameter-Protection.patch @@ -1,26 +1,27 @@ -From bb4c5769fd20f01be18e2426437564243743ca89 Mon Sep 17 00:00:00 2001 -From: Jakub Lecki -Date: Mon, 26 Jul 2021 10:12:28 +0200 +From 67fe3b8fddf9cf3e0d28e2cde77f590902cf0d7f Mon Sep 17 00:00:00 2001 +From: Tymoteusz Burak +Date: Tue, 2 Jul 2024 15:04:33 +0000 Subject: [PATCH] sun8i: disable Vendor Parameter Protection +Upstream-Status: Pending by setting CONFIG_ENV_OVERWRITE to 1 -Signed-off-by: Jakub Lecki +Signed-off-by: Tymoteusz Burak --- include/configs/sun8i.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h -index 9b4675e4c3..e0cabd7bb1 100644 +index b6cd8d39a8..b1beaf90a7 100644 --- a/include/configs/sun8i.h +++ b/include/configs/sun8i.h -@@ -12,6 +12,9 @@ - * A23 specific configuration - */ +@@ -8,6 +8,9 @@ + #ifndef __CONFIG_H + #define __CONFIG_H +/* Allow for manual overwriting environment variables like ethaddr */ +#define CONFIG_ENV_OVERWRITE 1 + - /* - * Include common sunxi configuration where most the settings are - */ + #include + + #endif /* __CONFIG_H */ diff --git a/recipes-bsp/u-boot/u-boot/orange-pi-zero/boot.cmd b/recipes-bsp/u-boot/u-boot/orange-pi-zero/boot.cmd index 8f9d564..24cfa6d 100644 --- a/recipes-bsp/u-boot/u-boot/orange-pi-zero/boot.cmd +++ b/recipes-bsp/u-boot/u-boot/orange-pi-zero/boot.cmd @@ -17,5 +17,5 @@ saveenv setenv bootargs console=${console} console=tty1 root=/dev/mmcblk0p${boot_part} rootwait panic=10 ${extra} ext4load mmc 0:${boot_part} ${fdt_addr_r} /boot/${fdtfile} -ext4load mmc 0:${boot_part} ${kernel_addr_r} /boot/zImage -bootz ${kernel_addr_r} - ${fdt_addr_r} || bootm ${kernel_addr_r} - ${fdt_addr_r} +ext4load mmc 0:${boot_part} ${kernel_addr_r} /boot/uImage +booti ${kernel_addr_r} - ${fdt_addr_r} || bootm ${kernel_addr_r} - ${fdt_addr_r} diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 7ecf62c..0ed37ae 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,13 +1,11 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # if fw_env.config file is provided, it will be installed into ${sysconfigdir} # - see u-boot.inc file -SRC_URI_append = " \ - file://0002-orangepi_zero_defconfig-lower-DRAM_CLK-to-408.patch \ - file://0003-orangepi_zero_defconfig-configure-CLK_FREQ.patch \ - file://0004-sun8i-disable-Vendor-Parameter-Protection.patch \ - file://0005-store-generated-mac-address-in-an-environment-variab.patch \ - file://0006-sunxi-regenerate-MAC-addresses-on-Serial-ID-change.patch \ +SRC_URI:append = " \ + file://0001-orangepi_zero_defconfig-lower-DRAM_CLK-to-408.patch \ + file://0002-orangepi_zero_defconfig-configure-CLK_FREQ.patch \ + file://0003-sun8i-disable-Vendor-Parameter-Protection.patch \ file://fw_env.config \ file://boot.cmd \ file://random-ethaddr.cfg \ diff --git a/recipes-bsp/u-boot/u-boot_2020.04.bb b/recipes-bsp/u-boot/u-boot_2020.04.bb deleted file mode 100644 index 1c4ba3e..0000000 --- a/recipes-bsp/u-boot/u-boot_2020.04.bb +++ /dev/null @@ -1,10 +0,0 @@ -require recipes-bsp/u-boot/u-boot-common.inc -require recipes-bsp/u-boot/u-boot.inc - -# Remove patch which is unnecessary for u-boot 2020.04 -# https://github.com/u-boot/u-boot/blob/v2020.04/scripts/dtc/dtc-lexer.l#L39 -SRC_URI_remove = " \ - file://remove-redundant-yyloc-global.patch \ -" - -SRCREV = "36fec02b1f90b92cf51ec531564f9284eae27ab4" diff --git a/recipes-connectivity/gensio/gensio_2.2.4.bb b/recipes-connectivity/gensio/gensio_2.8.7.bb similarity index 57% rename from recipes-connectivity/gensio/gensio_2.2.4.bb rename to recipes-connectivity/gensio/gensio_2.8.7.bb index a024428..53b5d0e 100644 --- a/recipes-connectivity/gensio/gensio_2.2.4.bb +++ b/recipes-connectivity/gensio/gensio_2.8.7.bb @@ -1,15 +1,15 @@ SUMMARY = "A library to abstract stream I/O like serial port, TCP, telnet, etc" HOMEPAGE = "https://github.com/cminyard/gensio" -LICENSE = "GPL-2.0 & LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ - file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ - " +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = " \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + " +SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" -SRCREV = "95cfb8f6d8985e2fb8ba51c4887dd70aa7551a03" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/gensio-${PV}.tar.gz" -SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=2.2.x" - -S = "${WORKDIR}/git" +SRC_URI[sha256sum] = "900f8f83b76ba16f8c7839911bce77354e41f296f9fa677d7945d44ee8358276" inherit autotools @@ -21,4 +21,4 @@ PACKAGECONFIG[swig] = "--with-swig,--without-swig, swig" EXTRA_OECONF = "--without-python" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" diff --git a/recipes-connectivity/ser2net/ser2net_4.3.3.bb b/recipes-connectivity/ser2net/ser2net_4.6.2.bb similarity index 67% rename from recipes-connectivity/ser2net/ser2net_4.3.3.bb rename to recipes-connectivity/ser2net/ser2net_4.6.2.bb index d6de7af..23fc482 100644 --- a/recipes-connectivity/ser2net/ser2net_4.3.3.bb +++ b/recipes-connectivity/ser2net/ser2net_4.6.2.bb @@ -1,35 +1,34 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SUMMARY = "A serial to network proxy" -SECTION = "console/network" HOMEPAGE = "http://sourceforge.net/projects/ser2net/" +SECTION = "console/network" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gensio libyaml" SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" -SRC_URI[sha256sum] = "f5be52033a690bd0dd711209a64ebaec024ee4542b1357350aad8489dc2bf720" +SRC_URI[sha256sum] = "63bafcd65bb9270a93b7d5cdde58ccf4d279603ff6d044ac4b484a257cda82ce" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" inherit autotools pkgconfig systemd -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += " \ +SRC_URI:append = " \ file://ser2net.yaml \ file://ser2net.service \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${sysconfdir}/ser2net.yaml \ ${systemd_unitdir}/system/ser2net.service \ " +BBCLASSEXTEND = "native nativesdk" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir} install -m 0644 ${WORKDIR}/ser2net.yaml ${D}${sysconfdir} @@ -39,6 +38,6 @@ do_install_append() { SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "ser2net.service" +SYSTEMD_SERVICE:${PN} = "ser2net.service" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" diff --git a/recipes-core/base-files/base-files_%.bbappend b/recipes-core/base-files/base-files_%.bbappend index 7d29388..1078056 100644 --- a/recipes-core/base-files/base-files_%.bbappend +++ b/recipes-core/base-files/base-files_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" hostname = "rte" diff --git a/recipes-core/images/core-image-minimal.bbappend b/recipes-core/images/core-image-minimal.bbappend index e69c228..db00220 100644 --- a/recipes-core/images/core-image-minimal.bbappend +++ b/recipes-core/images/core-image-minimal.bbappend @@ -1,16 +1,16 @@ -IMAGE_FEATURES_append = " ssh-server-openssh" +IMAGE_FEATURES:append = " ssh-server-openssh" -IMAGE_INSTALL_append = " \ - packagegroup-rte-core \ - packagegroup-rte-utils \ - packagegroup-rte-imx \ - packagegroup-rte-stm \ - packagegroup-rte-coreboot \ - locale-base-en-us \ - " +IMAGE_INSTALL:append = " \ + packagegroup-rte-core \ + packagegroup-rte-utils \ + packagegroup-rte-imx \ + packagegroup-rte-stm \ + packagegroup-rte-coreboot \ + locale-base-en-us \ + " -# set root password inherit extrausers -RTE_ROOT_PWD = "meta-rte" -EXTRA_USERS_PARAMS = "usermod -P ${RTE_ROOT_PWD} root;" +# Result of `printf "%q" $(mkpasswd -m sha256crypt meta-rte)` +RTE_ROOT_PWD = "\$5\$8XCtHnklsZSCLoAi\$4lHnmijhTjSPuuvddA9ktyVa5X4nAOXS9M4AWqOrnt1" +EXTRA_USERS_PARAMS = "usermod -p '${RTE_ROOT_PWD}' root" diff --git a/recipes-core/init-ifupdown/init-ifupdown_%.bbappend b/recipes-core/init-ifupdown/init-ifupdown_%.bbappend index dfb17fd..f0850f2 100644 --- a/recipes-core/init-ifupdown/init-ifupdown_%.bbappend +++ b/recipes-core/init-ifupdown/init-ifupdown_%.bbappend @@ -1,4 +1,4 @@ -do_install_append () { +do_install:append () { # remove 'interfaces' file. We are using systemd-networkd to bring up the network rm -f ${D}${sysconfdir}/network/interfaces diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend index 3595118..7858d9f 100644 --- a/recipes-core/systemd/systemd_%.bbappend +++ b/recipes-core/systemd/systemd_%.bbappend @@ -1,13 +1,13 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://50-dhcp.network \ file://locale.conf \ " -FILES_${PN} += "/etc/*" +FILES:${PN} += "/etc/*" -do_install_append() { +do_install:append() { install -d ${D}${systemd_unitdir}/network install -m 0644 ${WORKDIR}/50-dhcp.network ${D}${systemd_unitdir}/network diff --git a/recipes-core/udev-rules-rte/udev-rules-rte.bb b/recipes-core/udev-rules-rte/udev-rules-rte.bb index 92011d7..ea8aece 100644 --- a/recipes-core/udev-rules-rte/udev-rules-rte.bb +++ b/recipes-core/udev-rules-rte/udev-rules-rte.bb @@ -1,4 +1,6 @@ -DESCRIPTION = "udev rules for RTE board" +# nooelint: oelint.file.underscores +SUMMARY = "udev rules for the RTE board" +HOMEPAGE = "https://3mdeb.com/open-source-hardware/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" diff --git a/recipes-coreboot/coreboot-utils/coreboot-utils_git.bb b/recipes-coreboot/coreboot-utils/coreboot-utils_git.bb index bc81dc9..dab13dd 100644 --- a/recipes-coreboot/coreboot-utils/coreboot-utils_git.bb +++ b/recipes-coreboot/coreboot-utils/coreboot-utils_git.bb @@ -1,30 +1,28 @@ -DESCRIPTION = "coreboot tools" -SECTION = "coreboot" +SUMMARY = "coreboot tools" HOMEPAGE = "https://github.com/coreboot/coreboot/README.md" +SECTION = "coreboot" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +# checkout 4.8.1 tag +PV = "0.1+${SRCREV}" SRC_URI = " \ gitsm://github.com/coreboot/coreboot.git;protocol=https;branch=4.8_branch \ file://0001-utils-do-not-override-compiler-variables.patch \ " - -# checkout 4.8.1 tag SRCREV = "6794ce02d45273427c1c6675950c8468380c040a" -PV = "0.1+${SRCREV}" - # this indicates the folder to run do_compile from. -S="${WORKDIR}/git" +S = "${WORKDIR}/git" PACKAGES =+ "cbfstool ifdtool" -FILES_cbfstool = "${bindir}/cbfstool" -FILES_ifdtool = "${bindir}/ifdtool" +FILES:cbfstool += "${bindir}/cbfstool" +FILES:ifdtool += "${bindir}/ifdtool" -INSANE_SKIP_cbfstool = "ldflags" -INSANE_SKIP_ifdtool = "ldflags" +INSANE_SKIP:cbfstool = "ldflags" +INSANE_SKIP:ifdtool = "ldflags" # this command will be run to compile your source code. it assumes you are in the # directory indicated by S. i'm just going to use make and rely on my Makefile @@ -32,7 +30,7 @@ do_compile () { oe_runmake -C util/cbfstool oe_runmake -C util/ifdtool } - + # this will copy the compiled file and place it in ${bindir}, which is /usr/bin do_install () { install -d ${D}${bindir} diff --git a/recipes-devtools/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch b/recipes-devtools/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch new file mode 100644 index 0000000..fbc0f5a --- /dev/null +++ b/recipes-devtools/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch @@ -0,0 +1,21 @@ +Author: Maciej Pijanowski +Date: Fri Jul 5 16:39:13 2024 +0200 +Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/86] + + Makefile: allow overriding CC + + Signed-off-by: Maciej Pijanowski + +diff --git a/Makefile b/Makefile +index 139e5c0c3c3c..226303a6921e 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,7 +12,7 @@ endif + endif + + PROGRAM = dpcmd +-CC = gcc ++CC ?= gcc + PREFIX ?= /usr/local + + PKG_CONFIG ?= pkg-config diff --git a/recipes-devtools/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch b/recipes-devtools/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch new file mode 100644 index 0000000..0fc8ac5 --- /dev/null +++ b/recipes-devtools/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch @@ -0,0 +1,39 @@ +From dac9d0ea5c419049c9ab0a5ba90d15d77a3271b0 Mon Sep 17 00:00:00 2001 +From: Tymoteusz Burak +Date: Mon, 22 Jul 2024 13:02:59 +0000 +Subject: [PATCH] Makefile: add conditional stripping +Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/88] + +This patch introduces a `NOSTRIP` conditional flag to the `install` +target in the Makefile. The purpose of this flag is to allow the +disabling of binary stripping during installation. This is +particularly useful in development environments, such as BitBake, +which handle stripping internally. + +When `NOSTRIP` is set to `1`, the `strip` command will be skipped +during the installation process, preventing potential conflicts or +redundant operations. + +Signed-off-by: Tymoteusz Burak + +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index 139e5c0..8b33320 100644 +--- a/Makefile ++++ b/Makefile +@@ -58,7 +58,9 @@ install: $(PROGRAM) + [ $(shell id -u) -eq 0 ] || (echo "Error: install needs root privileges" && false) + install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/DediProg + echo -n "install: " && install -v -o 0 -g 0 -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) ++ifneq ($(NOSTRIP),1) + strip $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) ++endif + install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/share/DediProg + echo -n "install: " && install -v -o 0 -g 0 -m 0644 ChipInfoDb.dedicfg $(DESTDIR)$(PREFIX)/share/DediProg/ChipInfoDb.dedicfg + install -v -o 0 -g 0 -m 755 -d $(DESTDIR)/etc/udev/rules.d +-- +2.30.2 + diff --git a/recipes-devtools/dediprog-flasher/dediprog-flasher_1.14.20.bb b/recipes-devtools/dediprog-flasher/dediprog-flasher_1.14.20.bb new file mode 100644 index 0000000..5fc0800 --- /dev/null +++ b/recipes-devtools/dediprog-flasher/dediprog-flasher_1.14.20.bb @@ -0,0 +1,29 @@ +SUMMARY = "Linux software for Dediprog SF100 and SF600 SPI flash programmers" +HOMEPAGE = "https://github.com/DediProgSW/SF100Linux" +SECTION = "devel" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb" + +DEPENDS = "libusb" + +PV = "1.0+${SRCPV}" +SRC_URI = " \ + git://github.com/DediProgSW/SF100Linux.git;protocol=https;branch=master \ + file://0001-add-support-for-cross-compilation.patch \ + file://0002-Makefile-add-conditional-stripping.patch \ + " +SRCREV = "e691f2d432144e3dbc82e9e0eea1ebaed4f3becf" + +EXTRA_OEMAKE = "NOSTRIP=1" + +S = "${WORKDIR}/git" + +do_install () { + oe_runmake DESTDIR=${D} PREFIX=/usr install +} + +FILES:${PN} += " \ + ${datadir}/DediProg \ +" + +inherit pkgconfig diff --git a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb index 222a3ff..c85d840 100644 --- a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb +++ b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb @@ -1,14 +1,14 @@ -DESCRIPTION = "USB & UART loader for i.MX5/6/7/8 series" +SUMMARY = "USB & UART loader for i.MX5/6/7/8 series" +HOMEPAGE = "https://github.com/boundarydevices/imx_usb_loader" SECTION = "devel" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libusb" -SRCREV = "e5394615dd413c3823d5bd1de340933e16a8c07c" -SRC_URI = "git://github.com/boundarydevices/imx_usb_loader.git;protocol=https" - PV = "1.0+${SRCPV}" +SRC_URI = "git://github.com/boundarydevices/imx_usb_loader.git;protocol=https;branch=master" +SRCREV = "e5394615dd413c3823d5bd1de340933e16a8c07c" S = "${WORKDIR}/git" diff --git a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bbappend b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bbappend index 93d6df1..ab26e0a 100644 --- a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bbappend +++ b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://imx_usb.conf \ @@ -6,7 +6,7 @@ SRC_URI += " \ file://mx6_usb_sdp_spl.conf \ " -do_install_append() { +do_install:append() { #remove default config files rm ${D}${sysconfdir}/imx-loader.d/* install -m 0644 ${WORKDIR}/imx_usb.conf ${D}${sysconfdir}/imx-loader.d/ diff --git a/recipes-devtools/minicom/minicom/minirc.dfl b/recipes-devtools/minicom/minicom/minirc.dfl new file mode 100644 index 0000000..6cda866 --- /dev/null +++ b/recipes-devtools/minicom/minicom/minirc.dfl @@ -0,0 +1 @@ +pu rtscts No diff --git a/recipes-devtools/minicom/minicom_%.bbappend b/recipes-devtools/minicom/minicom_%.bbappend new file mode 100644 index 0000000..5aae33f --- /dev/null +++ b/recipes-devtools/minicom/minicom_%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI += "file://minirc.dfl" + +do_install:append() { + install -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/minirc.dfl ${D}${sysconfdir}/minirc.dfl +} diff --git a/recipes-devtools/openocd/openocd_git.bbappend b/recipes-devtools/openocd/openocd_git.bbappend index db98639..9377bee 100644 --- a/recipes-devtools/openocd/openocd_git.bbappend +++ b/recipes-devtools/openocd/openocd_git.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/openocd:" +FILESEXTRAPATHS:prepend := "${THISDIR}/openocd:" SRC_URI += " \ file://openocd.cfg \ file://orangepi.cfg \ " -do_install_append() { +do_install:append() { install -m 0644 ${WORKDIR}/openocd.cfg ${D}${datadir}/openocd/scripts/ install -m 0644 ${WORKDIR}/orangepi.cfg ${D}${datadir}/openocd/scripts/interface/ diff --git a/recipes-devtools/python/python3-asciinema_2.0.2.bb b/recipes-devtools/python/python3-asciinema_2.4.0.bb similarity index 85% rename from recipes-devtools/python/python3-asciinema_2.0.2.bb rename to recipes-devtools/python/python3-asciinema_2.4.0.bb index c1e8432..41cf360 100644 --- a/recipes-devtools/python/python3-asciinema_2.0.2.bb +++ b/recipes-devtools/python/python3-asciinema_2.4.0.bb @@ -4,13 +4,14 @@ HOMEPAGE = "https://asciinema.org" LICENSE = "GPLv3 & GPL-3.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "git://github.com/asciinema/asciinema.git;protocol=https;branch=master;tag=v2.0.2" +SRC_URI = "git://github.com/asciinema/asciinema.git;protocol=https;branch=master" +SRCREV = "1a71be26c4c29e7cd98b97a11233cf3fb724ba9b" S = "${WORKDIR}/git" inherit setuptools3 -RDEPENDS_${PN} += "python3-core python3-pkg-resources ncurses" +RDEPENDS:${PN} += "python3-core python3-pkg-resources ncurses" # WARNING: We were unable to map the following python package/module # dependencies to the bitbake packages which include them: diff --git a/recipes-devtools/python/python3-wakeonlan_1.2.0.bb b/recipes-devtools/python/python3-wakeonlan_1.2.0.bb index d68da1e..bcabecd 100644 --- a/recipes-devtools/python/python3-wakeonlan_1.2.0.bb +++ b/recipes-devtools/python/python3-wakeonlan_1.2.0.bb @@ -11,4 +11,4 @@ S = "${WORKDIR}/wakeonlan-${PV}" inherit setuptools3 -RDEPENDS_${PN} += "python3-core python3-io python3-pkg-resources" +RDEPENDS:${PN} += "python3-core python3-io python3-pkg-resources" diff --git a/recipes-devtools/sd-mux/sd-mux_git.bb b/recipes-devtools/sd-mux/sd-mux_git.bb index 0857979..f6fb069 100644 --- a/recipes-devtools/sd-mux/sd-mux_git.bb +++ b/recipes-devtools/sd-mux/sd-mux_git.bb @@ -1,20 +1,19 @@ SUMMARY = "Control software for sd-mux devices." -LICENSE = "Apachev2" +HOMEPAGE = "https://github.com/3mdeb/sd-mux" +LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = " \ file://LICENSE;md5=064ad0ceb0d2be1dd2e7fc4ba1b9de6f \ file://debian/copyright;md5=9e761451917adf0a2bc35d987cc88a9d \ " -SRC_URI = "git://git.tizen.org/tools/testlab/sd-mux" - -# Modify these as desired -PV = "0.0.2+git${SRCPV}" -SRCREV = "9dd189d973da64e033a0c5c2adb3d94b23153d94" - DEPENDS = " \ libftdi \ popt \ " +PV = "0.0.2+git${SRCPV}" +SRC_URI = "git://github.com/3mdeb/sd-mux.git;protocol=https;branch=master" +SRCREV = "9dd189d973da64e033a0c5c2adb3d94b23153d94" + S = "${WORKDIR}/git" inherit cmake pkgconfig diff --git a/recipes-devtools/stlink/stlink_%.bbappend b/recipes-devtools/stlink/stlink_%.bbappend index 79a84a8..135865a 100644 --- a/recipes-devtools/stlink/stlink_%.bbappend +++ b/recipes-devtools/stlink/stlink_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-CMakeLists.txt-patch-get-version.cmake-and-c-flags.c.patch" diff --git a/recipes-devtools/stlink/stlink_git.bb b/recipes-devtools/stlink/stlink_git.bb index f674ac1..5122f24 100644 --- a/recipes-devtools/stlink/stlink_git.bb +++ b/recipes-devtools/stlink/stlink_git.bb @@ -1,21 +1,17 @@ -DESCRIPTION = "stm32 discovery line linux programmer" +SUMMARY = "stm32 discovery line linux programmer" HOMEPAGE = "https://github.com/texane/stlink" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${S}/LICENSE.md;md5=3374725a40df7047d33d627811b8149e" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=3374725a40df7047d33d627811b8149e" -BRANCH = "master" -TAG = "v1.7.0" +DEPENDS = "libusb" SRC_URI = " \ - git://github.com/stlink-org/stlink.git;protocol=https;branch=${BRANCH};tag=${TAG} \ + git://github.com/stlink-org/stlink.git;protocol=https;branch=master \ " - -SRCPV = "${TAG}" +SRCREV = "179650df40295b0af3a148ddfb2c467a0334f54a" S = "${WORKDIR}/git" -DEPENDS = "libusb" - EXTRA_OECMAKE = " \ -DSTLINK_UDEV_RULES_DIR=${sysconfdir}/udev/rules.d \ -DSTLINK_MODPROBED_DIR=${sysconfdir}/modprobe.d \ diff --git a/recipes-extended/images/core-image-minimal-swu.bb b/recipes-extended/images/core-image-minimal-swu.bb index 420f328..dad5c7d 100644 --- a/recipes-extended/images/core-image-minimal-swu.bb +++ b/recipes-extended/images/core-image-minimal-swu.bb @@ -1,12 +1,13 @@ -DESCRIPTION = "Recipe generating SWU image for RTE" -SECTION = "" +# nooelint: oelint.file.underscores +SUMMARY = "Recipe generating SWU image for RTE" +HOMEPAGE = "https://github.com/sbabic/swupdate/tree/master" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" # Add all local files to be added to the SWU # sw-description must always be in the list. -# You can extend with scripts or wahtever you need +# You can extend with scripts or whatever you need SRC_URI = " \ file://sw-description \ " diff --git a/recipes-extended/packagegroups/packagegroup-rte.bb b/recipes-extended/packagegroups/packagegroup-rte.bb index 246dc25..c25be54 100644 --- a/recipes-extended/packagegroups/packagegroup-rte.bb +++ b/recipes-extended/packagegroups/packagegroup-rte.bb @@ -1,8 +1,12 @@ SUMMARY = "RTE support packagegroup" -DESCRIPTION = "Support packagegroups which allow to take advantage of the \ -Remote Testing Environment board features" +DESCRIPTION = " \ + Support packagegroups which allow to take advantage of the \ + Remote Testing Environment board features \ + " PR = "r1" +PACKAGE_ARCH = "${TUNE_PKGARCH}" + inherit packagegroup PACKAGES = " \ @@ -14,7 +18,7 @@ PACKAGES = " \ " # core system components -RDEPENDS_packagegroup-rte-core = " \ +RDEPENDS:packagegroup-rte-core = " \ kernel-modules \ bash \ curl \ @@ -32,12 +36,11 @@ RDEPENDS_packagegroup-rte-core = " \ swupdate \ u-boot \ openvpn \ - openvpn-rte \ xradio-firmware \ xradio \ " -RDEPENDS_packagegroup-rte-utils = " \ +RDEPENDS:packagegroup-rte-utils = " \ e2fsprogs-e2fsck \ e2fsprogs-mke2fs \ e2fsprogs-badblocks \ @@ -63,17 +66,20 @@ RDEPENDS_packagegroup-rte-utils = " \ less \ vim-tiny \ nfs-utils \ - bmap-tools \ + bmaptool \ bc \ python3 \ python3-modules \ python3-wakeonlan \ wpa-supplicant \ cpu \ + xcb-proto-dev \ + rte-persistent-data \ + rte-tests \ " # packages useful for i.MX platforms testing -RDEPENDS_packagegroup-rte-imx = " \ +RDEPENDS:packagegroup-rte-imx = " \ can-utils \ android-tools \ imx-usb-loader \ @@ -81,14 +87,15 @@ RDEPENDS_packagegroup-rte-imx = " \ " # packages useful for STM32 MCUs testing -RDEPENDS_packagegroup-rte-stm = " \ +RDEPENDS:packagegroup-rte-stm = " \ openocd \ stlink \ " # packages useful for testing coreboot on various platforms -RDEPENDS_packagegroup-rte-coreboot = " \ +RDEPENDS:packagegroup-rte-coreboot = " \ flashrom \ + dediprog-flasher \ ifdtool \ cbfstool \ " diff --git a/recipes-go/3mdeb-rtectrl/3mdeb-rtectrl/RteCtrl.cfg b/recipes-go/3mdeb-rtectrl/3mdeb-rtectrl/RteCtrl.cfg index da1364d..50148d6 100644 --- a/recipes-go/3mdeb-rtectrl/3mdeb-rtectrl/RteCtrl.cfg +++ b/recipes-go/3mdeb-rtectrl/3mdeb-rtectrl/RteCtrl.cfg @@ -21,112 +21,112 @@ "description" : "oc3", "direction" : "out", "init_value" : 0, - "sys_gpio" : 404 + "sys_gpio" : 516 }, { "id" : 2, "description" : "oc2", "direction" : "out", "init_value" : 0, - "sys_gpio" : 405 + "sys_gpio" : 517 }, { "id" : 3, "description" : "oc1", "direction" : "out", "init_value" : 0, - "sys_gpio" : 406 + "sys_gpio" : 518 }, { "id" : 4, "description" : "oc6", "direction" : "out", "init_value" : 0, - "sys_gpio" : 407 + "sys_gpio" : 519 }, { "id" : 5, "description" : "oc5", "direction" : "out", "init_value" : 0, - "sys_gpio" : 415 + "sys_gpio" : 527 }, { "id" : 6, "description" : "oc4", "direction" : "out", "init_value" : 0, - "sys_gpio" : 414 + "sys_gpio" : 526 }, { "id" : 7, "description" : "apu_wdt", "direction" : "out", "init_value" : 0, - "sys_gpio" : 408 + "sys_gpio" : 523 }, { "id" : 8, "description" : "apu_rst", "direction" : "out", "init_value" : 0, - "sys_gpio" : 409 + "sys_gpio" : 524 }, { "id" : 9, "description" : "apu_pwr", "direction" : "out", "init_value" : 0, - "sys_gpio" : 410 + "sys_gpio" : 522 }, { "id" : 10, "description" : "apu_modesw", "direction" : "out", "init_value" : 0, - "sys_gpio" : 411 + "sys_gpio" : 523 }, { "id" : 11, "description" : "apu_clr_cmos", "direction" : "out", "init_value" : 0, - "sys_gpio" : 412 + "sys_gpio" : 524 }, { "id" : 12, "description" : "apu_wp", "direction" : "out", "init_value" : 0, - "sys_gpio" : 413 + "sys_gpio" : 525 }, { "id" : 13, "description" : "ext0", "direction" : "in", "init_value" : 0, - "sys_gpio" : 400 + "sys_gpio" : 512 }, { "id" : 14, "description" : "ext1", "direction" : "in", "init_value" : 0, - "sys_gpio" : 401 + "sys_gpio" : 513 }, { "id" : 15, "description" : "ext2", "direction" : "in", "init_value" : 0, - "sys_gpio" : 402 + "sys_gpio" : 514 }, { "id" : 16, "description" : "ext3", "direction" : "in", "init_value" : 0, - "sys_gpio" : 403 + "sys_gpio" : 515 }, { "id" : 17, @@ -151,4 +151,3 @@ } ] } - diff --git a/recipes-go/3mdeb-rtectrl/3mdeb-rtectrl_git.bb b/recipes-go/3mdeb-rtectrl/3mdeb-rtectrl_git.bb index b427fe2..e25cdef 100644 --- a/recipes-go/3mdeb-rtectrl/3mdeb-rtectrl_git.bb +++ b/recipes-go/3mdeb-rtectrl/3mdeb-rtectrl_git.bb @@ -1,39 +1,39 @@ -DESCRIPTION = "RTE controller" -SECTION = "rte" +SUMMARY = "REST API controller for the RTE board" HOMEPAGE = "https://github.com/3mdeb/RteCtrl/blob/master/README.md" +SECTION = "rte" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${S}/src/${GO_IMPORT}/LICENSE;md5=50335162666472aa33383f35cce3e355" -TAG = "0.5.3-rc2" -PV = "${TAG}" -SRC_URI = "git://git@github.com/3mdeb/RteCtrl.git;protocol=https;branch=rest-server-rate-limit;tag=${TAG}" - DEPENDS += " \ github.com-gorilla-mux \ github.com-throttled-throttled \ github.com-hashicorp-golang-lru \ " -RDEPENDS_${PN} += " \ +PV = "0.5.3" +SRC_URI = "git://git@github.com/3mdeb/RteCtrl.git;protocol=https;branch=master" +SRCREV = "9910a7254dae317fdcc0afebf91e3985a0622005" + +FILES:${PN} += " \ + ${datadir}/RteWeb/* \ + ${bindir}/rte_ctrl \ + " + +RDEPENDS:${PN} += " \ bash \ " -RDEPENDS_${PN}-dev += " \ +RDEPENDS:${PN}-dev += " \ bash \ " GO_IMPORT = "3mdeb/RteCtrl" GO_INSTALL = "${GO_IMPORT}" -inherit go - -FILES_${PN} += " \ - ${datadir}/RteWeb/* \ - ${bindir}/rte_ctrl \ - " +inherit go-mod -do_install_append() { +do_install:append() { # webserver files install -d ${D}${datadir}/RteWeb install -m 0644 ${S}/src/${GO_IMPORT}/web/index.html ${D}${datadir}/RteWeb diff --git a/recipes-go/3mdeb-rtectrl/3mdeb-rtectrl_git.bbappend b/recipes-go/3mdeb-rtectrl/3mdeb-rtectrl_git.bbappend index eb681ff..440f132 100644 --- a/recipes-go/3mdeb-rtectrl/3mdeb-rtectrl_git.bbappend +++ b/recipes-go/3mdeb-rtectrl/3mdeb-rtectrl_git.bbappend @@ -1,16 +1,16 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += " \ +SRC_URI:append = " \ file://RteCtrl.cfg \ file://RteCtrl.service \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${sysconfdir}/RteCtrl.cfg \ ${systemd_unitdir}/system/RteCtrl.service \ " -do_install_append() { +do_install:append() { # configuration file install -d ${D}${sysconfdir}/RteCtrl install -m 0644 ${WORKDIR}/RteCtrl.cfg ${D}${sysconfdir}/RteCtrl/ @@ -21,8 +21,8 @@ do_install_append() { SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "RteCtrl.service" +SYSTEMD_SERVICE:${PN} = "RteCtrl.service" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" inherit systemd diff --git a/recipes-go/cpu/cpu.bb b/recipes-go/cpu/cpu.bb index f2d8e8c..3f19946 100644 --- a/recipes-go/cpu/cpu.bb +++ b/recipes-go/cpu/cpu.bb @@ -1,7 +1,8 @@ -DESCRIPTION = "cpu command in Go, inspired by the Plan 9 cpu command" +# nooelint: oelint.file.underscores +SUMMARY = "cpu command in Go, inspired by the Plan 9 cpu command" HOMEPAGE = "https://github.com/u-root/cpu" -LICENSE = "BSD-3-Clause" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ " @@ -10,7 +11,9 @@ SRC_URI = "file://cpud" S = "${WORKDIR}" +INSANE_SKIP:${PN}:append = "already-stripped" + do_install() { - install -d ${D}${bindir} - install -m 755 ${S}/cpud ${D}${bindir}/ + install -d ${D}${bindir} + install -m 755 ${S}/cpud ${D}${bindir}/ } diff --git a/recipes-go/cpu/cpu/cpud b/recipes-go/cpu/cpu/cpud index 55cb84d..02b0d19 100755 Binary files a/recipes-go/cpu/cpu/cpud and b/recipes-go/cpu/cpu/cpud differ diff --git a/recipes-go/github.com-gorilla-mux/github.com-gorilla-mux_git.bb b/recipes-go/github.com-gorilla-mux/github.com-gorilla-mux_git.bb index aa8b5c5..b96131a 100644 --- a/recipes-go/github.com-gorilla-mux/github.com-gorilla-mux_git.bb +++ b/recipes-go/github.com-gorilla-mux/github.com-gorilla-mux_git.bb @@ -1,15 +1,16 @@ -DESCRIPTION = "A powerful URL router and dispatcher for golang" -SECTION = "net" +SUMMARY = "A powerful URL router and dispatcher for golang" HOMEPAGE = "http://www.gorillatoolkit.org/pkg/mux" +SECTION = "net" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${S}/src/github.com/gorilla/mux/LICENSE;md5=c50f6bd9c1e15ed0bad3bea18e3c1b7f" +LICENSE = "gorilla-mux-license" +NO_GENERIC_LICENSE[gorilla-mux-license] = "src/github.com/gorilla/mux/LICENSE" +LIC_FILES_CHKSUM = "file://${S}/src/github.com/gorilla/mux/LICENSE;md5=c30eee78985cf2584cded5f89ba3d787" +PV = "1.8.1" SRC_URI = "git://${GO_IMPORT};protocol=https;branch=main" -SRCREV = "53c1911da2b537f792e7cafcb446b05ffe33b996" -PV = "1.6.1" +SRCREV = "b4617d0b9670ad14039b2739167fd35a60f557c5" GO_IMPORT = "github.com/gorilla/mux" GO_INSTALL = "${GO_IMPORT}" -inherit go +inherit go-mod diff --git a/recipes-go/github.com-hashicorp-golang-lru/github.com-hashicorp-golang-lru_git.bb b/recipes-go/github.com-hashicorp-golang-lru/github.com-hashicorp-golang-lru_git.bb index 79c4f86..3575524 100644 --- a/recipes-go/github.com-hashicorp-golang-lru/github.com-hashicorp-golang-lru_git.bb +++ b/recipes-go/github.com-hashicorp-golang-lru/github.com-hashicorp-golang-lru_git.bb @@ -1,12 +1,14 @@ +SUMMARY = "Package which implements a fixed-size thread safe LRU cache" +HOMEPAGE = "https://github.com/hashicorp/golang-lru" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://${S}/src/github.com/hashicorp/golang-lru/LICENSE;md5=f27a50d2e878867827842f2c60e30bfc" GO_IMPORT = "github.com/hashicorp/golang-lru" +PV = "0.5.4" SRC_URI = "git://${GO_IMPORT};protocol=https;branch=main" SRCREV = "14eae340515388ca95aa8e7b86f0de668e981f54" -PV = "0.5.4" GO_INSTALL = "${GO_IMPORT}" -inherit go +inherit go-mod diff --git a/recipes-go/github.com-throttled-throttled/github.com-throttled-throttled_git.bb b/recipes-go/github.com-throttled-throttled/github.com-throttled-throttled_git.bb index 7289c45..7f1041c 100644 --- a/recipes-go/github.com-throttled-throttled/github.com-throttled-throttled_git.bb +++ b/recipes-go/github.com-throttled-throttled/github.com-throttled-throttled_git.bb @@ -1,20 +1,22 @@ +SUMMARY = "Package implements rate limiting access to resources such as HTTP endpoints." +HOMEPAGE = "https://github.com/throttled/throttled" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${S}/src/github.com/throttled/throttled/v2/LICENSE;md5=626c200490e0119689126e09ecc273a4" GO_IMPORT = "github.com/throttled/throttled/v2" -SRC_URI = "git://github.com/throttled/throttled" -SRCREV = "eef0076db706fe4531e6efe7dea5cfc402593562" PV = "2.9.1" +SRC_URI = "git://github.com/throttled/throttled;protocol=https;branch=master" +SRCREV = "eef0076db706fe4531e6efe7dea5cfc402593562" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ bash \ " -RDEPENDS_${PN}-dev += " \ +RDEPENDS:${PN}-dev += " \ bash \ " GO_INSTALL = "${GO_IMPORT}" -inherit go +inherit go-mod diff --git a/recipes-graphics/xorg-proto/xcb-proto/0001-xcbgen-use-math-gcd-for-python-3-5.patch b/recipes-graphics/xorg-proto/xcb-proto/0001-xcbgen-use-math-gcd-for-python-3-5.patch deleted file mode 100644 index f9f4424..0000000 --- a/recipes-graphics/xorg-proto/xcb-proto/0001-xcbgen-use-math-gcd-for-python-3-5.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 426ae35bee1fa0fdb8b5120b1dcd20cee6e34512 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Mon, 1 Jun 2020 12:24:16 +0200 -Subject: [PATCH] xcbgen: Use math.gcd() for Python >= 3.5. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -fractions.gcd() has been deprecated since Python 3.5, and -was finally dropped in Python 3.9. It is recommended to -use math.gcd() instead. - -Signed-off-by: Björn Esser -Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512] -Signed-off-by: Richard Leitner ---- - xcbgen/align.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/xcbgen/align.py b/xcbgen/align.py -index d4c12ee..5c4f517 100644 ---- a/xcbgen/align.py -+++ b/xcbgen/align.py -@@ -2,7 +2,12 @@ - This module contains helper classes for alignment arithmetic and checks - ''' - --from fractions import gcd -+from sys import version_info -+ -+if version_info[:2] >= (3, 5): -+ from math import gcd -+else: -+ from fractions import gcd - - class Alignment(object): - --- -GitLab - diff --git a/recipes-graphics/xorg-proto/xcb-proto_1.13.bb b/recipes-graphics/xorg-proto/xcb-proto_1.13.bb deleted file mode 100644 index 1f41821..0000000 --- a/recipes-graphics/xorg-proto/xcb-proto_1.13.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "XCB: The X protocol C binding headers" -DESCRIPTION = "Function prototypes for the X protocol C-language Binding \ -(XCB). XCB is a replacement for Xlib featuring a small footprint, \ -latency hiding, direct access to the protocol, improved threading \ -support, and extensibility." -HOMEPAGE = "http://xcb.freedesktop.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" - -SECTION = "x11/libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ - file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" - -SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.bz2 \ - file://0001-xcbgen-use-math-gcd-for-python-3-5.patch" -SRC_URI[md5sum] = "abe9aa4886138150bbc04ae4f29b90e3" -SRC_URI[sha256sum] = "7b98721e669be80284e9bbfeab02d2d0d54cd11172b72271e47a2fe875e2bde1" - -inherit autotools pkgconfig python3native - -PACKAGES += "python-xcbgen" - -FILES_${PN} = "" -FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" -FILES_python-xcbgen = "${PYTHON_SITEPACKAGES_DIR}" - -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" - -BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-graphics/xorg-proto/xorgproto_2019.2.bb b/recipes-graphics/xorg-proto/xorgproto_2019.2.bb index c0785cc..0198fbf 100644 --- a/recipes-graphics/xorg-proto/xorgproto_2019.2.bb +++ b/recipes-graphics/xorg-proto/xorgproto_2019.2.bb @@ -1,16 +1,19 @@ - SUMMARY = "X Window System unified protocol definitions" -DESCRIPTION = "This package provides the headers and specification documents defining \ -the core protocol and (many) extensions for the X Window System" +DESCRIPTION = " \ + This package provides the headers and specification documents defining \ + the core protocol and (many) extensions for the X Window System \ + " HOMEPAGE = "http://www.x.org" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" SECTION = "x11/libs" -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=b9e051107d5628966739a0b2e9b32676" -SRC_URI = "${XORG_MIRROR}/individual/proto/${BP}.tar.bz2 \ - file://legacy.patch" +SRC_URI = " \ + ${XORG_MIRROR}/individual/proto/${BP}.tar.bz2 \ + file://legacy.patch \ + " SRC_URI[md5sum] = "a02dcaff48b4141b949ac99dfc344d86" SRC_URI[sha256sum] = "46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e" @@ -20,9 +23,9 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[legacy] = "-Dlegacy=true,-Dlegacy=false" # Datadir only used to install pc files, $datadir/pkgconfig -datadir="${libdir}" +datadir = "${libdir}" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-kernel/linux/linux-mainline/0001-sun8i-h2-plus-orangepi-zero.dts-enable-i2c1.patch b/recipes-kernel/linux/linux-mainline/0001-sun8i-h2-plus-orangepi-zero.dts-enable-i2c1.patch index a396f75..109efed 100644 --- a/recipes-kernel/linux/linux-mainline/0001-sun8i-h2-plus-orangepi-zero.dts-enable-i2c1.patch +++ b/recipes-kernel/linux/linux-mainline/0001-sun8i-h2-plus-orangepi-zero.dts-enable-i2c1.patch @@ -1,18 +1,17 @@ -From 45c12c6d3998b4045432182dd78afc7135c2844e Mon Sep 17 00:00:00 2001 -From: Maciej Pijanowski -Date: Wed, 4 Nov 2020 21:22:36 +0100 -Subject: [PATCH 1/8] sun8i-h2-plus-orangepi-zero.dts: enable i2c1 +From 8e77e61b9027fc29415acb569f9bbcaefef6edf6 Mon Sep 17 00:00:00 2001 +From: Kas User +Date: Fri, 19 Jul 2024 10:39:05 +0000 +Subject: [PATCH 1/9] sun8i-h2-plus-orangepi-zero.dts: enable i2c1 -Signed-off-by: Maciej Pijanowski --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 4 ++++ + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -index f19ed981da9d..3a22b27c14b3 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -@@ -131,6 +131,10 @@ +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +index ca94e313f..28995fd34 100644 +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +@@ -135,6 +135,10 @@ &emac { status = "okay"; }; @@ -24,5 +23,5 @@ index f19ed981da9d..3a22b27c14b3 100644 vmmc-supply = <®_vcc3v3>; bus-width = <4>; -- -2.25.1 +2.44.1 diff --git a/recipes-kernel/linux/linux-mainline/0001-sun8i-h2-plus-orangepi-zero.dts-enable-ina219.patch b/recipes-kernel/linux/linux-mainline/0001-sun8i-h2-plus-orangepi-zero.dts-enable-ina219.patch deleted file mode 100644 index c948e25..0000000 --- a/recipes-kernel/linux/linux-mainline/0001-sun8i-h2-plus-orangepi-zero.dts-enable-ina219.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cf5094d34f61d9d51e6b4dd48c8b7a5a319c2b0b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tomasz=20=C5=BByjewski?= -Date: Wed, 8 Apr 2020 09:01:05 +0200 -Subject: [PATCH] sun8i-h2-plus-orangepi-zero.dts: enable in219 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Tomasz Żyjewski ---- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -index 84cd9c061227..3b80ec4f7435 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -@@ -132,6 +132,15 @@ - status = "okay"; - }; - -+&i2c1 { -+ ina219@40 { -+ status = "okay"; -+ compatible = "ti,ina219"; -+ reg = <0x40>; -+ shunt-resistor = <100000>; // R100 -+ }; -+}; -+ - &mmc0 { - vmmc-supply = <®_vcc3v3>; - bus-width = <4>; --- -2.17.1 diff --git a/recipes-kernel/linux/linux-mainline/0002-sun8i-h2-plus-orangepi-zero.dts-add-mcp23017-node.patch b/recipes-kernel/linux/linux-mainline/0002-sun8i-h2-plus-orangepi-zero.dts-add-mcp23017-node.patch index 0ce2dc9..02f53f2 100644 --- a/recipes-kernel/linux/linux-mainline/0002-sun8i-h2-plus-orangepi-zero.dts-add-mcp23017-node.patch +++ b/recipes-kernel/linux/linux-mainline/0002-sun8i-h2-plus-orangepi-zero.dts-add-mcp23017-node.patch @@ -1,22 +1,20 @@ -From 088d6003d0ba112822465f6016be175bb2b70a4f Mon Sep 17 00:00:00 2001 -From: Maciej Pijanowski -Date: Wed, 4 Nov 2020 21:23:27 +0100 -Subject: [PATCH 2/8] sun8i-h2-plus-orangepi-zero.dts: add mcp23017 node +From 4b24ee6073f129e62d5a70ad6e79719ba2396be1 Mon Sep 17 00:00:00 2001 +From: Kas User +Date: Fri, 19 Jul 2024 10:41:18 +0000 +Subject: [PATCH 2/9] sun8i-h2-plus-orangepi-zero.dts: add mcp23017 node -Signed-off-by: Maciej Pijanowski --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 7 +++++++ - 1 file changed, 7 insertions(+) + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 6 ++++++ + 1 file changed, 6 insertions(+) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -index 3a22b27c14b3..e30dae583f62 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -@@ -133,6 +133,13 @@ +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +index 28995fd34..6bf17d12d 100644 +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +@@ -137,6 +137,12 @@ &emac { &i2c1{ status = "okay"; -+ + gpio20: gpio@20 { + compatible = "microchip,mcp23017"; + gpio-controller; @@ -27,5 +25,5 @@ index 3a22b27c14b3..e30dae583f62 100644 &mmc0 { -- -2.25.1 +2.44.1 diff --git a/recipes-kernel/linux/linux-mainline/0003-sun8i-h2-plus-orangepi-zero.dts-enable-uart2.patch b/recipes-kernel/linux/linux-mainline/0003-sun8i-h2-plus-orangepi-zero.dts-enable-uart2.patch index 83636b2..e08b3cc 100644 --- a/recipes-kernel/linux/linux-mainline/0003-sun8i-h2-plus-orangepi-zero.dts-enable-uart2.patch +++ b/recipes-kernel/linux/linux-mainline/0003-sun8i-h2-plus-orangepi-zero.dts-enable-uart2.patch @@ -1,18 +1,17 @@ -From 4099211f4e8d0bf780fb2935ce3ea6c70e02480b Mon Sep 17 00:00:00 2001 -From: Maciej Pijanowski -Date: Wed, 4 Nov 2020 21:23:53 +0100 -Subject: [PATCH 3/8] sun8i-h2-plus-orangepi-zero.dts: enable uart2 +From 13a2f08fe997f83f1ec362e480c2ef122b04bc0b Mon Sep 17 00:00:00 2001 +From: Kas User +Date: Fri, 19 Jul 2024 10:43:15 +0000 +Subject: [PATCH 3/9] sun8i-h2-plus-orangepi-zero.dts: enable uart2 -Signed-off-by: Maciej Pijanowski --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 +- + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -index e30dae583f62..aabd425560f1 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -@@ -201,7 +201,7 @@ +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +index 6bf17d12d..a210cf678 100644 +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +@@ -213,7 +213,7 @@ &uart1 { &uart2 { pinctrl-names = "default"; pinctrl-0 = <&uart2_pins>; @@ -22,5 +21,5 @@ index e30dae583f62..aabd425560f1 100644 &usb_otg { -- -2.25.1 +2.44.1 diff --git a/recipes-kernel/linux/linux-mainline/0004-sun8i-h2-plus-orangepi-zero.dts-enable-spi1.patch b/recipes-kernel/linux/linux-mainline/0004-sun8i-h2-plus-orangepi-zero.dts-enable-spi1.patch index e8fbc5e..e2fbc73 100644 --- a/recipes-kernel/linux/linux-mainline/0004-sun8i-h2-plus-orangepi-zero.dts-enable-spi1.patch +++ b/recipes-kernel/linux/linux-mainline/0004-sun8i-h2-plus-orangepi-zero.dts-enable-spi1.patch @@ -1,18 +1,17 @@ -From 0e09ea8e8ebefc6560d19d792db089b3d93ee44d Mon Sep 17 00:00:00 2001 -From: Maciej Pijanowski -Date: Wed, 4 Nov 2020 21:24:30 +0100 -Subject: [PATCH 4/8] sun8i-h2-plus-orangepi-zero.dts: enable spi1 +From a6b9499e0b6efa9491a122c17960843200f3ca13 Mon Sep 17 00:00:00 2001 +From: Kas User +Date: Fri, 19 Jul 2024 10:44:35 +0000 +Subject: [PATCH 4/9] sun8i-h2-plus-orangepi-zero.dts: enable spi1 -Signed-off-by: Maciej Pijanowski --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 4 ++++ + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -index aabd425560f1..27de08a80121 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -@@ -186,6 +186,10 @@ +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +index a210cf678..5b9685fe0 100644 +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +@@ -198,6 +198,10 @@ flash@0 { }; }; @@ -24,5 +23,5 @@ index aabd425560f1..27de08a80121 100644 pinctrl-names = "default"; pinctrl-0 = <&uart0_pa_pins>; -- -2.25.1 +2.44.1 diff --git a/recipes-kernel/linux/linux-mainline/0005-sun8i-h2-plus-orangepi-zero.dts-enable-ehci-2-3.patch b/recipes-kernel/linux/linux-mainline/0005-sun8i-h2-plus-orangepi-zero.dts-enable-ehci-2-3.patch index 4fbfb88..2de3ef7 100644 --- a/recipes-kernel/linux/linux-mainline/0005-sun8i-h2-plus-orangepi-zero.dts-enable-ehci-2-3.patch +++ b/recipes-kernel/linux/linux-mainline/0005-sun8i-h2-plus-orangepi-zero.dts-enable-ehci-2-3.patch @@ -1,18 +1,17 @@ -From 1847eb5e13f101b3f90b419753add9981688f906 Mon Sep 17 00:00:00 2001 -From: Maciej Pijanowski -Date: Wed, 4 Nov 2020 21:25:23 +0100 -Subject: [PATCH 5/8] sun8i-h2-plus-orangepi-zero.dts: enable ehci[2,3] +From 5997da5df80ca42139eb41dbd749bba583fafcbf Mon Sep 17 00:00:00 2001 +From: Kas User +Date: Fri, 19 Jul 2024 10:46:14 +0000 +Subject: [PATCH 5/9] sun8i-h2-plus-orangepi-zero.dts: enable ehci[2,3] -Signed-off-by: Maciej Pijanowski --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 8 ++++++++ + .../boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -index 27de08a80121..47e16150a9ba 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -@@ -124,6 +124,14 @@ +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +index 5b9685fe0..d60928421 100644 +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +@@ -128,6 +128,14 @@ &ehci1 { status = "okay"; }; @@ -28,5 +27,5 @@ index 27de08a80121..47e16150a9ba 100644 phy-handle = <&int_mii_phy>; phy-mode = "mii"; -- -2.25.1 +2.44.1 diff --git a/recipes-kernel/linux/linux-mainline/0006-sun8i-h2-plus-orangepi-zero.dts-enable-ohci-2-3.patch b/recipes-kernel/linux/linux-mainline/0006-sun8i-h2-plus-orangepi-zero.dts-enable-ohci-2-3.patch index e278a88..fdd3e25 100644 --- a/recipes-kernel/linux/linux-mainline/0006-sun8i-h2-plus-orangepi-zero.dts-enable-ohci-2-3.patch +++ b/recipes-kernel/linux/linux-mainline/0006-sun8i-h2-plus-orangepi-zero.dts-enable-ohci-2-3.patch @@ -1,18 +1,17 @@ -From 99c64b5f660b47928532cdc12008c7386f153dc9 Mon Sep 17 00:00:00 2001 -From: Maciej Pijanowski -Date: Wed, 4 Nov 2020 21:25:50 +0100 -Subject: [PATCH 6/8] sun8i-h2-plus-orangepi-zero.dts: enable ohci[2,3] +From 1e34a5c183a3836fb4e06f7f764db11aff7870a5 Mon Sep 17 00:00:00 2001 +From: Kas User +Date: Fri, 19 Jul 2024 10:47:13 +0000 +Subject: [PATCH 6/9] sun8i-h2-plus-orangepi-zero.dts: enable ohci[2,3] -Signed-off-by: Maciej Pijanowski --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 8 ++++++++ + .../boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -index 47e16150a9ba..494f49a3e9f0 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -@@ -181,6 +181,14 @@ +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +index d60928421..7ada0008e 100644 +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +@@ -193,6 +193,14 @@ &ohci1 { status = "okay"; }; @@ -28,5 +27,5 @@ index 47e16150a9ba..494f49a3e9f0 100644 /* Disable SPI NOR by default: it optional on Orange Pi Zero boards */ status = "disabled"; -- -2.25.1 +2.44.1 diff --git a/recipes-kernel/linux/linux-mainline/0007-drivers-spi-spidev.c-add-spidev-compatible.patch b/recipes-kernel/linux/linux-mainline/0007-drivers-spi-spidev.c-add-spidev-compatible.patch new file mode 100644 index 0000000..7d5ec9e --- /dev/null +++ b/recipes-kernel/linux/linux-mainline/0007-drivers-spi-spidev.c-add-spidev-compatible.patch @@ -0,0 +1,25 @@ +From d8cdc8708f89c586abc6eb8d7a77f7b45cf1c29a Mon Sep 17 00:00:00 2001 +From: Maciej Pijanowski +Date: Wed, 23 Oct 2024 21:39:00 +0200 +Subject: [PATCH] drivers/spi/spidev.c: add spidev compatible + +Signed-off-by: Maciej Pijanowski +--- + drivers/spi/spidev.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c +index d13dc15cc191..551630857fca 100644 +--- a/drivers/spi/spidev.c ++++ b/drivers/spi/spidev.c +@@ -735,6 +735,7 @@ static const struct of_device_id spidev_dt_ids[] = { + { .compatible = "cisco,spi-petra", .data = &spidev_of_check }, + { .compatible = "dh,dhcom-board", .data = &spidev_of_check }, + { .compatible = "lineartechnology,ltc2488", .data = &spidev_of_check }, ++ { .compatible = "linux,spidev", .data = &spidev_of_check }, + { .compatible = "lwn,bk4", .data = &spidev_of_check }, + { .compatible = "menlo,m53cpld", .data = &spidev_of_check }, + { .compatible = "micron,spi-authenta", .data = &spidev_of_check }, +-- +2.47.0 + diff --git a/recipes-kernel/linux/linux-mainline/0007-drivers-spidev-add-spidev-to-compatible-list.patch b/recipes-kernel/linux/linux-mainline/0007-drivers-spidev-add-spidev-to-compatible-list.patch deleted file mode 100644 index c29d38e..0000000 --- a/recipes-kernel/linux/linux-mainline/0007-drivers-spidev-add-spidev-to-compatible-list.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9e83c1dfde8d9060b61ce9f8fa5c542671bf210e Mon Sep 17 00:00:00 2001 -From: Pawel Langowski -Date: Tue, 16 Jan 2024 14:20:10 +0100 -Subject: [PATCH 7/8] drivers: spidev: add spidev to compatible list - -By default, spidev shows a warning if a node in the device tree's "compatible -attribute contains "spidev". This is however not always desired. This commit -adds "spidev" to the list of compatible devices in order to disable the warning. - -Signed-off-by: Pawel Langowski ---- - drivers/spi/spidev.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index be503a0e6ef7..80c5c097b78f 100644 ---- a/drivers/spi/spidev.c -+++ b/drivers/spi/spidev.c -@@ -678,6 +678,7 @@ static const struct of_device_id spidev_dt_ids[] = { - { .compatible = "lwn,bk4" }, - { .compatible = "dh,dhcom-board" }, - { .compatible = "menlo,m53cpld" }, -+ { .compatible = "spidev" }, - {}, - }; - MODULE_DEVICE_TABLE(of, spidev_dt_ids); --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-mainline/0008-sun8i-h2-plus-orangepi-zero.dts-enable-spidev.patch b/recipes-kernel/linux/linux-mainline/0008-sun8i-h2-plus-orangepi-zero.dts-enable-spidev.patch index e1f4141..fb90add 100644 --- a/recipes-kernel/linux/linux-mainline/0008-sun8i-h2-plus-orangepi-zero.dts-enable-spidev.patch +++ b/recipes-kernel/linux/linux-mainline/0008-sun8i-h2-plus-orangepi-zero.dts-enable-spidev.patch @@ -1,22 +1,17 @@ -From a3fdb474de35b8f1bcbc700fec28b58f97da2391 Mon Sep 17 00:00:00 2001 -From: Pawel Langowski -Date: tue, 16 Jan 2024 14:25:57 +0100 -Subject: [PATCH 8/8] sun8i-h2-plus-orangepi-zero.dts: enable spidev +From 7cd91052e176aaad5ed20f5451eed82eb9be19cc Mon Sep 17 00:00:00 2001 +From: Kas User +Date: Fri, 19 Jul 2024 10:51:32 +0000 +Subject: [PATCH 8/9] sun8i-h2-plus-orangepi-zero.dts: enable spidev -The `compatible` attribute should be in the form "brand,product". The brand has -been arbitrarily chosen to be "linux". - - -Signed-off-by: Pawel Langowski --- - arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) + .../allwinner/sun8i-h2-plus-orangepi-zero.dts | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -index 494f49a3e9f0..cc4377e73e5d 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -@@ -191,7 +191,7 @@ +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +index 7ada0008e..bb8187a62 100644 +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +@@ -203,7 +203,7 @@ &ohci3 { &spi0 { /* Disable SPI NOR by default: it optional on Orange Pi Zero boards */ @@ -25,8 +20,8 @@ index 494f49a3e9f0..cc4377e73e5d 100644 flash@0 { #address-cells = <1>; -@@ -199,11 +199,24 @@ - compatible = "mxicy,mx25l1606e", "winbond,w25q128"; +@@ -211,11 +211,25 @@ flash@0 { + compatible = "mxicy,mx25l1606e", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <40000000>; + status = "disabled"; @@ -37,6 +32,7 @@ index 494f49a3e9f0..cc4377e73e5d 100644 + reg = <0>; + spi-max-frequency = <40000000>; }; ++ }; &spi1 { @@ -51,4 +47,5 @@ index 494f49a3e9f0..cc4377e73e5d 100644 &uart0 { -- -2.25.1 +2.44.1 + diff --git a/recipes-kernel/linux/linux-mainline/0009-sun8i-h2-plus-orangepi-zero.dts-enable-in219.patch b/recipes-kernel/linux/linux-mainline/0009-sun8i-h2-plus-orangepi-zero.dts-enable-in219.patch new file mode 100644 index 0000000..442ccfe --- /dev/null +++ b/recipes-kernel/linux/linux-mainline/0009-sun8i-h2-plus-orangepi-zero.dts-enable-in219.patch @@ -0,0 +1,29 @@ +From ecdd4d03c4581c7af9647cc624cd33437a33ad2b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tomasz=20=C5=BByjewski?= +Date: Fri, 19 Jul 2024 11:43:07 +0000 +Subject: [PATCH 9/9] sun8i-h2-plus-orangepi-zero.dts: enable in219 + +--- + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +index bb8187a62..7aa205988 100644 +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +@@ -151,6 +151,12 @@ gpio20: gpio@20 { + #gpio-cells = <2>; + reg = <0x20>; + }; ++ ina219@40 { ++ status = "okay"; ++ compatible = "ti,ina219"; ++ reg = <0x40>; ++ shunt-resistor = <100000>; // R100 ++ }; + }; + + &mmc0 { +-- +2.44.1 + diff --git a/recipes-kernel/linux/linux-mainline/0010-sun8i-h2-plus-orangepi-zero.dts-disable-mmc1.patch b/recipes-kernel/linux/linux-mainline/0010-sun8i-h2-plus-orangepi-zero.dts-disable-mmc1.patch new file mode 100644 index 0000000..2ad1880 --- /dev/null +++ b/recipes-kernel/linux/linux-mainline/0010-sun8i-h2-plus-orangepi-zero.dts-disable-mmc1.patch @@ -0,0 +1,32 @@ +From 2060e08623dd97b47f5c03651ac865d2efbd203a Mon Sep 17 00:00:00 2001 +From: Pawel Langowski +Date: Tue, 29 Oct 2024 09:47:51 +0100 +Subject: [PATCH] Disable wifi chip + +There is a race condition between mmc0 and mmc1 when mouting the root +partition on RTE. Disabling mmc1 solves this problem. The WiFi chip does +not work anyway. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Pawel Langowski +--- + arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +index 1b001f2ad0ef..baab19d3604f 100644 +--- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts ++++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +@@ -143,7 +143,7 @@ &mmc1 { + mmc-pwrseq = <&wifi_pwrseq>; + bus-width = <4>; + non-removable; +- status = "okay"; ++ status = "disabled"; + + /* + * Explicitly define the sdio device, so that we can add an ethernet +-- +2.46.2 + diff --git a/recipes-kernel/linux/linux-mainline/debug-fs.cfg b/recipes-kernel/linux/linux-mainline/debug-fs.cfg new file mode 100644 index 0000000..7cc5c06 --- /dev/null +++ b/recipes-kernel/linux/linux-mainline/debug-fs.cfg @@ -0,0 +1,5 @@ +CONFIG_BLK_DEBUG_FS=y +CONFIG_BT_DEBUGFS=y +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_FS_ALLOW_ALL=y +CONFIG_SCHED_DEBUG=y diff --git a/recipes-kernel/linux/linux-mainline/gpio-sysfs.cfg b/recipes-kernel/linux/linux-mainline/gpio-sysfs.cfg new file mode 100644 index 0000000..dbddc1d --- /dev/null +++ b/recipes-kernel/linux/linux-mainline/gpio-sysfs.cfg @@ -0,0 +1,2 @@ +CONFIG_EXPERT=y +CONFIG_GPIO_SYSFS=y diff --git a/recipes-kernel/linux/linux-mainline_%.bbappend b/recipes-kernel/linux/linux-mainline_%.bbappend index 781c737..678f926 100644 --- a/recipes-kernel/linux/linux-mainline_%.bbappend +++ b/recipes-kernel/linux/linux-mainline_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-sun8i-h2-plus-orangepi-zero.dts-enable-i2c1.patch \ @@ -7,9 +7,10 @@ SRC_URI += " \ file://0004-sun8i-h2-plus-orangepi-zero.dts-enable-spi1.patch \ file://0005-sun8i-h2-plus-orangepi-zero.dts-enable-ehci-2-3.patch \ file://0006-sun8i-h2-plus-orangepi-zero.dts-enable-ohci-2-3.patch \ - file://0007-drivers-spidev-add-spidev-to-compatible-list.patch \ + file://0007-drivers-spi-spidev.c-add-spidev-compatible.patch \ file://0008-sun8i-h2-plus-orangepi-zero.dts-enable-spidev.patch \ - file://0001-sun8i-h2-plus-orangepi-zero.dts-enable-ina219.patch \ + file://0009-sun8i-h2-plus-orangepi-zero.dts-enable-in219.patch \ + file://0010-sun8i-h2-plus-orangepi-zero.dts-disable-mmc1.patch \ " SRC_URI += " \ @@ -19,4 +20,6 @@ SRC_URI += " \ file://magic-sysrq.cfg \ file://ina-2xx.cfg \ file://9p.cfg \ + file://gpio-sysfs.cfg \ + file://debug-fs.cfg \ " diff --git a/recipes-rte/rte-persistent-data/files/rte-persistent-data-test.conf b/recipes-rte/rte-persistent-data/files/rte-persistent-data-test.conf new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/recipes-rte/rte-persistent-data/files/rte-persistent-data-test.conf @@ -0,0 +1 @@ +test diff --git a/recipes-rte/rte-persistent-data/rte-persistent-data_1.0.bb b/recipes-rte/rte-persistent-data/rte-persistent-data_1.0.bb new file mode 100644 index 0000000..ca8596e --- /dev/null +++ b/recipes-rte/rte-persistent-data/rte-persistent-data_1.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Persistent data partition test" +DESCRIPTION = "Data to be placed on persistent data partition" +HOMEPAGE = "https://github.com/3mdeb/meta-rte" +SECTION = "support" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = " \ + file://rte-persistent-data-test.conf \ + " + +S = "${WORKDIR}" + +FILES:${PN} += " \ + ${PERSISTENT_DATA_DIR}/rte-persistent-data-test.conf \ + " + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -d ${D}${PERSISTENT_DATA_DIR} + install -m 0644 rte-persistent-data-test.conf ${D}${PERSISTENT_DATA_DIR}/ +} diff --git a/recipes-rte/rte-tests/files/cukinia.conf b/recipes-rte/rte-tests/files/cukinia.conf new file mode 100644 index 0000000..9845358 --- /dev/null +++ b/recipes-rte/rte-tests/files/cukinia.conf @@ -0,0 +1,47 @@ +export CUKINIA_ROOT=/etc/cukinia + +cukinia_kconf GPIO_SYSFS y +cukinia_kconf SPI_SPIDEV y +cukinia_kconf PINCTRL_MCP23S08 m + +# GPIO expander +cukinia_test -d /sys/class/gpio/gpiochip400 + +cukinia_test -d /sys/class/gpio/gpio199 +cukinia_test -d /sys/class/gpio/gpio11 +cukinia_test -d /sys/class/gpio/gpio12 +cukinia_test -d /sys/class/gpio/gpio199 +cukinia_test -d /sys/class/gpio/gpio512 +cukinia_test -d /sys/class/gpio/gpio513 +cukinia_test -d /sys/class/gpio/gpio514 +cukinia_test -d /sys/class/gpio/gpio515 +cukinia_test -d /sys/class/gpio/gpio516 +cukinia_test -d /sys/class/gpio/gpio517 +cukinia_test -d /sys/class/gpio/gpio518 +cukinia_test -d /sys/class/gpio/gpio519 +cukinia_test -d /sys/class/gpio/gpio520 +cukinia_test -d /sys/class/gpio/gpio521 +cukinia_test -d /sys/class/gpio/gpio522 +cukinia_test -d /sys/class/gpio/gpio523 +cukinia_test -d /sys/class/gpio/gpio524 +cukinia_test -d /sys/class/gpio/gpio525 +cukinia_test -d /sys/class/gpio/gpio526 +cukinia_test -d /sys/class/gpio/gpio527 +cukinia_test -d /sys/class/gpio/gpio6 + +cukinia_test -c /dev/spidev1.0 + +cukinia_cmd ser2net -v +cukinia_cmd flashrom --version +cukinia_test -d /data +# TODO: test for support for specific chips we care about (such as new ones for +# MTL laptops) +cukinia_test -b /dev/mmcblk0p1 +cukinia_test -b /dev/mmcblk0p2 +cukinia_test -b /dev/mmcblk0p3 +cukinia_test -b /dev/mmcblk0p4 +cukinia_cmd findmnt /data +cukinia_systemd_unit ser2net.service +cukinia_systemd_unit RteCtrl.service + +cukinia_log "result: $cukinia_failures failure(s)" diff --git a/recipes-rte/rte-tests/rte-tests_1.0.bb b/recipes-rte/rte-tests/rte-tests_1.0.bb new file mode 100644 index 0000000..3eadb20 --- /dev/null +++ b/recipes-rte/rte-tests/rte-tests_1.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "RTE cukinia tests" +HOMEPAGE = "https://github.com/3mdeb/meta-rte" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = "file://cukinia.conf" + +S = "${WORKDIR}" + +RDEPENDS:${PN} = "cukinia" + +do_install() { + install -d ${D}${sysconfdir}/cukinia + install -m 0644 ${WORKDIR}/cukinia.conf ${D}${sysconfdir}/cukinia/ +} diff --git a/recipes-support/openvpn/openvpn/openvpn@.service b/recipes-support/openvpn/openvpn/openvpn@.service deleted file mode 100644 index 6fca7bf..0000000 --- a/recipes-support/openvpn/openvpn/openvpn@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Our version of openvpn service -After=syslog.target network.target -ConditionPathExists=/storage/openvpn/rte.conf - -[Service] -PrivateTmp=true -Type=forking -PIDFile=/var/run/openvpn/%i.pid -ExecStart=/usr/sbin/openvpn --daemon --writepid /var/run/openvpn/%i.pid --cd /storage/openvpn/ --config %i.conf - -[Install] -WantedBy=multi-user.target diff --git a/recipes-support/openvpn/openvpn_%.bbappend b/recipes-support/openvpn/openvpn_%.bbappend deleted file mode 100644 index a1902a9..0000000 --- a/recipes-support/openvpn/openvpn_%.bbappend +++ /dev/null @@ -1,19 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PACKAGES =+ "${PN}-rte" - -RTE_VPN_CONFIG_DIR = "/data/openvpn" - -FILES_${PN}-rte = "${RTE_VPN_CONFIG_DIR}" - -do_install_prepend() { - sed -i 's/CONFIG_DIR=\/etc/CONFIG_DIR=\/storage/' ${WORKDIR}/openvpn -} - -do_install_append() { - install -d ${D}/${RTE_VPN_CONFIG_DIR} -} - -SYSTEMD_SERVICE_${PN}-rte = "openvpn@rte.service" -SYSTEMD_PACKAGES += "${PN}-rte" -SYSTEMD_AUTO_ENABLE_${PN}-rte = "disable" diff --git a/recipes-support/swupdate/swu-confirm.bb b/recipes-support/swupdate/swu-confirm.bb index e72e453..8ff9ec3 100644 --- a/recipes-support/swupdate/swu-confirm.bb +++ b/recipes-support/swupdate/swu-confirm.bb @@ -1,17 +1,19 @@ -DESCRIPTION = "SWU confirm image" +# nooelint: oelint.file.underscores +SUMMARY = "SWU confirm image" +HOMEPAGE = "https://github.com/sbabic/swupdate/tree/master" SECTION = "utils" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +DEPENDS += "cpio" + SRC_URI = " \ file://sw-description \ " S = "${WORKDIR}" -DEPENDS += "cpio" - SWU_CONFIRM_FILES = "sw-description" SWU_CONFIRM_NAME = "swu-confirm.swu" @@ -25,4 +27,4 @@ do_install() { install -m 0600 ${S}/${SWU_CONFIRM_NAME} ${D}${datadir}/ } -FILES_${PN} = "${datadir}/${SWU_CONFIRM_NAME}" +FILES:${PN} += "${datadir}/${SWU_CONFIRM_NAME}" diff --git a/recipes-support/swupdate/swupdate_%.bbappend b/recipes-support/swupdate/swupdate_%.bbappend index 46e362a..957be14 100644 --- a/recipes-support/swupdate/swupdate_%.bbappend +++ b/recipes-support/swupdate/swupdate_%.bbappend @@ -1,13 +1,18 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += " \ file://confirm-upgrade.service \ file://rte-upgrade \ " -RDEPENDS_${PN} = "swu-confirm" +FILES:${PN} += " \ + ${sbindir}/rte-upgrade \ + ${systemd_unitdir}/system/confirm-upgrade.service \ +" + +RDEPENDS:${PN} = "swu-confirm" -do_install_append() { +do_install:append() { install -d ${D}${sbindir} install -m 0700 ${WORKDIR}/rte-upgrade ${D}${sbindir} @@ -15,11 +20,6 @@ do_install_append() { install -m 0644 ${WORKDIR}/confirm-upgrade.service ${D}${systemd_unitdir}/system } -FILES_${PN} += " \ - ${sbindir}/rte-upgrade \ - ${systemd_unitdir}/system/confirm-upgrade.service \ -" - -SYSTEMD_SERVICE_${PN} += " \ +SYSTEMD_SERVICE:${PN} += " \ confirm-upgrade.service \ " diff --git a/wic/sunxi-mmc-spl.wks b/wic/sunxi-mmc-spl.wks index 0b6bb18..ce314dd 100644 --- a/wic/sunxi-mmc-spl.wks +++ b/wic/sunxi-mmc-spl.wks @@ -2,4 +2,4 @@ part u-boot --source rawcopy --sourceparams="file=u-boot-sunxi-with-spl.bin" --o part /boot/bootpart --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 1024 --fixed-size 16 part / --source rootfs --rootfs-dir=rootfs-main --ondisk mmcblk0 --fstype=ext4 --label rootfs1 --align 1024 --fixed-size 256 --exclude-path data/ part --source rootfs --rootfs-dir=rootfs-main --ondisk mmcblk0 --fstype=ext4 --label rootfs2 --align 1024 --fixed-size 256 --exclude-path data/ -part /data --source rootfs --rootfs-dir=rootfs-data --ondisk mmcblk0 --fstype=ext4 --label data --align 1024 --fixed-size 512 +part /data --source rootfs --rootfs-dir=rootfs-data --ondisk mmcblk0 --fstype=ext4 --label data --align 1024 --fixed-size 512