From 65cc41ae1d7a0fee3760f3a849350e812d435f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:34:42 +0100 Subject: [PATCH 01/32] meta-lxatac-software: lxatac-profile: set LG_COORDINATOR not LG_CROSSBAR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The grpc based labgrid version introduced in e3b9c26 ("meta-labgrid: update to a version that adds grpc support") no longer uses the `LG_CROSSBAR` environment variable. Instead `LG_COORDINATOR` has to be set. Fixes: e3b9c26 ("meta-labgrid: update to a version that adds grpc support") Signed-off-by: Leonard Göhrs --- .../recipes-core/lxatac-profile/lxatac-profile/01-labgrid.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile/01-labgrid.sh b/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile/01-labgrid.sh index f1701d89..1b6e00ad 100644 --- a/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile/01-labgrid.sh +++ b/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile/01-labgrid.sh @@ -2,4 +2,4 @@ # export labgrid environment to be used with labgrid-client on the lxatac source /etc/labgrid/environment -export LG_CROSSBAR="ws://${LABGRID_COORDINATOR_IP:?}:${LABGRID_COORDINATOR_PORT:?}/ws" +export LG_COORDINATOR="${LABGRID_COORDINATOR_IP:?}:${LABGRID_COORDINATOR_PORT:?}" From e1bb04af276d26c245e25e1bac6c42a66bcfe9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 14:09:48 +0100 Subject: [PATCH 02/32] meta-lxatac-software: container-control: set ...:${PN} not ..._${PN} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using underscores there was a how it was done in previous yocto versions but since then `RDEPENDS:${PN}` is the way to go an `RDEPENDS_${PN}` just creates some new variable that no one reads. This was found by oelint oelint.vars.mispell[1]. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.vars.mispell.md Signed-off-by: Leonard Göhrs --- .../recipes-devtools/containers/container-control.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-software/recipes-devtools/containers/container-control.bb b/meta-lxatac-software/recipes-devtools/containers/container-control.bb index 013c64bd..92fa25f2 100644 --- a/meta-lxatac-software/recipes-devtools/containers/container-control.bb +++ b/meta-lxatac-software/recipes-devtools/containers/container-control.bb @@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit allarch -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ podman \ wget \ " From 9253ae2aa327d9c08e24deb2685675fa6b04a5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 10:49:52 +0100 Subject: [PATCH 03/32] oelint: add linter configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This disables some checks (not because they are necessarily wrong, but because fixing them is sometimes more work than I am willing to invest right now) and adds some variable names that we know are not typos. Signed-off-by: Leonard Göhrs --- .oelint-constants.json | 22 ++++++++++++++++++++++ .oelint.cfg | 19 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 .oelint-constants.json create mode 100644 .oelint.cfg diff --git a/.oelint-constants.json b/.oelint-constants.json new file mode 100644 index 00000000..ca7f4f2c --- /dev/null +++ b/.oelint-constants.json @@ -0,0 +1,22 @@ +{ + "functions" : { + "known" : [ + "do_genimage" + ] + }, + "variables" : { + "known" : [ + "BAREBOX_IMAGE_DEFAULT", + "BUNDLE_ARGS", + "GENIMAGE_IMAGE_SUFFIX", + "RAUC_BUNDLE_COMPATIBLE", + "RAUC_BUNDLE_FORMAT", + "RAUC_BUNDLE_HOOKS", + "RAUC_BUNDLE_SLOTS", + "RAUC_BUNDLE_VERSION", + "RAUC_SLOT_bootloader", + "RAUC_SLOT_rootfs", + "UMPF_PV" + ] + } +} diff --git a/.oelint.cfg b/.oelint.cfg new file mode 100644 index 00000000..6330ded0 --- /dev/null +++ b/.oelint.cfg @@ -0,0 +1,19 @@ +[oelint] +release = scarthgap + +suppress = + oelint.file.inappropriatemsg + oelint.file.underscores + oelint.task.noanonpython + oelint.var.badimagefeature.empty-root-password + oelint.var.badimagefeature.tools-debug + oelint.var.bbclassextend + oelint.var.licenseremotefile + oelint.var.mandatoryvar.DESCRIPTION + oelint.var.mandatoryvar.HOMEPAGE + oelint.vars.srcuridomains + oelint.var.suggestedvar.BUGTRACKER + oelint.var.suggestedvar.CVE_PRODUCT + oelint.var.suggestedvar.SECTION + +constantmods = +.oelint-constants.json From 91966cd0d2ccb8a912a91e5d8d231ca4f68ec407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Mon, 9 Dec 2024 08:10:23 +0100 Subject: [PATCH 04/32] CI: add oelint-adv linter rule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a GitHub workflow that runs oelint-adv[1] on our custom bitbake files. [1]: https://github.com/priv-kweihmann/oelint-adv Signed-off-by: Leonard Göhrs --- .github/workflows/lint.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/lint.yaml diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml new file mode 100644 index 00000000..832c6f40 --- /dev/null +++ b/.github/workflows/lint.yaml @@ -0,0 +1,16 @@ +name: lint + +on: + pull_request: + push: + schedule: + - cron: '10 21 * * 4' + +jobs: + lint: + name: oelint-adv + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - run: python3 -m pip install oelint_adv + - run: oelint-adv --mode=all --quiet --color $(find meta-lxatac-bsp/ meta-lxatac-software/ -name "*bb") From f1e97264859bef7c5441bd3260ab279e6dbc70e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 11:01:14 +0100 Subject: [PATCH 05/32] meta-lxatac-{bsp,software}: fix indentation in recipes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- .../files/patches/series.inc | 8 ++--- .../barebox/barebox-tools_2024.10.0.bb | 2 +- .../recipes-bsp/barebox/barebox_2024.10.0.bb | 12 +++---- .../barebox/files/patches/series.inc | 36 +++++++++---------- .../lxatac-nm-config/lxatac-nm-config.bb | 2 +- .../lxatac-repart/lxatac-repart.bb | 4 +-- .../linux/files/patches/series.inc | 22 ++++++------ .../lxatac-profile/lxatac-profile.bb | 4 +-- .../recipes-rust/ripgrep/ripgrep_14.1.1.bb | 6 ++-- .../recipes-rust/tacd/tacd.inc | 2 +- .../tacd-webinterface_git.bb | 2 +- 11 files changed, 50 insertions(+), 50 deletions(-) diff --git a/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/files/patches/series.inc b/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/files/patches/series.inc index cf6764f2..89e3a812 100644 --- a/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/files/patches/series.inc +++ b/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/files/patches/series.inc @@ -5,11 +5,11 @@ # umpf-hashinfo: e9c0f04902a5616a0af04fc9490edd9f1273ab7c # umpf-topic-range: d3e71ead6ea5bc3555ac90a446efec84ef6c6122..927790a02af8f782da3c11fc599017767d175de8 SRC_URI += "\ - file://patches/0001-fdts-lxa-tac-add-Linux-Automation-GmbH-TAC.patch \ - " + file://patches/0001-fdts-lxa-tac-add-Linux-Automation-GmbH-TAC.patch \ +" # umpf-release: 2.9/customers/lxa/tac/20240130-2 # umpf-topic-range: 927790a02af8f782da3c11fc599017767d175de8..2c9a028d8673d1b3f8ce99e58ec61c4554b60fda SRC_URI += "\ - file://patches/0101-Release-2.9-customers-lxa-tac-20240130-2.patch \ - " + file://patches/0101-Release-2.9-customers-lxa-tac-20240130-2.patch \ +" # umpf-end diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb index 986e831f..1f84fb8a 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb @@ -16,7 +16,7 @@ EXTRA_OEMAKE = " \ ARCH=sandbox \ CROSS_COMPILE=${TARGET_PREFIX} -C ${S} O=${B} \ CROSS_PKG_CONFIG=pkg-config \ - " +" do_compile:class-target () { export userccflags="${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS}" diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb index cf9a0479..3b27bb9c 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb @@ -20,12 +20,12 @@ COMPATIBLE_MACHINE = "lxatac" BAREBOX_DTBS_TO_DEPLOY = "arch/arm/dts/*.dtb" do_deploy:append () { - for DTB in ${BAREBOX_DTBS_TO_DEPLOY}; do - if [ -e ${DTB} ]; then - BAREBOX_DTB_BASENAME=barebox-$(basename ${DTB} .dtb)${BAREBOX_IMAGE_SUFFIX} - install -m 644 -T ${DTB} ${DEPLOYDIR}/${BAREBOX_DTB_BASENAME}.dtb - fi - done + for DTB in ${BAREBOX_DTBS_TO_DEPLOY}; do + if [ -e ${DTB} ]; then + BAREBOX_DTB_BASENAME=barebox-$(basename ${DTB} .dtb)${BAREBOX_IMAGE_SUFFIX} + install -m 644 -T ${DTB} ${DEPLOYDIR}/${BAREBOX_DTB_BASENAME}.dtb + fi + done } DEPENDS:append = " panel-shineworld-lh133k" diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc index 74ae3f6a..56d8d878 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc @@ -6,31 +6,31 @@ # umpf-hashinfo: 6d130e9537b785ad42b8bfb6d0d9c91fd70a3eea # umpf-topic-range: 1f31cde526d4e251da6464cac42ee2252643b972..3b1c5b6c26759c488ca8aa83e9145972d229eea7 SRC_URI += "\ - file://patches/0001-scripts-implement-slurp-a-read_file-with-fd-as-argum.patch \ - file://patches/0002-of_path-support-phandles-in-of_find_path.patch \ - file://patches/0003-Makefile-add-common-boards-include-to-include-search.patch \ - file://patches/0004-net-add-ethaddr-sequence-handling.patch \ - file://patches/0005-common-add-optional-systemd.hostname-generation.patch \ - file://patches/0006-net-factor-out-eth_of_get_fixup_node.patch \ - file://patches/0007-net-export-list-of-registered-ethernet-addresses.patch \ - file://patches/0008-net-implement-ethaddr_string_cmp.patch \ - file://patches/0009-common-add-barebox-TLV-support.patch \ - file://patches/0010-commands-add-TLV-debugging-command.patch \ - file://patches/0011-scripts-add-bareboxtlv-host-target-tool.patch \ - " + file://patches/0001-scripts-implement-slurp-a-read_file-with-fd-as-argum.patch \ + file://patches/0002-of_path-support-phandles-in-of_find_path.patch \ + file://patches/0003-Makefile-add-common-boards-include-to-include-search.patch \ + file://patches/0004-net-add-ethaddr-sequence-handling.patch \ + file://patches/0005-common-add-optional-systemd.hostname-generation.patch \ + file://patches/0006-net-factor-out-eth_of_get_fixup_node.patch \ + file://patches/0007-net-export-list-of-registered-ethernet-addresses.patch \ + file://patches/0008-net-implement-ethaddr_string_cmp.patch \ + file://patches/0009-common-add-barebox-TLV-support.patch \ + file://patches/0010-commands-add-TLV-debugging-command.patch \ + file://patches/0011-scripts-add-bareboxtlv-host-target-tool.patch \ +" # umpf-topic: v2024.10.0/customers/lxa/tac # umpf-hashinfo: 1413c76bc3233a8732a51c3010d6a8433e2b7e3a # umpf-topic-range: 3b1c5b6c26759c488ca8aa83e9145972d229eea7..df227f29447718518a7bb92954fc4f74aa58d77f SRC_URI += "\ - file://patches/0101-boards-add-decoder-for-LXA-TLV-v1-format.patch \ - file://patches/0102-ARM-dts-stm32-lxa-tac-fix-gen-1-2-boards-and-add-gen.patch \ - file://patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-board.patch \ - " + file://patches/0101-boards-add-decoder-for-LXA-TLV-v1-format.patch \ + file://patches/0102-ARM-dts-stm32-lxa-tac-fix-gen-1-2-boards-and-add-gen.patch \ + file://patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-board.patch \ +" # umpf-release: 2024.10.0/customers/lxa/tac/20241121-2 # umpf-topic-range: df227f29447718518a7bb92954fc4f74aa58d77f..be16d68f8fa1f5197557d48c1f0b9f50cc342895 SRC_URI += "\ - file://patches/0201-Release-2024.10.0-customers-lxa-tac-20241121-2.patch \ - " + file://patches/0201-Release-2024.10.0-customers-lxa-tac-20241121-2.patch \ +" UMPF_BASE = "2024.10.0" UMPF_VERSION = "20241121-2" UMPF_PV = "${UMPF_BASE}-${UMPF_VERSION}" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb b/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb index 488e5697..7ccd06c5 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb @@ -12,7 +12,7 @@ SRC_URI += " \ file://01-disable_switch_ipv6.conf \ file://50-g-usb.link \ file://52-switch.link \ - " +" N = "${libdir}/NetworkManager/system-connections" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb b/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb index 436918a6..f65e7a77 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb @@ -6,7 +6,7 @@ SRC_URI = " \ file://repart.d \ file://ordering.conf \ file://repart-before-tmpfiles.conf \ - " +" S = "${WORKDIR}" @@ -31,5 +31,5 @@ FILES:${PN} = " \ /system-update \ ${libdir}/repart.d \ ${libdir}/systemd/system/systemd-repart.service.d \ - " +" diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc index 0538ae61..067d6556 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc @@ -6,24 +6,24 @@ # umpf-hashinfo: d6ed6f191343a77bfe41d7436b51dffe8bcac441 # umpf-topic-range: adc218676eef25575469234709c2d87185ca223a..8c8650a9514ce98c07b891b95f09da0e05d5913f SRC_URI += "\ - file://patches/0001-ARM-Don-t-mention-the-full-path-of-the-source-direct.patch \ - " + file://patches/0001-ARM-Don-t-mention-the-full-path-of-the-source-direct.patch \ +" # umpf-topic: v6.12/customers/lxa/lxatac # umpf-hashinfo: c7dc846896e7c2880071cd9fb4ae9b94d8d9e38e # umpf-topic-range: 8c8650a9514ce98c07b891b95f09da0e05d5913f..c1a85acf9596faad5cd2df730cdbb2eb937c8418 SRC_URI += "\ - file://patches/0101-ARM-dts-stm32-lxa-tac-disable-the-real-time-clock.patch \ - file://patches/0102-ARM-dts-stm32-lxa-tac-extend-the-alias-table.patch \ - file://patches/0103-ARM-dts-stm32-lxa-tac-adjust-USB-gadget-fifo-sizes-f.patch \ - file://patches/0104-dt-bindings-arm-stm32-add-compatible-strings-for-Lin.patch \ - file://patches/0105-ARM-dts-stm32-lxa-tac-move-adc-and-gpio-e-g-to-gen-1.patch \ - file://patches/0106-ARM-dts-stm32-lxa-tac-Add-support-for-generation-3-d.patch \ - " + file://patches/0101-ARM-dts-stm32-lxa-tac-disable-the-real-time-clock.patch \ + file://patches/0102-ARM-dts-stm32-lxa-tac-extend-the-alias-table.patch \ + file://patches/0103-ARM-dts-stm32-lxa-tac-adjust-USB-gadget-fifo-sizes-f.patch \ + file://patches/0104-dt-bindings-arm-stm32-add-compatible-strings-for-Lin.patch \ + file://patches/0105-ARM-dts-stm32-lxa-tac-move-adc-and-gpio-e-g-to-gen-1.patch \ + file://patches/0106-ARM-dts-stm32-lxa-tac-Add-support-for-generation-3-d.patch \ +" # umpf-release: 6.12/customers/lxa/lxatac/20241121-1 # umpf-topic-range: c1a85acf9596faad5cd2df730cdbb2eb937c8418..177206858679e0e2f5e0ef4bf5dfe093120c3cc0 SRC_URI += "\ - file://patches/0201-Release-6.12-customers-lxa-lxatac-20241121-1.patch \ - " + file://patches/0201-Release-6.12-customers-lxa-lxatac-20241121-1.patch \ +" UMPF_BASE = "6.12" UMPF_VERSION = "20241121-1" UMPF_PV = "${UMPF_BASE}-${UMPF_VERSION}" diff --git a/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb b/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb index 6a806a52..ae9e623f 100644 --- a/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb +++ b/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb @@ -9,8 +9,8 @@ S = "${WORKDIR}" RDEPENDS:${PN} = "bash" do_install () { - install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${S}/01-labgrid.sh ${D}${sysconfdir}/profile.d/ + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${S}/01-labgrid.sh ${D}${sysconfdir}/profile.d/ } FILES:${PN} = "${sysconfdir}/profile.d/01-labgrid.sh" diff --git a/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb b/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb index 002d144c..c88e15b9 100644 --- a/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb +++ b/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb @@ -111,14 +111,14 @@ SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de3 SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -LIC_FILES_CHKSUM = " \ +LIC_FILES_CHKSUM = "\ file://LICENSE-MIT;md5=8d0d0aa488af0ab9aafa3b85a7fc8e12 \ file://UNLICENSE;md5=7246f848faa4e9c9fc0ea91122d6e680 \ " SUMMARY = "ripgrep is a line-oriented search tool that recursively searches your current \ -directory for a regex pattern while respecting your gitignore rules. ripgrep \ -has first class support on Windows, macOS and Linux." + directory for a regex pattern while respecting your gitignore rules. ripgrep \ + has first class support on Windows, macOS and Linux." HOMEPAGE = "https://github.com/BurntSushi/ripgrep" LICENSE = "Unlicense | MIT" diff --git a/meta-lxatac-software/recipes-rust/tacd/tacd.inc b/meta-lxatac-software/recipes-rust/tacd/tacd.inc index e5618d94..00267767 100644 --- a/meta-lxatac-software/recipes-rust/tacd/tacd.inc +++ b/meta-lxatac-software/recipes-rust/tacd/tacd.inc @@ -4,7 +4,7 @@ SRC_URI += " \ file://de.pengutronix.tacd.conf \ file://01_stable.yaml \ file://05_testing.yaml \ - " +" inherit pkgconfig inherit systemd diff --git a/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb b/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb index c136599e..251c6c75 100644 --- a/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb +++ b/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb @@ -2,7 +2,7 @@ SUMMARY = "The LXA TAC System Daemon - Web Interface" SRC_URI = " \ git://github.com/linux-automation/tacd.git;protocol=https;branch=main \ npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json \ - " +" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = " \ file://../LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ From 96274684e3d8d76afc260b31915adccc329c47f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 11:02:47 +0100 Subject: [PATCH 06/32] meta-lxatac-{bsp,software}: fix whitespace in var assign, add and append MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonard Göhrs --- .../arm-trusted-firmware-a/arm-trusted-firmware-a.inc | 6 +++--- .../recipes-bsp/barebox/barebox-tools_2024.10.0.bb | 4 ++-- meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc | 2 +- meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb | 2 +- .../recipes-core/lxatac-factory-data/lxatac-factory-data.bb | 2 +- .../recipes-core/lxatac-led-setup/lxatac-led-setup.bb | 2 +- .../recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb | 2 +- .../lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb | 2 +- .../recipes-core/lxatac-nm-config/lxatac-nm-config.bb | 2 +- .../lxatac-persistent-journal/lxatac-persistent-journal.bb | 2 +- .../lxatac-persistent-labgrid-cache.bb | 2 +- .../lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb | 2 +- meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb | 4 ++-- meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb | 2 +- .../recipes-devtools/containers/container-control.bb | 4 ++-- .../github-act-runner/github-act-runner.inc | 6 +++--- .../recipes-devtools/tac-gadget/tac-gadget.bb | 4 ++-- meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb | 4 ++-- meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb | 2 +- meta-lxatac-software/recipes-rust/tacd/tacd.inc | 2 +- meta-lxatac-software/recipes-rust/tacd/tacd_git.bb | 4 ++-- .../tacd-webinterface/tacd-webinterface_git.bb | 4 ++-- 22 files changed, 33 insertions(+), 33 deletions(-) diff --git a/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/arm-trusted-firmware-a.inc b/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/arm-trusted-firmware-a.inc index 6c2ed414..d0553f41 100644 --- a/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/arm-trusted-firmware-a.inc +++ b/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/arm-trusted-firmware-a.inc @@ -1,5 +1,5 @@ SUMMARY = "ARM Trusted Firmware-A" -DESCRIPTION = " \ +DESCRIPTION = "\ Trusted Firmware-A (TF-A) is a reference implementation of secure world \ software for Arm A-Profile architectures (Armv8-A and Armv7-A), including \ an Exception Level 3 (EL3) Secure Monitor. It provides a suitable starting \ @@ -9,7 +9,7 @@ DESCRIPTION = " \ HOMEPAGE = "https://developer.trustedfirmware.org/dashboard/view/6/" SECTION = "bootloaders" -LICENSE = " \ +LICENSE = "\ BSD-3-Clause & \ BSD-2-Clause & \ (GPL-2.0-only | GPL-3.0-only | BSD-2-Clause) & \ @@ -32,7 +32,7 @@ inherit deploy COMPATIBLE_MACHINE = "none" PLATFORM = "none" -EXTRA_OEMAKE = " \ +EXTRA_OEMAKE = "\ BUILD_BASE=${B} \ CROSS_COMPILE=${TARGET_PREFIX} \ PLAT=${PLATFORM} \ diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb index 1f84fb8a..57ab4e0b 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "955b20bfa7358732d2c0c09ccfd4c1a69087b7e2c610b16dee7442d71a S = "${WORKDIR}/barebox-${PV}" -EXTRA_OEMAKE = " \ +EXTRA_OEMAKE = "\ ARCH=sandbox \ CROSS_COMPILE=${TARGET_PREFIX} -C ${S} O=${B} \ CROSS_PKG_CONFIG=pkg-config \ @@ -32,7 +32,7 @@ do_compile:class-native () { oe_runmake scripts } -TOOLS = " \ +TOOLS = "\ bareboxenv \ bareboxcrc32 \ kernel-install \ diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc index 5609980a..4fc96b3d 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc @@ -39,7 +39,7 @@ BAREBOX_BUILDSYSTEM_VERSION ??= "${@get_layer_rev(os.path.dirname(d.getVar('FILE BAREBOX_FIRMWARE_DIR[doc] = "Overwrite barebox' firmware blobs search directory (CONFIG_EXTRA_FIRMWARE_DIR) with this path, default ${B}/firmware" BAREBOX_FIRMWARE_DIR ??= "${B}/firmware" -EXTRA_OEMAKE = " \ +EXTRA_OEMAKE = "\ CROSS_COMPILE=${TARGET_PREFIX} -C ${S} O=${B} \ BUILDSYSTEM_VERSION=${BAREBOX_BUILDSYSTEM_VERSION} \ CONFIG_EXTRA_FIRMWARE_DIR=${BAREBOX_FIRMWARE_DIR} \ diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb index 3b27bb9c..9036b19e 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb @@ -6,7 +6,7 @@ # included. require barebox.inc -SRC_URI += " \ +SRC_URI += "\ file://defconfig \ file://env \ " diff --git a/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb b/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb index e9d6805f..a66150f3 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb @@ -9,7 +9,7 @@ RDEPENDS:${PN} = "bash" SYSTEMD_SERVICE:${PN} = "lxatac-factory-data.service" -SRC_URI += " \ +SRC_URI += "\ file://lxatac-factory-data.service \ file://lxatac-factory-data.sh \ " diff --git a/meta-lxatac-bsp/recipes-core/lxatac-led-setup/lxatac-led-setup.bb b/meta-lxatac-bsp/recipes-core/lxatac-led-setup/lxatac-led-setup.bb index e0adeb4a..33e78faf 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-led-setup/lxatac-led-setup.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-led-setup/lxatac-led-setup.bb @@ -2,7 +2,7 @@ SUMMARY = "Set up LXA TAC LEDs with triggers that need sysfs interaction" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI += " \ +SRC_URI += "\ file://lxatac-led-setup.service \ file://lxatac-led-setup.sh \ " diff --git a/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb b/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb index 52f6722a..405b88d9 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb @@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit allarch -SRC_URI = " \ +SRC_URI = "\ file://01-switch.conf \ " diff --git a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb index fc04b509..fec767c1 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb @@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit allarch systemd -SRC_URI += " \ +SRC_URI += "\ file://01-increase-atomic-mem-pool-size.conf \ file://60-spi-device.rules \ file://spi-irq-prio-44009000.service \ diff --git a/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb b/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb index 7ccd06c5..46ca1a3c 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb @@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit allarch -SRC_URI += " \ +SRC_URI += "\ file://hostname.conf \ file://tac-bridge.nmconnection \ file://port-dut.nmconnection \ diff --git a/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb b/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb index 8d277d2c..b1f89bed 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb @@ -1,7 +1,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = " \ +SRC_URI = "\ file://var-log-journal.mount \ " diff --git a/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb b/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb index 30a75ff6..2844c765 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb @@ -1,7 +1,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = " \ +SRC_URI = "\ file://use-var-cache-labgrid.conf \ file://var-cache-labgrid.mount \ " diff --git a/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb b/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb index 6b7c7136..0d30ffca 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb @@ -1,7 +1,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = " \ +SRC_URI = "\ file://var-log-sa.mount \ file://use-var-log-sa.conf \ " diff --git a/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb b/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb index f65e7a77..3cfa9cdd 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb @@ -2,7 +2,7 @@ SUMMARY = "Use systemd's update mechanism to only re-partition the disk after im LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = " \ +SRC_URI = "\ file://repart.d \ file://ordering.conf \ file://repart-before-tmpfiles.conf \ @@ -27,7 +27,7 @@ do_install () { touch ${D}/system-update } -FILES:${PN} = " \ +FILES:${PN} = "\ /system-update \ ${libdir}/repart.d \ ${libdir}/systemd/system/systemd-repart.service.d \ diff --git a/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb b/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb index 2d6f48a6..bd21a551 100644 --- a/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb +++ b/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb @@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit systemd allarch -SRC_URI += " \ +SRC_URI += "\ file://01-watchdog.conf \ " diff --git a/meta-lxatac-software/recipes-devtools/containers/container-control.bb b/meta-lxatac-software/recipes-devtools/containers/container-control.bb index 92fa25f2..3f6a7736 100644 --- a/meta-lxatac-software/recipes-devtools/containers/container-control.bb +++ b/meta-lxatac-software/recipes-devtools/containers/container-control.bb @@ -3,12 +3,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit allarch -RDEPENDS:${PN} = " \ +RDEPENDS:${PN} = "\ podman \ wget \ " -SRC_URI = " \ +SRC_URI = "\ file://container-start.sh \ file://container-update.sh \ " diff --git a/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc b/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc index 9bee2e9f..ac7191f2 100644 --- a/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc +++ b/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc @@ -1,7 +1,7 @@ SUMMARY = "GitHub act Runner" DESCRIPTION = "Alternative implementation of the GitHub Action runner protocol written in Go" -SRC_URI = " \ +SRC_URI = "\ git://github.com/ChristopherHX/github-act-runner.git;branch=main;protocol=https \ file://github-act-runner.service \ " @@ -14,8 +14,8 @@ inherit systemd GO_IMPORT = "github.com/ChristopherHX/github-act-runner" -RDEPENDS:${PN}:append = "nodejs" -RDEPENDS:github-act-runner-dev:append = "make bash" +RDEPENDS:${PN}:append = " nodejs" +RDEPENDS:github-act-runner-dev:append = " make bash" SYSTEMD_SERVICE:${PN} = "github-act-runner.service" diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb b/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb index 01af8034..180d7748 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb @@ -7,11 +7,11 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_DEFAULT_DEPS = "1" -RDEPENDS:${PN} = " \ +RDEPENDS:${PN} = "\ bash \ " -SRC_URI = " \ +SRC_URI = "\ file://gadget-audio.sh \ file://gadget-common.sh \ file://gadget-ethernet-serial.sh \ diff --git a/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb b/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb index 4d2855cd..11cf520e 100644 --- a/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb +++ b/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb @@ -11,7 +11,7 @@ CARGO_SRC_DIR = "" # Pre-stripped binaries trigger a yocto QA error. CARGO_BUILD_FLAGS += "--config profile.release.strip=false" -SRC_URI += " \ +SRC_URI += "\ crate://crates.io/addr2line/0.22.0 \ crate://crates.io/adler/1.0.2 \ crate://crates.io/ahash/0.8.11 \ @@ -445,7 +445,7 @@ SRC_URI[wrapcenum-derive-0.4.1.sha256sum] = "a76ff259533532054cfbaefb115c613203c SRC_URI[zerocopy-derive-0.7.35.sha256sum] = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" SRC_URI[zerocopy-0.7.35.sha256sum] = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -LIC_FILES_CHKSUM = " \ +LIC_FILES_CHKSUM = "\ file://LICENSE;md5=5d45cffa3a75da17d285cc60c0c458cc \ " diff --git a/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb b/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb index c88e15b9..34a823bd 100644 --- a/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb +++ b/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb @@ -5,7 +5,7 @@ SRCREV = "4649aa9700619f94cf9c66876e9549d83420e16c" S = "${WORKDIR}/git" CARGO_SRC_DIR = "" -SRC_URI += " \ +SRC_URI += "\ crate://crates.io/aho-corasick/1.1.3 \ crate://crates.io/anyhow/1.0.87 \ crate://crates.io/bstr/1.10.0 \ diff --git a/meta-lxatac-software/recipes-rust/tacd/tacd.inc b/meta-lxatac-software/recipes-rust/tacd/tacd.inc index 00267767..3d0c591f 100644 --- a/meta-lxatac-software/recipes-rust/tacd/tacd.inc +++ b/meta-lxatac-software/recipes-rust/tacd/tacd.inc @@ -1,4 +1,4 @@ -SRC_URI += " \ +SRC_URI += "\ file://tacd.service \ file://tacd-failsafe.sh \ file://de.pengutronix.tacd.conf \ diff --git a/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb b/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb index df74db57..864d3658 100644 --- a/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb +++ b/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb @@ -8,7 +8,7 @@ S = "${WORKDIR}/git" CARGO_SRC_DIR = "" PV = "0.1.0+git${SRCPV}" -SRC_URI += " \ +SRC_URI += "\ crate://crates.io/addr2line/0.22.0 \ crate://crates.io/adler/1.0.2 \ crate://crates.io/aead/0.3.2 \ @@ -702,7 +702,7 @@ SRC_URI[zvariant-3.15.2.sha256sum] = "4eef2be88ba09b358d3b58aca6e41cd853631d4478 SRC_URI[zvariant_derive-3.15.2.sha256sum] = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" SRC_URI[zvariant_utils-1.0.1.sha256sum] = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" -LIC_FILES_CHKSUM = " \ +LIC_FILES_CHKSUM = "\ file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " diff --git a/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb b/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb index 251c6c75..72f1846b 100644 --- a/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb +++ b/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb @@ -1,10 +1,10 @@ SUMMARY = "The LXA TAC System Daemon - Web Interface" -SRC_URI = " \ +SRC_URI = "\ git://github.com/linux-automation/tacd.git;protocol=https;branch=main \ npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json \ " LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = " \ +LIC_FILES_CHKSUM = "\ file://../LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " From 8fb7e8942ef20166fbcc669222b10e59c6c2354d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Mon, 9 Dec 2024 08:09:57 +0100 Subject: [PATCH 07/32] meta-lxatac-bsp: tf-a-stm32mp_2.9: remove superfluous empty line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a oelint.newline.consecutive[1] oelint-adv warning. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.newline.consecutive.md Signed-off-by: Leonard Göhrs --- .../recipes-bsp/arm-trusted-firmware-a/tf-a-stm32mp_2.9.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/tf-a-stm32mp_2.9.bb b/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/tf-a-stm32mp_2.9.bb index 2e39d90b..bedf127d 100644 --- a/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/tf-a-stm32mp_2.9.bb +++ b/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/tf-a-stm32mp_2.9.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde SRCREV = "d3e71ead6ea5bc3555ac90a446efec84ef6c6122" - COMPATIBLE_MACHINE = "lxatac" PLATFORM = "stm32mp1" From 621b4bfd4c806bbe46e00e2712f3c30d7eb58a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 11:16:29 +0100 Subject: [PATCH 08/32] meta-lxatac-{bsp,software}: Sort DEPENDS and RDEPENDS alphabetically MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes oelint.vars.dependsordered[1] oelint warnings. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.vars.dependsordered.md Signed-off-by: Leonard Göhrs --- .../recipes-bsp/barebox/barebox-tools_2024.10.0.bb | 2 +- meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc | 2 +- .../lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb | 4 ++-- meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.100.bb | 2 +- .../recipes-support/imx-uuu/imx-uuu_1.5.182.bb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb index 57ab4e0b..180ca949 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://barebox.org/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192" -DEPENDS = "libusb1 libusb1-native lzop-native bison-native flex-native pkgconfig-native" +DEPENDS = "bison-native flex-native libusb1 libusb1-native lzop-native pkgconfig-native" BBCLASSEXTEND = "native" SRC_URI = "http://barebox.org/download/barebox-${PV}.tar.bz2" diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc index 4fc96b3d..2fc32eb0 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc @@ -16,7 +16,7 @@ inherit kernel-arch deploy cml1 pkgconfig # be enabled within the defconfig file so depend on it here to be more user # friendly (do not abort the build). The actual tools are provided by the # barebox-tools package. -DEPENDS = "libusb1 bison-native flex-native" +DEPENDS = "bison-native flex-native libusb1" export KBUILD_BUILD_USER ?= "oe-user" export KBUILD_BUILD_HOST ?= "oe-host" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb index fec767c1..fe258652 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb @@ -34,8 +34,8 @@ do_install() { SYSTEMD_SERVICE:${PN} = "spi-irq-prio-44009000.service" -# For chrt and pgrep in spi-irq-prio-44009000.service -RDEPENDS:${PN} += "util-linux busybox" +# For pgrep and chrt in spi-irq-prio-44009000.service +RDEPENDS:${PN} += "busybox util-linux" FILES:${PN} += "\ ${libdir}/sysctl.d/ \ diff --git a/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.100.bb b/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.100.bb index bf6e4f4b..9770b199 100644 --- a/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.100.bb +++ b/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.100.bb @@ -16,7 +16,7 @@ SRCREV = "c34d89b29f3d0d12793cd78b194d2f1d11728baf" S = "${WORKDIR}/git" -DEPENDS = "curl libyaml libusb1 openssl libftdi" +DEPENDS = "curl libftdi libusb1 libyaml openssl" inherit cmake pkgconfig diff --git a/meta-lxatac-software/recipes-support/imx-uuu/imx-uuu_1.5.182.bb b/meta-lxatac-software/recipes-support/imx-uuu/imx-uuu_1.5.182.bb index 9003ba03..90e23311 100644 --- a/meta-lxatac-software/recipes-support/imx-uuu/imx-uuu_1.5.182.bb +++ b/meta-lxatac-software/recipes-support/imx-uuu/imx-uuu_1.5.182.bb @@ -12,6 +12,6 @@ inherit cmake pkgconfig S = "${WORKDIR}/uuu-uuu_${PV}" -DEPENDS = "libusb zlib bzip2 openssl libtinyxml2" +DEPENDS = "bzip2 libtinyxml2 libusb openssl zlib" BBCLASSEXTEND = "native nativesdk" From c3fc8000ed1903944815529cf038e909ac94497e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 11:29:29 +0100 Subject: [PATCH 09/32] meta-lxatac-{bsp,software}: Provide better/shorter/any at all SUMMARYs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes oelint.vars.summary80chars[1] warnings for summaries that were in fact descriptions and oelint.var.mandatoryvar.SUMMARY[2] errors for recipes without a summary. Demoting some of the DESCRIPTIONs to SUMMARYs would usually trigger oelint.var.mandatoryvar.DESCRIPTION[2] errors, but those are currently disabled. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.vars.summary80chars.md [2]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.var.mandatoryvar.md Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc | 2 +- .../recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb | 2 ++ .../lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb | 2 ++ .../recipes-core/lxatac-nm-config/lxatac-nm-config.bb | 2 ++ .../lxatac-persistent-journal/lxatac-persistent-journal.bb | 2 ++ .../lxatac-persistent-labgrid-cache.bb | 2 ++ .../lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb | 2 ++ meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb | 2 ++ .../recipes-devtools/fiptool/fiptool-native_git.bb | 2 +- meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb | 2 ++ .../recipes-core/bundles/lxatac-core-bundle-base.bb | 2 ++ .../recipes-core/lxatac-profile/lxatac-profile.bb | 2 +- .../recipes-devtools/containers/container-control.bb | 2 ++ meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb | 2 +- meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb | 4 +--- meta-lxatac-software/recipes-rust/tacd/tacd_git.bb | 2 +- 16 files changed, 26 insertions(+), 8 deletions(-) diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc index 2fc32eb0..e8226f17 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc @@ -1,4 +1,4 @@ -SUMMARY = "barebox is a bootloader designed for embedded systems. It runs on a variety of architectures including x86, ARM, MIPS, PowerPC and others." +SUMMARY = "barebox is a bootloader designed for embedded systems." HOMEPAGE = "https://barebox.org/" SECTION = "bootloaders" PROVIDES = "virtual/bootloader" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb b/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb index 405b88d9..48736709 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb @@ -1,3 +1,5 @@ +SUMMARY = "Configure the lldpd daemon on the switch interface" + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb index fe258652..77f7633c 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb @@ -1,3 +1,5 @@ +SUMMARY = "Hacks that make communication with the switch more reliable under load." + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb b/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb index 46ca1a3c..762cc5c4 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb @@ -1,3 +1,5 @@ +SUMMARY = "NetworkManager config for the LXA TAC" + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb b/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb index b1f89bed..bde0a8fb 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb @@ -1,3 +1,5 @@ +SUMMARY = "Use a bind mound to make systemd-journald logs persist across boots" + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb b/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb index 2844c765..4d44117c 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb @@ -1,3 +1,5 @@ +SUMMARY = "Use a bind mount to persist the labgrid cache across boots" + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb b/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb index 0d30ffca..f9936a56 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb @@ -1,3 +1,5 @@ +SUMMARY = "Use a bind mount to persist the sysstat log across boots" + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" diff --git a/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb b/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb index bd21a551..5664c4e8 100644 --- a/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb +++ b/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb @@ -1,3 +1,5 @@ +SUMMARY = "Configure how systemd should handle the watchdog on the LXA TAC" + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" diff --git a/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb b/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb index ec93f9f2..7917f588 100644 --- a/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb +++ b/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb @@ -2,7 +2,7 @@ # It is a packaging format used by TF-A to package the # firmware images in a single binary. -DESCRIPTION = "fiptool - Trusted Firmware tool for packaging" +SUMMARY = "fiptool - Trusted Firmware tool for packaging" LICENSE = "BSD-3-Clause" SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;destsuffix=fiptool-${PV};protocol=https;branch=master" diff --git a/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb b/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb index 649211bf..df87874b 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb +++ b/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb @@ -1,3 +1,5 @@ +SUMMARY = "The Linux Kernel with some modifications for the LXA TAC" + inherit kernel SECTION = "kernel" diff --git a/meta-lxatac-software/recipes-core/bundles/lxatac-core-bundle-base.bb b/meta-lxatac-software/recipes-core/bundles/lxatac-core-bundle-base.bb index f400f49b..2df8b6ec 100644 --- a/meta-lxatac-software/recipes-core/bundles/lxatac-core-bundle-base.bb +++ b/meta-lxatac-software/recipes-core/bundles/lxatac-core-bundle-base.bb @@ -1,3 +1,5 @@ +SUMMARY = "The LXA TAC RAUC update bundle" + inherit bundle LICENSE = "MIT" diff --git a/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb b/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb index ae9e623f..d637b0cd 100644 --- a/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb +++ b/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Set up LG_CROSSBAR environment variable from labgrid env" +SUMMARY = "Set up LG_COORDINATOR environment variable from labgrid env" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" diff --git a/meta-lxatac-software/recipes-devtools/containers/container-control.bb b/meta-lxatac-software/recipes-devtools/containers/container-control.bb index 3f6a7736..7a34ea8d 100644 --- a/meta-lxatac-software/recipes-devtools/containers/container-control.bb +++ b/meta-lxatac-software/recipes-devtools/containers/container-control.bb @@ -1,3 +1,5 @@ +SUMMARY = "Helpers around podman to start and update containers" + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" diff --git a/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb b/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb index 11cf520e..49b437a8 100644 --- a/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb +++ b/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb @@ -449,7 +449,7 @@ LIC_FILES_CHKSUM = "\ file://LICENSE;md5=5d45cffa3a75da17d285cc60c0c458cc \ " -SUMMARY = "A customizable cross-platform graphical process/system monitor for the terminal. Supports Linux, macOS, and Windows." +SUMMARY = "A customizable cross-platform graphical process/system monitor for the terminal." HOMEPAGE = "https://github.com/ClementTsang/bottom" LICENSE = "MIT" diff --git a/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb b/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb index 34a823bd..400e5542 100644 --- a/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb +++ b/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb @@ -116,9 +116,7 @@ LIC_FILES_CHKSUM = "\ file://UNLICENSE;md5=7246f848faa4e9c9fc0ea91122d6e680 \ " -SUMMARY = "ripgrep is a line-oriented search tool that recursively searches your current \ - directory for a regex pattern while respecting your gitignore rules. ripgrep \ - has first class support on Windows, macOS and Linux." +SUMMARY = "ripgrep is a line-oriented recursive search tool searching for regex patterns" HOMEPAGE = "https://github.com/BurntSushi/ripgrep" LICENSE = "Unlicense | MIT" diff --git a/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb b/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb index 864d3658..47d69218 100644 --- a/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb +++ b/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb @@ -706,7 +706,7 @@ LIC_FILES_CHKSUM = "\ file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " -SUMMARY = "tacd" +SUMMARY = "The LXA TAC System Daemon" HOMEPAGE = "https://github.com/linux-automation/tacd" LICENSE = "GPL-2.0-or-later" From 696e10045c802f7f464e24e77cadb7bac40d9c61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 12:53:47 +0100 Subject: [PATCH 10/32] meta-lxatac-{bsp,software}: use SRC_URI:append instead if += MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes oelint.vars.srcuriappend[1] oelint errors. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.vars.srcuriappend.md Signed-off-by: Leonard Göhrs --- .../arm-trusted-firmware-a/files/patches/series.inc | 4 ++-- meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb | 2 +- .../recipes-bsp/barebox/files/patches/series.inc | 6 +++--- meta-lxatac-bsp/recipes-core/images/emmc-boot-image.bb | 2 +- meta-lxatac-bsp/recipes-core/images/emmc-image.bb | 2 +- .../recipes-core/lxatac-factory-data/lxatac-factory-data.bb | 2 +- .../recipes-core/lxatac-led-setup/lxatac-led-setup.bb | 2 +- .../lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb | 2 +- .../recipes-core/lxatac-nm-config/lxatac-nm-config.bb | 2 +- meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb | 2 +- .../recipes-kernel/linux/files/patches/series.inc | 6 +++--- .../recipes-core/bundles/lxatac-core-bundle-base.bb | 2 +- meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb | 6 ++++-- meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb | 6 ++++-- meta-lxatac-software/recipes-rust/tacd/tacd.inc | 2 +- meta-lxatac-software/recipes-rust/tacd/tacd_git.bb | 6 ++++-- 16 files changed, 30 insertions(+), 24 deletions(-) diff --git a/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/files/patches/series.inc b/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/files/patches/series.inc index 89e3a812..ab548df8 100644 --- a/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/files/patches/series.inc +++ b/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/files/patches/series.inc @@ -4,12 +4,12 @@ # umpf-topic: v2.9/customers/lxa/tac # umpf-hashinfo: e9c0f04902a5616a0af04fc9490edd9f1273ab7c # umpf-topic-range: d3e71ead6ea5bc3555ac90a446efec84ef6c6122..927790a02af8f782da3c11fc599017767d175de8 -SRC_URI += "\ +SRC_URI:append = " \ file://patches/0001-fdts-lxa-tac-add-Linux-Automation-GmbH-TAC.patch \ " # umpf-release: 2.9/customers/lxa/tac/20240130-2 # umpf-topic-range: 927790a02af8f782da3c11fc599017767d175de8..2c9a028d8673d1b3f8ce99e58ec61c4554b60fda -SRC_URI += "\ +SRC_URI:append = " \ file://patches/0101-Release-2.9-customers-lxa-tac-20240130-2.patch \ " # umpf-end diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb index 9036b19e..acd8f20e 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb @@ -6,7 +6,7 @@ # included. require barebox.inc -SRC_URI += "\ +SRC_URI:append = " \ file://defconfig \ file://env \ " diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc index 56d8d878..461fe523 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc @@ -5,7 +5,7 @@ # umpf-topic: v2024.10.0/topic/tlv # umpf-hashinfo: 6d130e9537b785ad42b8bfb6d0d9c91fd70a3eea # umpf-topic-range: 1f31cde526d4e251da6464cac42ee2252643b972..3b1c5b6c26759c488ca8aa83e9145972d229eea7 -SRC_URI += "\ +SRC_URI:append = " \ file://patches/0001-scripts-implement-slurp-a-read_file-with-fd-as-argum.patch \ file://patches/0002-of_path-support-phandles-in-of_find_path.patch \ file://patches/0003-Makefile-add-common-boards-include-to-include-search.patch \ @@ -21,14 +21,14 @@ SRC_URI += "\ # umpf-topic: v2024.10.0/customers/lxa/tac # umpf-hashinfo: 1413c76bc3233a8732a51c3010d6a8433e2b7e3a # umpf-topic-range: 3b1c5b6c26759c488ca8aa83e9145972d229eea7..df227f29447718518a7bb92954fc4f74aa58d77f -SRC_URI += "\ +SRC_URI:append = " \ file://patches/0101-boards-add-decoder-for-LXA-TLV-v1-format.patch \ file://patches/0102-ARM-dts-stm32-lxa-tac-fix-gen-1-2-boards-and-add-gen.patch \ file://patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-board.patch \ " # umpf-release: 2024.10.0/customers/lxa/tac/20241121-2 # umpf-topic-range: df227f29447718518a7bb92954fc4f74aa58d77f..be16d68f8fa1f5197557d48c1f0b9f50cc342895 -SRC_URI += "\ +SRC_URI:append = " \ file://patches/0201-Release-2024.10.0-customers-lxa-tac-20241121-2.patch \ " UMPF_BASE = "2024.10.0" diff --git a/meta-lxatac-bsp/recipes-core/images/emmc-boot-image.bb b/meta-lxatac-bsp/recipes-core/images/emmc-boot-image.bb index de8b262c..17af69ee 100644 --- a/meta-lxatac-bsp/recipes-core/images/emmc-boot-image.bb +++ b/meta-lxatac-bsp/recipes-core/images/emmc-boot-image.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda DEPENDS += "fiptool-native" -SRC_URI += "file://genimage.config" +SRC_URI:append = " file://genimage.config" inherit genimage diff --git a/meta-lxatac-bsp/recipes-core/images/emmc-image.bb b/meta-lxatac-bsp/recipes-core/images/emmc-image.bb index eef9c4c0..aa8eff27 100644 --- a/meta-lxatac-bsp/recipes-core/images/emmc-image.bb +++ b/meta-lxatac-bsp/recipes-core/images/emmc-image.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda DEPENDS += "e2fsprogs-native" -SRC_URI += "file://genimage.config" +SRC_URI:append = " file://genimage.config" inherit genimage diff --git a/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb b/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb index a66150f3..100861ea 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb @@ -9,7 +9,7 @@ RDEPENDS:${PN} = "bash" SYSTEMD_SERVICE:${PN} = "lxatac-factory-data.service" -SRC_URI += "\ +SRC_URI:append = " \ file://lxatac-factory-data.service \ file://lxatac-factory-data.sh \ " diff --git a/meta-lxatac-bsp/recipes-core/lxatac-led-setup/lxatac-led-setup.bb b/meta-lxatac-bsp/recipes-core/lxatac-led-setup/lxatac-led-setup.bb index 33e78faf..10ba214e 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-led-setup/lxatac-led-setup.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-led-setup/lxatac-led-setup.bb @@ -2,7 +2,7 @@ SUMMARY = "Set up LXA TAC LEDs with triggers that need sysfs interaction" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI += "\ +SRC_URI:append = " \ file://lxatac-led-setup.service \ file://lxatac-led-setup.sh \ " diff --git a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb index 77f7633c..bbe2fb1c 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit allarch systemd -SRC_URI += "\ +SRC_URI:append = " \ file://01-increase-atomic-mem-pool-size.conf \ file://60-spi-device.rules \ file://spi-irq-prio-44009000.service \ diff --git a/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb b/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb index 762cc5c4..f36614aa 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-nm-config/lxatac-nm-config.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit allarch -SRC_URI += "\ +SRC_URI:append = " \ file://hostname.conf \ file://tac-bridge.nmconnection \ file://port-dut.nmconnection \ diff --git a/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb b/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb index 5664c4e8..be6b6ef2 100644 --- a/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb +++ b/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit systemd allarch -SRC_URI += "\ +SRC_URI:append = " \ file://01-watchdog.conf \ " diff --git a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc index 067d6556..26c6e19d 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc +++ b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc @@ -5,13 +5,13 @@ # umpf-topic: v6.11/topic/reproducible-build # umpf-hashinfo: d6ed6f191343a77bfe41d7436b51dffe8bcac441 # umpf-topic-range: adc218676eef25575469234709c2d87185ca223a..8c8650a9514ce98c07b891b95f09da0e05d5913f -SRC_URI += "\ +SRC_URI:append = " \ file://patches/0001-ARM-Don-t-mention-the-full-path-of-the-source-direct.patch \ " # umpf-topic: v6.12/customers/lxa/lxatac # umpf-hashinfo: c7dc846896e7c2880071cd9fb4ae9b94d8d9e38e # umpf-topic-range: 8c8650a9514ce98c07b891b95f09da0e05d5913f..c1a85acf9596faad5cd2df730cdbb2eb937c8418 -SRC_URI += "\ +SRC_URI:append = " \ file://patches/0101-ARM-dts-stm32-lxa-tac-disable-the-real-time-clock.patch \ file://patches/0102-ARM-dts-stm32-lxa-tac-extend-the-alias-table.patch \ file://patches/0103-ARM-dts-stm32-lxa-tac-adjust-USB-gadget-fifo-sizes-f.patch \ @@ -21,7 +21,7 @@ SRC_URI += "\ " # umpf-release: 6.12/customers/lxa/lxatac/20241121-1 # umpf-topic-range: c1a85acf9596faad5cd2df730cdbb2eb937c8418..177206858679e0e2f5e0ef4bf5dfe093120c3cc0 -SRC_URI += "\ +SRC_URI:append = " \ file://patches/0201-Release-6.12-customers-lxa-lxatac-20241121-1.patch \ " UMPF_BASE = "6.12" diff --git a/meta-lxatac-software/recipes-core/bundles/lxatac-core-bundle-base.bb b/meta-lxatac-software/recipes-core/bundles/lxatac-core-bundle-base.bb index 2df8b6ec..b12fc4a4 100644 --- a/meta-lxatac-software/recipes-core/bundles/lxatac-core-bundle-base.bb +++ b/meta-lxatac-software/recipes-core/bundles/lxatac-core-bundle-base.bb @@ -5,7 +5,7 @@ inherit bundle LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI += "file://hook.sh" +SRC_URI:append = " file://hook.sh" RAUC_BUNDLE_FORMAT = "verity" diff --git a/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb b/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb index 49b437a8..88f3c3b8 100644 --- a/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb +++ b/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb @@ -1,6 +1,8 @@ inherit cargo -SRC_URI += "git://github.com/ClementTsang/bottom.git;protocol=https;branch=main" +SRC_URI:append = " \ + git://github.com/ClementTsang/bottom.git;protocol=https;branch=main \ +" SRCREV = "2ec1fb56c9db0b37acc4eca3230adfb52720376b" S = "${WORKDIR}/git" CARGO_SRC_DIR = "" @@ -11,7 +13,7 @@ CARGO_SRC_DIR = "" # Pre-stripped binaries trigger a yocto QA error. CARGO_BUILD_FLAGS += "--config profile.release.strip=false" -SRC_URI += "\ +SRC_URI:append = " \ crate://crates.io/addr2line/0.22.0 \ crate://crates.io/adler/1.0.2 \ crate://crates.io/ahash/0.8.11 \ diff --git a/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb b/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb index 400e5542..cdab65c5 100644 --- a/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb +++ b/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb @@ -1,11 +1,13 @@ inherit cargo -SRC_URI += "git://github.com/BurntSushi/ripgrep.git;protocol=https;branch=master" +SRC_URI:append = " \ + git://github.com/BurntSushi/ripgrep.git;protocol=https;branch=master \ +" SRCREV = "4649aa9700619f94cf9c66876e9549d83420e16c" S = "${WORKDIR}/git" CARGO_SRC_DIR = "" -SRC_URI += "\ +SRC_URI:append = " \ crate://crates.io/aho-corasick/1.1.3 \ crate://crates.io/anyhow/1.0.87 \ crate://crates.io/bstr/1.10.0 \ diff --git a/meta-lxatac-software/recipes-rust/tacd/tacd.inc b/meta-lxatac-software/recipes-rust/tacd/tacd.inc index 3d0c591f..8a3f4b6e 100644 --- a/meta-lxatac-software/recipes-rust/tacd/tacd.inc +++ b/meta-lxatac-software/recipes-rust/tacd/tacd.inc @@ -1,4 +1,4 @@ -SRC_URI += "\ +SRC_URI:append = " \ file://tacd.service \ file://tacd-failsafe.sh \ file://de.pengutronix.tacd.conf \ diff --git a/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb b/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb index 47d69218..e2237c98 100644 --- a/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb +++ b/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb @@ -2,13 +2,15 @@ inherit cargo DEFAULT_PREFERENCE = "-1" -SRC_URI += "git://github.com/linux-automation/tacd.git;protocol=https;branch=main" +SRC_URI:append = " \ + git://github.com/linux-automation/tacd.git;protocol=https;branch=main \ +" SRCREV = "e79b017da65f4a084a8b24f1118e15b0c3f25ae8" S = "${WORKDIR}/git" CARGO_SRC_DIR = "" PV = "0.1.0+git${SRCPV}" -SRC_URI += "\ +SRC_URI:append = " \ crate://crates.io/addr2line/0.22.0 \ crate://crates.io/adler/1.0.2 \ crate://crates.io/aead/0.3.2 \ From be19a667ae72894b025eeb1f6bd97aa06ab8156d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:03:51 +0100 Subject: [PATCH 11/32] meta-lxatac-{bsp,software}: Do not override FILES and append instead MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes oelint.var.filesoverride[1] warnings from oelint. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.var.filesoverride.md Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc | 2 +- .../recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb | 2 +- .../lxatac-persistent-journal/lxatac-persistent-journal.bb | 2 +- .../lxatac-persistent-labgrid-cache.bb | 2 +- .../lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb | 2 +- meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb | 2 +- meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb | 2 +- meta-lxatac-software/classes/panel-mipi-dbi.bbclass | 2 +- .../recipes-core/lxatac-profile/lxatac-profile.bb | 2 +- meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb | 2 +- .../recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc index e8226f17..9a7fad9b 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc @@ -123,7 +123,7 @@ do_install () { done fi } -FILES:${PN} = "${BAREBOX_INSTALL_PATH}" +FILES:${PN} += "${BAREBOX_INSTALL_PATH}" do_deploy () { if [ -n "${BAREBOX_BINARY}" ]; then diff --git a/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb b/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb index 48736709..e5a8f0a8 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb @@ -13,4 +13,4 @@ do_install() { install -D -m0644 ${WORKDIR}/01-switch.conf ${D}${sysconfdir}/lldpd.d/01-switch.conf } -FILES:${PN} = "${sysconfdir}/lldpd.d/" +FILES:${PN} += "${sysconfdir}/lldpd.d/" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb b/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb index bde0a8fb..74d17519 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb @@ -16,4 +16,4 @@ do_install () { install -m 0644 -t ${D}${systemd_system_unitdir}/ ${S}/var-log-journal.mount } -FILES:${PN} = "${systemd_system_unitdir}" +FILES:${PN} += "${systemd_system_unitdir}" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb b/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb index 4d44117c..962272a8 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-persistent-labgrid-cache/lxatac-persistent-labgrid-cache.bb @@ -18,4 +18,4 @@ do_install () { ${S}/use-var-cache-labgrid.conf } -FILES:${PN} = "${systemd_system_unitdir}" +FILES:${PN} += "${systemd_system_unitdir}" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb b/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb index f9936a56..78fcd95c 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-persistent-sysstat/lxatac-persistent-sysstat.bb @@ -20,4 +20,4 @@ do_install () { ${S}/use-var-log-sa.conf } -FILES:${PN} = "${systemd_system_unitdir}" +FILES:${PN} += "${systemd_system_unitdir}" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb b/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb index 3cfa9cdd..037935ed 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb @@ -27,7 +27,7 @@ do_install () { touch ${D}/system-update } -FILES:${PN} = "\ +FILES:${PN} += "\ /system-update \ ${libdir}/repart.d \ ${libdir}/systemd/system/systemd-repart.service.d \ diff --git a/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb b/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb index be6b6ef2..93512706 100644 --- a/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb +++ b/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb @@ -13,4 +13,4 @@ do_install () { install -D -m0644 ${WORKDIR}/01-watchdog.conf ${D}${systemd_unitdir}/system.conf.d/01-watchdog.conf } -FILES:${PN} = "${systemd_unitdir}/system.conf.d/" +FILES:${PN} += "${systemd_unitdir}/system.conf.d/" diff --git a/meta-lxatac-software/classes/panel-mipi-dbi.bbclass b/meta-lxatac-software/classes/panel-mipi-dbi.bbclass index 06c90081..3d2a38e7 100644 --- a/meta-lxatac-software/classes/panel-mipi-dbi.bbclass +++ b/meta-lxatac-software/classes/panel-mipi-dbi.bbclass @@ -45,4 +45,4 @@ do_install () { "${D}${nonarch_base_libdir}/firmware/${PANEL_FIRMWARE_BIN}" } -FILES:${PN} = "${nonarch_base_libdir}/firmware/" +FILES:${PN} += "${nonarch_base_libdir}/firmware/" diff --git a/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb b/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb index d637b0cd..108894a9 100644 --- a/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb +++ b/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb @@ -13,4 +13,4 @@ do_install () { install -m 0755 ${S}/01-labgrid.sh ${D}${sysconfdir}/profile.d/ } -FILES:${PN} = "${sysconfdir}/profile.d/01-labgrid.sh" +FILES:${PN} += "${sysconfdir}/profile.d/01-labgrid.sh" diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb b/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb index 180d7748..9c986fd3 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb @@ -42,4 +42,4 @@ do_install () { install -D -m0755 ${WORKDIR}/gadget-storage.sh ${D}${bindir}/tac-gadget-storage } -FILES:${PN} = "${bindir} ${datadir}" +FILES:${PN} += "${bindir} ${datadir}" diff --git a/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb b/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb index 72f1846b..9ecbe8a4 100644 --- a/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb +++ b/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb @@ -40,4 +40,4 @@ do_install() { cp -r "${WEBUI_INSTALL_DIR}/build" "${D}${datadir}/tacd/webui" } -FILES:${PN} = "${datadir}/tacd" +FILES:${PN} += "${datadir}/tacd" From b8781025666edc7adcaf411392b8b30810d61988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:05:08 +0100 Subject: [PATCH 12/32] meta-lxatac-bsp: lxatac-net-switch-hacks: Do not add sysconfdir to FILES MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This solves a oelint.vars.duplicate[1] oelint warning because sysconfdir is already included in FILES by default. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.vars.duplicate.md Signed-off-by: Leonard Göhrs --- .../lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb index bbe2fb1c..f02e8eac 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb @@ -39,7 +39,4 @@ SYSTEMD_SERVICE:${PN} = "spi-irq-prio-44009000.service" # For pgrep and chrt in spi-irq-prio-44009000.service RDEPENDS:${PN} += "busybox util-linux" -FILES:${PN} += "\ - ${libdir}/sysctl.d/ \ - ${sysconfdir} \ -" +FILES:${PN} += "${libdir}/sysctl.d/" From e29005d5662f6dea16b32602349f2b215f3f78bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:08:36 +0100 Subject: [PATCH 13/32] meta-lxatac-bsp: arm-trusted-firmware-a: Do not override variables in .inc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes oelint.var.override[1] oelint errors because both the .inc file and the .bb that includes set the same variable. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.var.override.md Signed-off-by: Leonard Göhrs --- .../arm-trusted-firmware-a/arm-trusted-firmware-a.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/arm-trusted-firmware-a.inc b/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/arm-trusted-firmware-a.inc index d0553f41..cccc1b72 100644 --- a/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/arm-trusted-firmware-a.inc +++ b/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/arm-trusted-firmware-a.inc @@ -1,4 +1,4 @@ -SUMMARY = "ARM Trusted Firmware-A" +SUMMARY ?= "ARM Trusted Firmware-A" DESCRIPTION = "\ Trusted Firmware-A (TF-A) is a reference implementation of secure world \ software for Arm A-Profile architectures (Armv8-A and Armv7-A), including \ @@ -17,9 +17,9 @@ LICENSE = "\ Zlib & \ (GPL-2.0-only | GPL-3.0-only | BSD-3-Clause) \ " -LIC_FILES_CHKSUM = "file://docs/license.rst;md5=713afe122abbe07f067f939ca3c480c5" +LIC_FILES_CHKSUM ?= "file://docs/license.rst;md5=713afe122abbe07f067f939ca3c480c5" -DEPENDS = "dtc-native" +DEPENDS += "dtc-native" PROVIDES = "virtual/ARM-tf-a" SRC_URI = "git://review.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;branch=master" @@ -29,8 +29,8 @@ B = "${WORKDIR}/build" inherit deploy -COMPATIBLE_MACHINE = "none" -PLATFORM = "none" +COMPATIBLE_MACHINE ?= "none" +PLATFORM ?= "none" EXTRA_OEMAKE = "\ BUILD_BASE=${B} \ From 4dad2f0c3ddbb35ce18a07cba0ef26d0abcc9559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:16:20 +0100 Subject: [PATCH 14/32] meta-lxatac-bsp: barebox: add oelint exception for require image-uefi.conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This silences a oelint.file.requirenotfound[1] oelint warning about the file not being found. The files does however exist in `poky/meta/conf/image-uefi.conf` and is actually found and required while building. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.file.requirenotfound.md Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc index 9a7fad9b..25345ef7 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192" PACKAGE_ARCH = "${MACHINE_ARCH}" +# nooelint: oelint.file.requirenotfound require conf/image-uefi.conf inherit kernel-arch deploy cml1 pkgconfig From ae44f64f301e01e3033ad217df3fd821a16c54ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:19:58 +0100 Subject: [PATCH 15/32] meta-lxatac-bsp: barebox: use DEPENDS:append instead of assign in .inc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a oelint.vars.dependsappend[1] oelint error. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.vars.dependsappend.md Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc index 25345ef7..b5b34d4d 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc @@ -17,7 +17,7 @@ inherit kernel-arch deploy cml1 pkgconfig # be enabled within the defconfig file so depend on it here to be more user # friendly (do not abort the build). The actual tools are provided by the # barebox-tools package. -DEPENDS = "bison-native flex-native libusb1" +DEPENDS:append = " bison-native flex-native libusb1" export KBUILD_BUILD_USER ?= "oe-user" export KBUILD_BUILD_HOST ?= "oe-host" From d34f86fdb34d58b9ba5f2d3c48f5a7cc293cee6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:23:08 +0100 Subject: [PATCH 16/32] meta-lxatac-bsp: barebox: add documentation for the do_copy_fw task MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a oelint.task.docstrings[1] oelint info message. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.task.docstrings.md Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb index acd8f20e..301c850f 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb @@ -30,6 +30,7 @@ do_deploy:append () { DEPENDS:append = " panel-shineworld-lh133k" +do_copy_fw[doc] = "Copy the LCD display firmware to the barebox env" do_copy_fw() { mkdir -p ${WORKDIR}/env/firmware/ cp ${RECIPE_SYSROOT}${nonarch_base_libdir}/firmware/shineworld,lh133k.bin ${WORKDIR}/env/firmware/ From 691c4bc0c73e8ba348c3a4d83281ae71fcc3e34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:25:28 +0100 Subject: [PATCH 17/32] meta-lxatac-bsp: linux-lxatac: add documentation for the do_copy_fw task MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a oelint.task.docstrings[1] oelint info message. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.task.docstrings.md Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb b/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb index df87874b..0e550b5d 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb +++ b/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb @@ -28,6 +28,7 @@ DEPENDS:append = " panel-shineworld-lh133k coreutils-native" # Some options depend on CONFIG_PAHOLE_VERSION, so need to make pahole-native available before do_kernel_configme do_kernel_configme[depends] += "pahole-native:do_populate_sysroot" +do_copy_fw[doc] = "Copy the LCD display firmware to the kernel source to be compiled in" do_copy_fw() { mkdir -p ${S}/firmware/ cp ${RECIPE_SYSROOT}${nonarch_base_libdir}/firmware/shineworld,lh133k.bin ${S}/firmware/ From f4aaf208e2a2b56ab74244febd23f40a8bfd88bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 14:06:55 +0100 Subject: [PATCH 18/32] meta-lxatac-software: tacd-webinterface: add docs for the do_copy_fw task MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a oelint.task.docstrings[1] oelint info message. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.task.docstrings.md Signed-off-by: Leonard Göhrs --- .../recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb b/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb index 9ecbe8a4..74b33b53 100644 --- a/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb +++ b/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb @@ -21,6 +21,7 @@ RDEPENDS:${PN}:remove = "nodejs" WEBUI_INSTALL_DIR = "${NPM_BUILD}/lib/node_modules/tacd-web" +npm_run_build[doc] = "Run the build script that transpiles the source typescript to javascript" npm_run_build () { cd "${WEBUI_INSTALL_DIR}" npm run build From 94ce07ac4c7936b24b24064f02c14305be55993c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:27:49 +0100 Subject: [PATCH 19/32] meta-lxatac-bsp: fiptool-native: use inherit_defer native MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes an oelint.var.inheritdevtool[1] oelint warning. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.var.inheritdevtool.md Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb b/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb index 7917f588..427f524d 100644 --- a/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb +++ b/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb @@ -12,7 +12,7 @@ SRCREV = "a921da5ed29fa3bb295b18349bc5e03dcab3fa6d" DEPENDS += "openssl-native" -inherit native +inherit_defer native EXTRA_OEMAKE = "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}" From 83e89c9b6c28e7e9110f3d37cf6b46f2e63f8905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:29:53 +0100 Subject: [PATCH 20/32] meta-lxatac-software: panel-mipi-dbi-native: use inherit_defer native MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes an oelint.var.inheritdevtool[1] oelint warning. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.var.inheritdevtool.md Signed-off-by: Leonard Göhrs --- .../panel-mipi-dbi/panel-mipi-dbi-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb index 0e88e84a..6c40bdde 100644 --- a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb +++ b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb @@ -17,7 +17,7 @@ SRC_URI = "git://github.com/notro/panel-mipi-dbi.git;protocol=https;branch=main" S = "${WORKDIR}/git" -inherit native +inherit_defer native do_configure[noexec] = "1" do_compile[noexec] = "1" From c7a07b673bce816517ae3cb3333223ec7eed498b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:32:33 +0100 Subject: [PATCH 21/32] meta-lxatac-bsp: lxatac-net-switch-hacks: depend on util-linux-chrt only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of the whole util-linux suite. Signed-off-by: Leonard Göhrs --- .../lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb index f02e8eac..259768a2 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb @@ -37,6 +37,6 @@ do_install() { SYSTEMD_SERVICE:${PN} = "spi-irq-prio-44009000.service" # For pgrep and chrt in spi-irq-prio-44009000.service -RDEPENDS:${PN} += "busybox util-linux" +RDEPENDS:${PN} += "busybox util-linux-chrt" FILES:${PN} += "${libdir}/sysctl.d/" From 0bc4ab574f4e1cef1b1994025ad090b2c8907fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:41:35 +0100 Subject: [PATCH 22/32] meta-lxatac-bsp: linux-lxatac: disable oelint for false positive MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Oelint warns about a possible oelint.vars.downloadfilename[1] problem because the download URL does not include `${PV}`. The download does however include the version via `${LINUX_VERSION}`, so we we are fine here. https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.vars.downloadfilename.md Signed-off-by: Leonard Göhrs --- meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb b/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb index 0e550b5d..4b6ba69e 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb +++ b/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb @@ -7,6 +7,7 @@ SECTION = "kernel" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +# nooelint: oelint.vars.downloadfilename SRC_URI = "https://www.kernel.org/pub/linux/kernel/v6.x/linux-${LINUX_VERSION}.tar.xz \ file://defconfig \ " From 78e03bbcbfee7f806c95531933018227755e5d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:46:20 +0100 Subject: [PATCH 23/32] meta-lxatac-software: github-act-runner: ignore do_compile[network] oelint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ignores a valid oelint warning about `do_compile[network] = "1"` in the form of oelint.task.network[1]. This is sadly a common problem with Go code. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.task.network.md Signed-off-by: Leonard Göhrs --- .../recipes-devtools/github-act-runner/github-act-runner.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc b/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc index ac7191f2..123c9f9d 100644 --- a/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc +++ b/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc @@ -21,6 +21,7 @@ SYSTEMD_SERVICE:${PN} = "github-act-runner.service" # This is required because the go build system fetches dependencies in the # compile stage. +# nooelint: oelint.task.network do_compile[network] = "1" do_install:append() { From 3517acd4296564b32dc5bfada2ece70ffb4dba0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:48:10 +0100 Subject: [PATCH 24/32] meta-lxatac-software: gitlab-runner: ignore do_compile[network] oelint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ignores a valid oelint warning about `do_compile[network] = "1"` in the form of oelint.task.network[1]. This is sadly a common problem with Go code. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.task.network.md Signed-off-by: Leonard Göhrs --- .../recipes-devtools/gitlab-runner/gitlab-runner.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc b/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc index 4796c72c..beb39ce8 100644 --- a/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc +++ b/meta-lxatac-software/recipes-devtools/gitlab-runner/gitlab-runner.inc @@ -18,6 +18,7 @@ SYSTEMD_SERVICE:${PN} = "gitlab-runner.service" # This is required because the go build system fetches dependencies in the # compile stage. +# nooelint: oelint.task.network do_compile[network] = "1" # This is required to prevent build failures due to From cf26f8194472212d3bc9b527449d032f8ff06907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:50:58 +0100 Subject: [PATCH 25/32] meta-lxatac-software: classes: panel-mipi-dbi rename to panel_mipi_dbi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes an oelint.bbclass.underscores[1] error: > Bitbake tries to create shell and/or python functions out of the base > name of the class when using EXPORT_FUNCTIONS in this particular class. > `-` is unfortunately not a valid symbol in neither shell nor python. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.bbclass.underscores.md Signed-off-by: Leonard Göhrs --- .../classes/{panel-mipi-dbi.bbclass => panel_mipi_dbi.bbclass} | 2 +- .../recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta-lxatac-software/classes/{panel-mipi-dbi.bbclass => panel_mipi_dbi.bbclass} (97%) diff --git a/meta-lxatac-software/classes/panel-mipi-dbi.bbclass b/meta-lxatac-software/classes/panel_mipi_dbi.bbclass similarity index 97% rename from meta-lxatac-software/classes/panel-mipi-dbi.bbclass rename to meta-lxatac-software/classes/panel_mipi_dbi.bbclass index 3d2a38e7..0aa9c1cf 100644 --- a/meta-lxatac-software/classes/panel-mipi-dbi.bbclass +++ b/meta-lxatac-software/classes/panel_mipi_dbi.bbclass @@ -20,7 +20,7 @@ # the `panel-mipi-dbi` driver looks something like this: # # $ cat panel-shineworld-lh133k.bb -# inherit panel-mipi-dbi +# inherit panel_mipi_dbi # # SRC_URI = "file://${PANEL_FIRMWARE}" # diff --git a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb index e175fb34..1b68f970 100644 --- a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb +++ b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-shineworld-lh133k.bb @@ -1,4 +1,4 @@ -inherit panel-mipi-dbi +inherit panel_mipi_dbi SUMMARY = "Shineworld Panel Configuration" LICENSE = "MIT" From c2caf2702c7e69d78ff25fa9eef2ad0dcd38817b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:54:22 +0100 Subject: [PATCH 26/32] meta-lxatac-software: rkdeveloptool: add upstream status to Makefile patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch turns off a type of compiler warning that should rather be fixed in the software intself, hence why it is inappropraite for upstreaming. This fixes a oelint.file.upstreamstatus[1] oelint info message. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.file.upstreamstatus.md Signed-off-by: Leonard Göhrs --- .../0001-Makefile-disable-format-truncation-errors.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-lxatac-software/recipes-devtools/rkdeveloptool/rkdeveloptool/0001-Makefile-disable-format-truncation-errors.patch b/meta-lxatac-software/recipes-devtools/rkdeveloptool/rkdeveloptool/0001-Makefile-disable-format-truncation-errors.patch index 5caa8558..bafe7a0a 100644 --- a/meta-lxatac-software/recipes-devtools/rkdeveloptool/rkdeveloptool/0001-Makefile-disable-format-truncation-errors.patch +++ b/meta-lxatac-software/recipes-devtools/rkdeveloptool/rkdeveloptool/0001-Makefile-disable-format-truncation-errors.patch @@ -10,6 +10,7 @@ The build fails with current compilers due to format-truncation errors. Ignore them for now. Signed-off-by: Leonard Göhrs +Upstream-Status: Inappropriate --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) From f62259ded2b052f691ad83f1cc15d2f7e3f87e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 13:59:12 +0100 Subject: [PATCH 27/32] meta-lxatac-software: bottom: remove require of non-existant files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a oelint.file.requirenotfound[1] oelint warning. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.file.requirenotfound.md Signed-off-by: Leonard Göhrs --- meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb b/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb index 88f3c3b8..ca3f9267 100644 --- a/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb +++ b/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb @@ -454,9 +454,3 @@ LIC_FILES_CHKSUM = "\ SUMMARY = "A customizable cross-platform graphical process/system monitor for the terminal." HOMEPAGE = "https://github.com/ClementTsang/bottom" LICENSE = "MIT" - -# includes this file if it exists but does not fail -# this is useful for anything you may want to override from -# what cargo-bitbake generates. -include bottom-${PV}.inc -include bottom.inc From 357f3b998a2b98345d1b535d9355b082648b91bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 14:00:45 +0100 Subject: [PATCH 28/32] meta-lxatac-software: tacd: use require for existing files only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a oelint.file.requirenotfound[1] oelint warning for the non-existing tacd-${PV}.inc file and a oelint.file.requireinclude[2] warning for the tacd.inc file. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.file.requirenotfound.md [2]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.file.requireinclude.md Signed-off-by: Leonard Göhrs --- meta-lxatac-software/recipes-rust/tacd/tacd_git.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb b/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb index e2237c98..fd81f7be 100644 --- a/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb +++ b/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb @@ -712,8 +712,4 @@ SUMMARY = "The LXA TAC System Daemon" HOMEPAGE = "https://github.com/linux-automation/tacd" LICENSE = "GPL-2.0-or-later" -# includes this file if it exists but does not fail -# this is useful for anything you may want to override from -# what cargo-bitbake generates. -include tacd-${PV}.inc -include tacd.inc +require tacd.inc From 20779541bfdcd81723a1dfac7b171dfd11766919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 14:02:51 +0100 Subject: [PATCH 29/32] meta-lxatac-software: ripgrep: remove require of non-existant files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a oelint.file.requirenotfound[1] oelint warning. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.file.requirenotfound.md Signed-off-by: Leonard Göhrs --- meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb b/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb index cdab65c5..e5912a17 100644 --- a/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb +++ b/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb @@ -121,9 +121,3 @@ LIC_FILES_CHKSUM = "\ SUMMARY = "ripgrep is a line-oriented recursive search tool searching for regex patterns" HOMEPAGE = "https://github.com/BurntSushi/ripgrep" LICENSE = "Unlicense | MIT" - -# includes this file if it exists but does not fail -# this is useful for anything you may want to override from -# what cargo-bitbake generates. -include ripgrep-${PV}.inc -include ripgrep.inc From c30ee39e871de76c52d51bf2ed3e2de75cc83911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 14:20:56 +0100 Subject: [PATCH 30/32] meta-lxatac-software: tac-gadget: Do not add bindir to FILES MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This solves a oelint.vars.duplicate[1] oelint warning because bindir is already included in FILES by default. [1]: https://github.com/priv-kweihmann/oelint-adv/blob/master/docs/wiki/oelint.vars.duplicate.md Signed-off-by: Leonard Göhrs --- meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb b/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb index 9c986fd3..e3d090d6 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb @@ -42,4 +42,4 @@ do_install () { install -D -m0755 ${WORKDIR}/gadget-storage.sh ${D}${bindir}/tac-gadget-storage } -FILES:${PN} += "${bindir} ${datadir}" +FILES:${PN} += "${datadir}" From f0dceccf247feec7339a1bd4b629b7cd4f763e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 20 Dec 2024 10:52:33 +0100 Subject: [PATCH 31/32] meta-lxatac-{bsp, software}: order variables according to oelint.var.order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This gives the variables a canonical order. Signed-off-by: Leonard Göhrs --- .../barebox/barebox-tools_2024.10.0.bb | 3 ++- .../recipes-bsp/barebox/barebox.inc | 23 ++++++++--------- .../recipes-bsp/barebox/barebox_2024.10.0.bb | 4 +-- .../lxatac-factory-data.bb | 8 +++--- .../lxatac-net-switch-hacks.bb | 4 +-- .../lxatac-repart/lxatac-repart.bb | 3 +-- .../fiptool/fiptool-native_git.bb | 7 +++--- .../recipes-kernel/linux/linux-lxatac.bb | 17 +++++++------ .../lxatac-profile/lxatac-profile.bb | 4 +-- .../recipes-devtools/bcu/bcu_1.1.100.bb | 4 +-- .../containers/container-control.bb | 10 ++++---- .../github-act-runner/github-act-runner.inc | 6 ++--- .../rkdeveloptool/rkdeveloptool_1.32.bb | 4 +-- .../recipes-devtools/tac-gadget/tac-gadget.bb | 20 +++++++-------- .../panel-mipi-dbi-native_git.bb | 2 +- .../recipes-rust/bottom/bottom_0.10.2.bb | 25 +++++++++---------- .../recipes-rust/ripgrep/ripgrep_14.1.1.bb | 20 ++++++++------- .../recipes-rust/tacd/tacd.inc | 4 +-- .../recipes-rust/tacd/tacd_git.bb | 19 +++++++------- .../imx-uuu/imx-uuu_1.5.182.bb | 9 +++---- .../tacd-webinterface_git.bb | 19 +++++++------- 21 files changed, 107 insertions(+), 108 deletions(-) diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb index 180ca949..59bd5772 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb @@ -5,13 +5,14 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192" DEPENDS = "bison-native flex-native libusb1 libusb1-native lzop-native pkgconfig-native" -BBCLASSEXTEND = "native" SRC_URI = "http://barebox.org/download/barebox-${PV}.tar.bz2" SRC_URI[sha256sum] = "955b20bfa7358732d2c0c09ccfd4c1a69087b7e2c610b16dee7442d71a5af88d" S = "${WORKDIR}/barebox-${PV}" +BBCLASSEXTEND = "native" + EXTRA_OEMAKE = "\ ARCH=sandbox \ CROSS_COMPILE=${TARGET_PREFIX} -C ${S} O=${B} \ diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc index b5b34d4d..7965528e 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc @@ -1,32 +1,31 @@ SUMMARY = "barebox is a bootloader designed for embedded systems." HOMEPAGE = "https://barebox.org/" SECTION = "bootloaders" -PROVIDES = "virtual/bootloader" - LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -# nooelint: oelint.file.requirenotfound -require conf/image-uefi.conf - -inherit kernel-arch deploy cml1 pkgconfig - # libusb1 is only required for usb tools like imx-usb-loader. These tools may # be enabled within the defconfig file so depend on it here to be more user # friendly (do not abort the build). The actual tools are provided by the # barebox-tools package. DEPENDS:append = " bison-native flex-native libusb1" - -export KBUILD_BUILD_USER ?= "oe-user" -export KBUILD_BUILD_HOST ?= "oe-host" +PROVIDES = "virtual/bootloader" SRC_URI = "https://barebox.org/download/barebox-${PV}.tar.bz2" S = "${WORKDIR}/barebox-${PV}" B = "${WORKDIR}/build" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +# nooelint: oelint.file.requirenotfound +require conf/image-uefi.conf + +inherit kernel-arch deploy cml1 pkgconfig + +export KBUILD_BUILD_USER ?= "oe-user" +export KBUILD_BUILD_HOST ?= "oe-host" + def get_layer_rev(path): try: rev, _ = bb.process.run("git describe --match='' --always --dirty --broken", cwd=path) diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb index 301c850f..4ab338f3 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb @@ -6,6 +6,8 @@ # included. require barebox.inc +DEPENDS:append = " panel-shineworld-lh133k" + SRC_URI:append = " \ file://defconfig \ file://env \ @@ -28,8 +30,6 @@ do_deploy:append () { done } -DEPENDS:append = " panel-shineworld-lh133k" - do_copy_fw[doc] = "Copy the LCD display firmware to the barebox env" do_copy_fw() { mkdir -p ${WORKDIR}/env/firmware/ diff --git a/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb b/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb index 100861ea..575d8a08 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb @@ -1,12 +1,10 @@ +SUMMARY = "Read out and distribute factory data from the devicetree" + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SUMMARY = "Read out and distribute factory data from the devicetree" - inherit allarch systemd -RDEPENDS:${PN} = "bash" - SYSTEMD_SERVICE:${PN} = "lxatac-factory-data.service" SRC_URI:append = " \ @@ -14,6 +12,8 @@ SRC_URI:append = " \ file://lxatac-factory-data.sh \ " +RDEPENDS:${PN} = "bash" + do_install() { install -m 0644 -D ${WORKDIR}/lxatac-factory-data.service ${D}${systemd_system_unitdir}/lxatac-factory-data.service install -m 0755 -D ${WORKDIR}/lxatac-factory-data.sh ${D}${sbindir}/lxatac-factory-data diff --git a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb index 259768a2..e3d96e03 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb @@ -36,7 +36,7 @@ do_install() { SYSTEMD_SERVICE:${PN} = "spi-irq-prio-44009000.service" +FILES:${PN} += "${libdir}/sysctl.d/" + # For pgrep and chrt in spi-irq-prio-44009000.service RDEPENDS:${PN} += "busybox util-linux-chrt" - -FILES:${PN} += "${libdir}/sysctl.d/" diff --git a/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb b/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb index 037935ed..32dae6b0 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb @@ -10,8 +10,6 @@ SRC_URI = "\ S = "${WORKDIR}" -RDEPENDS:${PN} = "systemd" - do_install () { install -d ${D}${libdir}/systemd/system/systemd-repart.service.d/ install -m 0644 -t ${D}${libdir}/systemd/system/systemd-repart.service.d/ ${S}/*.conf @@ -33,3 +31,4 @@ FILES:${PN} += "\ ${libdir}/systemd/system/systemd-repart.service.d \ " +RDEPENDS:${PN} = "systemd" diff --git a/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb b/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb index 427f524d..1b32fcf2 100644 --- a/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb +++ b/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb @@ -4,14 +4,13 @@ SUMMARY = "fiptool - Trusted Firmware tool for packaging" LICENSE = "BSD-3-Clause" - -SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;destsuffix=fiptool-${PV};protocol=https;branch=master" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" -SRCREV = "a921da5ed29fa3bb295b18349bc5e03dcab3fa6d" - DEPENDS += "openssl-native" +SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;destsuffix=fiptool-${PV};protocol=https;branch=master" +SRCREV = "a921da5ed29fa3bb295b18349bc5e03dcab3fa6d" + inherit_defer native EXTRA_OEMAKE = "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}" diff --git a/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb b/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb index 4b6ba69e..9398929b 100644 --- a/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb +++ b/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb @@ -7,6 +7,13 @@ SECTION = "kernel" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +# The coreutils-native dependency is required since kernel 6.11, +# which uses the `truncate` tool in a script. +# It can likely be removed again once the kernel.bbclass is updated. +DEPENDS:append = " panel-shineworld-lh133k coreutils-native" + +PV = "${UMPF_PV}" + # nooelint: oelint.vars.downloadfilename SRC_URI = "https://www.kernel.org/pub/linux/kernel/v6.x/linux-${LINUX_VERSION}.tar.xz \ file://defconfig \ @@ -14,17 +21,11 @@ SRC_URI = "https://www.kernel.org/pub/linux/kernel/v6.x/linux-${LINUX_VERSION}.t SRC_URI[sha256sum] = "b1a2562be56e42afb3f8489d4c2a7ac472ac23098f1ef1c1e40da601f54625eb" -require files/patches/series.inc - -PV = "${UMPF_PV}" S = "${WORKDIR}/linux-${LINUX_VERSION}" -COMPATIBLE_MACHINE = "lxatac" +require files/patches/series.inc -# The coreutils-native dependency is required since kernel 6.11, -# which uses the `truncate` tool in a script. -# It can likely be removed again once the kernel.bbclass is updated. -DEPENDS:append = " panel-shineworld-lh133k coreutils-native" +COMPATIBLE_MACHINE = "lxatac" # Some options depend on CONFIG_PAHOLE_VERSION, so need to make pahole-native available before do_kernel_configme do_kernel_configme[depends] += "pahole-native:do_populate_sysroot" diff --git a/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb b/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb index 108894a9..a55fc1a3 100644 --- a/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb +++ b/meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb @@ -6,11 +6,11 @@ SRC_URI = "file://01-labgrid.sh" S = "${WORKDIR}" -RDEPENDS:${PN} = "bash" - do_install () { install -d ${D}${sysconfdir}/profile.d/ install -m 0755 ${S}/01-labgrid.sh ${D}${sysconfdir}/profile.d/ } FILES:${PN} += "${sysconfdir}/profile.d/01-labgrid.sh" + +RDEPENDS:${PN} = "bash" diff --git a/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.100.bb b/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.100.bb index 9770b199..1f51a2fa 100644 --- a/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.100.bb +++ b/meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.100.bb @@ -9,6 +9,8 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=884d48c2aa7b82e1ad4a33909fab24b6" +DEPENDS = "curl libftdi libusb1 libyaml openssl" + SRC_URI = "git://github.com/nxp-imx/bcu;protocol=https;branch=master \ file://0001-CMakeLists-do-not-use-vendored-libcurl.patch \ " @@ -16,8 +18,6 @@ SRCREV = "c34d89b29f3d0d12793cd78b194d2f1d11728baf" S = "${WORKDIR}/git" -DEPENDS = "curl libftdi libusb1 libyaml openssl" - inherit cmake pkgconfig BBCLASSEXTEND = "native nativesdk" diff --git a/meta-lxatac-software/recipes-devtools/containers/container-control.bb b/meta-lxatac-software/recipes-devtools/containers/container-control.bb index 7a34ea8d..c5b40ed9 100644 --- a/meta-lxatac-software/recipes-devtools/containers/container-control.bb +++ b/meta-lxatac-software/recipes-devtools/containers/container-control.bb @@ -5,16 +5,16 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit allarch -RDEPENDS:${PN} = "\ - podman \ - wget \ -" - SRC_URI = "\ file://container-start.sh \ file://container-update.sh \ " +RDEPENDS:${PN} = "\ + podman \ + wget \ +" + do_install() { install -D -m0755 ${WORKDIR}/container-start.sh ${D}${bindir}/container-start install -D -m0755 ${WORKDIR}/container-update.sh ${D}${bindir}/container-update diff --git a/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc b/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc index 123c9f9d..10c1ec78 100644 --- a/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc +++ b/meta-lxatac-software/recipes-devtools/github-act-runner/github-act-runner.inc @@ -1,14 +1,14 @@ SUMMARY = "GitHub act Runner" DESCRIPTION = "Alternative implementation of the GitHub Action runner protocol written in Go" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + SRC_URI = "\ git://github.com/ChristopherHX/github-act-runner.git;branch=main;protocol=https \ file://github-act-runner.service \ " -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - inherit go-mod inherit systemd diff --git a/meta-lxatac-software/recipes-devtools/rkdeveloptool/rkdeveloptool_1.32.bb b/meta-lxatac-software/recipes-devtools/rkdeveloptool/rkdeveloptool_1.32.bb index dff1e25f..16e7929e 100644 --- a/meta-lxatac-software/recipes-devtools/rkdeveloptool/rkdeveloptool_1.32.bb +++ b/meta-lxatac-software/recipes-devtools/rkdeveloptool/rkdeveloptool_1.32.bb @@ -6,6 +6,8 @@ SECTION = "devel" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://license.txt;md5=ea9445d9cc03d508cf6bb769d15a54ef" +DEPENDS = "libusb1 udev" + SRC_URI = "git://github.com/rockchip-linux/rkdeveloptool.git;protocol=https;branch=master \ file://0001-Makefile-disable-format-truncation-errors.patch \ " @@ -14,6 +16,4 @@ SRCREV = "46bb4c073624226c3f05b37b9ecc50bbcf543f5a" S = "${WORKDIR}/git" -DEPENDS = "libusb1 udev" - inherit autotools pkgconfig diff --git a/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb b/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb index e3d090d6..aae3c13f 100644 --- a/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb +++ b/meta-lxatac-software/recipes-devtools/tac-gadget/tac-gadget.bb @@ -1,16 +1,10 @@ -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - SUMMARY = "Export USB Gadget functions over the TAC USB-C connector" -PACKAGE_ARCH = "${MACHINE_ARCH}" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" INHIBIT_DEFAULT_DEPS = "1" -RDEPENDS:${PN} = "\ - bash \ -" - SRC_URI = "\ file://gadget-audio.sh \ file://gadget-common.sh \ @@ -26,6 +20,14 @@ SRC_URI = "\ file://gadget-storage.sh \ " +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FILES:${PN} += "${datadir}" + +RDEPENDS:${PN} = "\ + bash \ +" + do_install () { install -D -m0644 ${WORKDIR}/gadget-common.sh ${D}${datadir}/gadget/gadget-common install -D -m0644 ${WORKDIR}/gadget-reports.sh ${D}${datadir}/gadget/gadget-reports @@ -41,5 +43,3 @@ do_install () { install -D -m0755 ${WORKDIR}/gadget-serial.sh ${D}${bindir}/tac-gadget-serial install -D -m0755 ${WORKDIR}/gadget-storage.sh ${D}${bindir}/tac-gadget-storage } - -FILES:${PN} += "${datadir}" diff --git a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb index 6c40bdde..e7c79e9b 100644 --- a/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb +++ b/meta-lxatac-software/recipes-graphics/panel-mipi-dbi/panel-mipi-dbi-native_git.bb @@ -11,9 +11,9 @@ HOMEPAGE = "https://github.com/notro/panel-mipi-dbi" SECTION = "graphics" LICENSE = "CC0-1.0" LIC_FILES_CHKSUM = "file://mipi-dbi-cmd;beginline=4;endline=13;md5=5e3d3f14cc87aa9e8976d728520cbcae" -SRCREV = "1cbd40135a8c7f25d7b444a7fac77fd3c3ad471e" SRC_URI = "git://github.com/notro/panel-mipi-dbi.git;protocol=https;branch=main" +SRCREV = "1cbd40135a8c7f25d7b444a7fac77fd3c3ad471e" S = "${WORKDIR}/git" diff --git a/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb b/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb index ca3f9267..b2a46790 100644 --- a/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb +++ b/meta-lxatac-software/recipes-rust/bottom/bottom_0.10.2.bb @@ -1,17 +1,20 @@ -inherit cargo +SUMMARY = "A customizable cross-platform graphical process/system monitor for the terminal." +HOMEPAGE = "https://github.com/ClementTsang/bottom" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d45cffa3a75da17d285cc60c0c458cc" -SRC_URI:append = " \ - git://github.com/ClementTsang/bottom.git;protocol=https;branch=main \ -" -SRCREV = "2ec1fb56c9db0b37acc4eca3230adfb52720376b" -S = "${WORKDIR}/git" -CARGO_SRC_DIR = "" +inherit cargo # The bottom Cargo.toml strips release builds, why makes it hard to debug. # Yocto has its own stripping feature, that preserves the debug symbols but # only installs the stripped version. # Pre-stripped binaries trigger a yocto QA error. CARGO_BUILD_FLAGS += "--config profile.release.strip=false" +CARGO_SRC_DIR = "" + +SRC_URI:append = " \ + git://github.com/ClementTsang/bottom.git;protocol=https;branch=main \ +" SRC_URI:append = " \ crate://crates.io/addr2line/0.22.0 \ @@ -447,10 +450,6 @@ SRC_URI[wrapcenum-derive-0.4.1.sha256sum] = "a76ff259533532054cfbaefb115c613203c SRC_URI[zerocopy-derive-0.7.35.sha256sum] = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" SRC_URI[zerocopy-0.7.35.sha256sum] = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -LIC_FILES_CHKSUM = "\ - file://LICENSE;md5=5d45cffa3a75da17d285cc60c0c458cc \ -" +SRCREV = "2ec1fb56c9db0b37acc4eca3230adfb52720376b" -SUMMARY = "A customizable cross-platform graphical process/system monitor for the terminal." -HOMEPAGE = "https://github.com/ClementTsang/bottom" -LICENSE = "MIT" +S = "${WORKDIR}/git" diff --git a/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb b/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb index e5912a17..b167bd69 100644 --- a/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb +++ b/meta-lxatac-software/recipes-rust/ripgrep/ripgrep_14.1.1.bb @@ -1,10 +1,17 @@ +SUMMARY = "ripgrep is a line-oriented recursive search tool searching for regex patterns" +HOMEPAGE = "https://github.com/BurntSushi/ripgrep" +LICENSE = "Unlicense | MIT" +LIC_FILES_CHKSUM = "\ + file://LICENSE-MIT;md5=8d0d0aa488af0ab9aafa3b85a7fc8e12 \ + file://UNLICENSE;md5=7246f848faa4e9c9fc0ea91122d6e680 \ +" + inherit cargo SRC_URI:append = " \ git://github.com/BurntSushi/ripgrep.git;protocol=https;branch=master \ " -SRCREV = "4649aa9700619f94cf9c66876e9549d83420e16c" -S = "${WORKDIR}/git" + CARGO_SRC_DIR = "" SRC_URI:append = " \ @@ -113,11 +120,6 @@ SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de3 SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -LIC_FILES_CHKSUM = "\ - file://LICENSE-MIT;md5=8d0d0aa488af0ab9aafa3b85a7fc8e12 \ - file://UNLICENSE;md5=7246f848faa4e9c9fc0ea91122d6e680 \ -" +SRCREV = "4649aa9700619f94cf9c66876e9549d83420e16c" -SUMMARY = "ripgrep is a line-oriented recursive search tool searching for regex patterns" -HOMEPAGE = "https://github.com/BurntSushi/ripgrep" -LICENSE = "Unlicense | MIT" +S = "${WORKDIR}/git" diff --git a/meta-lxatac-software/recipes-rust/tacd/tacd.inc b/meta-lxatac-software/recipes-rust/tacd/tacd.inc index 8a3f4b6e..40ee5e0f 100644 --- a/meta-lxatac-software/recipes-rust/tacd/tacd.inc +++ b/meta-lxatac-software/recipes-rust/tacd/tacd.inc @@ -1,3 +1,5 @@ +DEPENDS:append = " libiio " + SRC_URI:append = " \ file://tacd.service \ file://tacd-failsafe.sh \ @@ -9,8 +11,6 @@ SRC_URI:append = " \ inherit pkgconfig inherit systemd -DEPENDS:append = " libiio " - SYSTEMD_SERVICE:${PN} = "tacd.service" do_install:append() { diff --git a/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb b/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb index fd81f7be..ce6c0921 100644 --- a/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb +++ b/meta-lxatac-software/recipes-rust/tacd/tacd_git.bb @@ -1,14 +1,19 @@ +SUMMARY = "The LXA TAC system daemon" +HOMEPAGE = "https://github.com/linux-automation/tacd" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + inherit cargo DEFAULT_PREFERENCE = "-1" +PV = "0.1.0+git${SRCPV}" + SRC_URI:append = " \ git://github.com/linux-automation/tacd.git;protocol=https;branch=main \ " -SRCREV = "e79b017da65f4a084a8b24f1118e15b0c3f25ae8" -S = "${WORKDIR}/git" + CARGO_SRC_DIR = "" -PV = "0.1.0+git${SRCPV}" SRC_URI:append = " \ crate://crates.io/addr2line/0.22.0 \ @@ -704,12 +709,8 @@ SRC_URI[zvariant-3.15.2.sha256sum] = "4eef2be88ba09b358d3b58aca6e41cd853631d4478 SRC_URI[zvariant_derive-3.15.2.sha256sum] = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" SRC_URI[zvariant_utils-1.0.1.sha256sum] = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" -LIC_FILES_CHKSUM = "\ - file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ -" +SRCREV = "e79b017da65f4a084a8b24f1118e15b0c3f25ae8" -SUMMARY = "The LXA TAC System Daemon" -HOMEPAGE = "https://github.com/linux-automation/tacd" -LICENSE = "GPL-2.0-or-later" +S = "${WORKDIR}/git" require tacd.inc diff --git a/meta-lxatac-software/recipes-support/imx-uuu/imx-uuu_1.5.182.bb b/meta-lxatac-software/recipes-support/imx-uuu/imx-uuu_1.5.182.bb index 90e23311..522f038f 100644 --- a/meta-lxatac-software/recipes-support/imx-uuu/imx-uuu_1.5.182.bb +++ b/meta-lxatac-software/recipes-support/imx-uuu/imx-uuu_1.5.182.bb @@ -1,17 +1,16 @@ SUMMARY = "Universal Update Utility" DESCRIPTION = "Image deployment tool for i.MX chips" HOMEPAGE = "https://github.com/NXPmicro/mfgtools" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=38ec0c18112e9a92cffc4951661e85a5" + +DEPENDS = "bzip2 libtinyxml2 libusb openssl zlib" SRC_URI = "https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu_source-uuu_${PV}.tar.gz" SRC_URI[sha256sum] = "723d3da358e6af974a056e3adbcb105fac9dad4b87544de0d22b8c974a8037aa" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=38ec0c18112e9a92cffc4951661e85a5" - inherit cmake pkgconfig S = "${WORKDIR}/uuu-uuu_${PV}" -DEPENDS = "bzip2 libtinyxml2 libusb openssl zlib" - BBCLASSEXTEND = "native nativesdk" diff --git a/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb b/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb index 74b33b53..12c28e8d 100644 --- a/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb +++ b/meta-lxatac-software/recipes-webadmin/tacd-webinterface/tacd-webinterface_git.bb @@ -1,24 +1,19 @@ SUMMARY = "The LXA TAC System Daemon - Web Interface" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +PV = "0.1.0+git${SRCPV}" + SRC_URI = "\ git://github.com/linux-automation/tacd.git;protocol=https;branch=main \ npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json \ " -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "\ - file://../LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ -" - -PV = "0.1.0+git${SRCPV}" SRCREV = "e79b017da65f4a084a8b24f1118e15b0c3f25ae8" S = "${WORKDIR}/git/web" inherit npm -# Remove the runtime dependency on nodejs. We only use it during the -# build process to generate static html, js and css files. -RDEPENDS:${PN}:remove = "nodejs" - WEBUI_INSTALL_DIR = "${NPM_BUILD}/lib/node_modules/tacd-web" npm_run_build[doc] = "Run the build script that transpiles the source typescript to javascript" @@ -42,3 +37,7 @@ do_install() { } FILES:${PN} += "${datadir}/tacd" + +# Remove the runtime dependency on nodejs. We only use it during the +# build process to generate static html, js and css files. +RDEPENDS:${PN}:remove = "nodejs" From c618afa5de6e5e082a27e32bd1e9346b5b5f37c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Thu, 2 Jan 2025 09:34:55 +0100 Subject: [PATCH 32/32] meta-lxatac-software: lxatac-core-image-base: add oelint exception MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This disables the following oelint error message: $ oelint-adv --mode=all --quiet .../images/lxatac-core-image-base.bb .../images/lxatac-core-image-base.bb:14:error:oelint.vars.specific: 'EXTRA_IMAGECMD' is set specific to ['ext4'], but isn't known from PACKAGES, MACHINE, DISTRO or resources [branch:false] The EXTRA_IMAGECMD:ext4 variable is however also used in meta-oe and other filesystem-specific variants are also used elsewhere. It should thus be okay to use it and disable the error message. Signed-off-by: Leonard Göhrs --- .../recipes-core/images/lxatac-core-image-base.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb b/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb index 18eaf664..20a94f29 100644 --- a/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb +++ b/meta-lxatac-software/recipes-core/images/lxatac-core-image-base.bb @@ -5,12 +5,14 @@ IMAGE_FEATURES = "ssh-server-openssh empty-root-password tools-debug lic-pkgs" IMAGE_FSTYPES += "ext4" # use a fixed directory hash seed to reduce the image delta size +# nooelint: oelint.vars.specific EXTRA_IMAGECMD:ext4 = "-i 4096 -E hash_seed=4267a9cf-754d-4506-9156-d3f4a18842e5" # Disable the orphan_file feature which is not supported by langdale's # resize2fs and which would otherwise break installation of new RAUC bundles on # langdale-based TACs. # The override can be removed when updates from langedale are no longer needed. +# nooelint: oelint.vars.specific EXTRA_IMAGECMD:ext4 += "-O ^orphan_file" IMAGE_LINGUAS = "en-us"