meta-lxatac-{bsp, software}: manual oelint fixes

Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
linux-automation · Dec 20, 2024 · 06c6614 · 06c6614
1 parent a3c44e2
commit 06c6614
Show file tree

Hide file tree

Showing 21 changed files with 104 additions and 106 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
@@ -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
@@ -1,29 +1,27 @@
 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}"
-
-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}"
+
+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
@@ -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
@@ -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: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-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
@@ -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
@@ -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
@@ -7,24 +7,25 @@ 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"

diff --git 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
@@ -9,15 +9,15 @@ 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 \
            "
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"