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") 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 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..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,5 +1,5 @@ -SUMMARY = "ARM Trusted Firmware-A" -DESCRIPTION = " \ +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 \ 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) & \ @@ -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,10 +29,10 @@ B = "${WORKDIR}/build" inherit deploy -COMPATIBLE_MACHINE = "none" -PLATFORM = "none" +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/arm-trusted-firmware-a/files/patches/series.inc b/meta-lxatac-bsp/recipes-bsp/arm-trusted-firmware-a/files/patches/series.inc index cf6764f2..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 += "\ - file://patches/0001-fdts-lxa-tac-add-Linux-Automation-GmbH-TAC.patch \ - " +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 += "\ - file://patches/0101-Release-2.9-customers-lxa-tac-20240130-2.patch \ - " +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/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" 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..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 @@ -4,19 +4,20 @@ 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" -BBCLASSEXTEND = "native" +DEPENDS = "bison-native flex-native libusb1 libusb1-native lzop-native pkgconfig-native" SRC_URI = "http://barebox.org/download/barebox-${PV}.tar.bz2" SRC_URI[sha256sum] = "955b20bfa7358732d2c0c09ccfd4c1a69087b7e2c610b16dee7442d71a5af88d" S = "${WORKDIR}/barebox-${PV}" -EXTRA_OEMAKE = " \ +BBCLASSEXTEND = "native" + +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}" @@ -32,7 +33,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..7965528e 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc @@ -1,31 +1,31 @@ -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" - LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -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 = "libusb1 bison-native flex-native" - -export KBUILD_BUILD_USER ?= "oe-user" -export KBUILD_BUILD_HOST ?= "oe-host" +DEPENDS:append = " bison-native flex-native libusb1" +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) @@ -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} \ @@ -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-bsp/barebox/barebox_2024.10.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb index cf9a0479..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,7 +6,9 @@ # included. require barebox.inc -SRC_URI += " \ +DEPENDS:append = " panel-shineworld-lh133k" + +SRC_URI:append = " \ file://defconfig \ file://env \ " @@ -20,16 +22,15 @@ 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" - +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/ 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..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,32 +5,32 @@ # umpf-topic: v2024.10.0/topic/tlv # 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 \ - " +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 \ + 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 \ - " +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 += "\ - file://patches/0201-Release-2024.10.0-customers-lxa-tac-20241121-2.patch \ - " +SRC_URI:append = " \ + 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/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 e9d6805f..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,19 +1,19 @@ +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 += " \ +SRC_URI:append = " \ file://lxatac-factory-data.service \ 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-led-setup/lxatac-led-setup.bb b/meta-lxatac-bsp/recipes-core/lxatac-led-setup/lxatac-led-setup.bb index e0adeb4a..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-lldpd-config/lxatac-lldpd-config.bb b/meta-lxatac-bsp/recipes-core/lxatac-lldpd-config/lxatac-lldpd-config.bb index 52f6722a..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 @@ -1,9 +1,11 @@ +SUMMARY = "Configure the lldpd daemon on the switch interface" + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" inherit allarch -SRC_URI = " \ +SRC_URI = "\ file://01-switch.conf \ " @@ -11,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-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..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 @@ -1,9 +1,11 @@ +SUMMARY = "Hacks that make communication with the switch more reliable under load." + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" 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 \ @@ -34,10 +36,7 @@ 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" +FILES:${PN} += "${libdir}/sysctl.d/" -FILES:${PN} += "\ - ${libdir}/sysctl.d/ \ - ${sysconfdir} \ -" +# For pgrep and chrt in spi-irq-prio-44009000.service +RDEPENDS:${PN} += "busybox util-linux-chrt" 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..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 @@ -1,9 +1,11 @@ +SUMMARY = "NetworkManager config for the LXA TAC" + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" inherit allarch -SRC_URI += " \ +SRC_URI:append = " \ file://hostname.conf \ file://tac-bridge.nmconnection \ file://port-dut.nmconnection \ @@ -12,7 +14,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-persistent-journal/lxatac-persistent-journal.bb b/meta-lxatac-bsp/recipes-core/lxatac-persistent-journal/lxatac-persistent-journal.bb index 8d277d2c..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 @@ -1,7 +1,9 @@ +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" -SRC_URI = " \ +SRC_URI = "\ file://var-log-journal.mount \ " @@ -14,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 30a75ff6..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 @@ -1,7 +1,9 @@ +SUMMARY = "Use a bind mount to persist the labgrid cache across boots" + 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 \ " @@ -16,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 6b7c7136..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 @@ -1,7 +1,9 @@ +SUMMARY = "Use a bind mount to persist the sysstat log across boots" + 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 \ " @@ -18,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 436918a6..32dae6b0 100644 --- a/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb +++ b/meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb @@ -2,16 +2,14 @@ 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 \ - " +" 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 @@ -27,9 +25,10 @@ do_install () { touch ${D}/system-update } -FILES:${PN} = " \ +FILES:${PN} += "\ /system-update \ ${libdir}/repart.d \ ${libdir}/systemd/system/systemd-repart.service.d \ - " +" +RDEPENDS:${PN} = "systemd" 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..93512706 100644 --- a/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb +++ b/meta-lxatac-bsp/recipes-core/systemd/systemd-conf-lxatac.bb @@ -1,9 +1,11 @@ +SUMMARY = "Configure how systemd should handle the watchdog on the LXA TAC" + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" inherit systemd allarch -SRC_URI += " \ +SRC_URI:append = " \ file://01-watchdog.conf \ " @@ -11,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-bsp/recipes-devtools/fiptool/fiptool-native_git.bb b/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb index ec93f9f2..1b32fcf2 100644 --- a/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb +++ b/meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb @@ -2,17 +2,16 @@ # 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" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" -SRCREV = "a921da5ed29fa3bb295b18349bc5e03dcab3fa6d" - DEPENDS += "openssl-native" -inherit 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/files/patches/series.inc b/meta-lxatac-bsp/recipes-kernel/linux/files/patches/series.inc index 0538ae61..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,25 +5,25 @@ # umpf-topic: v6.11/topic/reproducible-build # 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 \ - " +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 += "\ - 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 \ - " +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 \ + 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 \ - " +SRC_URI:append = " \ + 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-bsp/recipes-kernel/linux/linux-lxatac.bb b/meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb index 649211bf..9398929b 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" @@ -5,27 +7,30 @@ 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 \ " 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" +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/ diff --git a/meta-lxatac-software/classes/panel-mipi-dbi.bbclass b/meta-lxatac-software/classes/panel_mipi_dbi.bbclass similarity index 93% rename from meta-lxatac-software/classes/panel-mipi-dbi.bbclass rename to meta-lxatac-software/classes/panel_mipi_dbi.bbclass index 06c90081..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}" # @@ -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/bundles/lxatac-core-bundle-base.bb b/meta-lxatac-software/recipes-core/bundles/lxatac-core-bundle-base.bb index f400f49b..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 @@ -1,9 +1,11 @@ +SUMMARY = "The LXA TAC RAUC update bundle" + 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-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" 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..a55fc1a3 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" @@ -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/ + 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" +FILES:${PN} += "${sysconfdir}/profile.d/01-labgrid.sh" + +RDEPENDS:${PN} = "bash" 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:?}" 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..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 libyaml libusb1 openssl libftdi" - 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 013c64bd..c5b40ed9 100644 --- a/meta-lxatac-software/recipes-devtools/containers/container-control.bb +++ b/meta-lxatac-software/recipes-devtools/containers/container-control.bb @@ -1,18 +1,20 @@ +SUMMARY = "Helpers around podman to start and update containers" + LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" inherit allarch -RDEPENDS_${PN} = " \ - podman \ - wget \ -" - -SRC_URI = " \ +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 9bee2e9f..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,26 +1,27 @@ SUMMARY = "GitHub act Runner" DESCRIPTION = "Alternative implementation of the GitHub Action runner protocol written in Go" -SRC_URI = " \ +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 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" # 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() { 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 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(-) 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 01af8034..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,17 +1,11 @@ -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 = " \ +SRC_URI = "\ file://gadget-audio.sh \ file://gadget-common.sh \ file://gadget-ethernet-serial.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} = "${bindir} ${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 0e88e84a..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,13 +11,13 @@ 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" -inherit native +inherit_defer native do_configure[noexec] = "1" do_compile[noexec] = "1" 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" 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..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,22 @@ -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 += "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 += " \ +SRC_URI:append = " \ + git://github.com/ClementTsang/bottom.git;protocol=https;branch=main \ +" + +SRC_URI:append = " \ crate://crates.io/addr2line/0.22.0 \ crate://crates.io/adler/1.0.2 \ crate://crates.io/ahash/0.8.11 \ @@ -445,16 +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 \ -" - -SUMMARY = "A customizable cross-platform graphical process/system monitor for the terminal. Supports Linux, macOS, and Windows." -HOMEPAGE = "https://github.com/ClementTsang/bottom" -LICENSE = "MIT" +SRCREV = "2ec1fb56c9db0b37acc4eca3230adfb52720376b" -# 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 +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 002d144c..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,11 +1,20 @@ +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 += "git://github.com/BurntSushi/ripgrep.git;protocol=https;branch=master" -SRCREV = "4649aa9700619f94cf9c66876e9549d83420e16c" -S = "${WORKDIR}/git" +SRC_URI:append = " \ + git://github.com/BurntSushi/ripgrep.git;protocol=https;branch=master \ +" + 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 \ @@ -111,19 +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 \ -" - -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." -HOMEPAGE = "https://github.com/BurntSushi/ripgrep" -LICENSE = "Unlicense | MIT" +SRCREV = "4649aa9700619f94cf9c66876e9549d83420e16c" -# 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 +S = "${WORKDIR}/git" diff --git a/meta-lxatac-software/recipes-rust/tacd/tacd.inc b/meta-lxatac-software/recipes-rust/tacd/tacd.inc index e5618d94..40ee5e0f 100644 --- a/meta-lxatac-software/recipes-rust/tacd/tacd.inc +++ b/meta-lxatac-software/recipes-rust/tacd/tacd.inc @@ -1,16 +1,16 @@ -SRC_URI += " \ +DEPENDS:append = " libiio " + +SRC_URI:append = " \ file://tacd.service \ file://tacd-failsafe.sh \ file://de.pengutronix.tacd.conf \ file://01_stable.yaml \ file://05_testing.yaml \ - " +" 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 df74db57..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,21 @@ +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" -SRC_URI += "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 = " \ + git://github.com/linux-automation/tacd.git;protocol=https;branch=main \ +" + +CARGO_SRC_DIR = "" + +SRC_URI:append = " \ crate://crates.io/addr2line/0.22.0 \ crate://crates.io/adler/1.0.2 \ crate://crates.io/aead/0.3.2 \ @@ -702,16 +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 = "tacd" -HOMEPAGE = "https://github.com/linux-automation/tacd" -LICENSE = "GPL-2.0-or-later" +S = "${WORKDIR}/git" -# 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 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..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 = "libusb zlib bzip2 openssl libtinyxml2" - 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 c136599e..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,26 +1,22 @@ 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 \ -" +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 \ +" 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" npm_run_build () { cd "${WEBUI_INSTALL_DIR}" npm run build @@ -40,4 +36,8 @@ do_install() { cp -r "${WEBUI_INSTALL_DIR}/build" "${D}${datadir}/tacd/webui" } -FILES:${PN} = "${datadir}/tacd" +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"