Skip to content

Commit 06c6614

Browse files
committed
meta-lxatac-{bsp, software}: manual oelint fixes
Signed-off-by: Leonard Göhrs <[email protected]>
1 parent a3c44e2 commit 06c6614

File tree

21 files changed

+104
-106
lines changed

21 files changed

+104
-106
lines changed

meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.10.0.bb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ LICENSE = "GPL-2.0-only"
55
LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192"
66

77
DEPENDS = "bison-native flex-native libusb1 libusb1-native lzop-native pkgconfig-native"
8-
BBCLASSEXTEND = "native"
98

109
SRC_URI = "http://barebox.org/download/barebox-${PV}.tar.bz2"
1110
SRC_URI[sha256sum] = "955b20bfa7358732d2c0c09ccfd4c1a69087b7e2c610b16dee7442d71a5af88d"
1211

1312
S = "${WORKDIR}/barebox-${PV}"
1413

14+
BBCLASSEXTEND = "native"
15+
1516
EXTRA_OEMAKE = "\
1617
ARCH=sandbox \
1718
CROSS_COMPILE=${TARGET_PREFIX} -C ${S} O=${B} \

meta-lxatac-bsp/recipes-bsp/barebox/barebox.inc

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
11
SUMMARY = "barebox is a bootloader designed for embedded systems."
22
HOMEPAGE = "https://barebox.org/"
33
SECTION = "bootloaders"
4-
PROVIDES = "virtual/bootloader"
5-
64
LICENSE = "GPL-2.0-only"
75
LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192"
8-
9-
PACKAGE_ARCH = "${MACHINE_ARCH}"
10-
11-
inherit kernel-arch deploy cml1 pkgconfig
12-
136
# libusb1 is only required for usb tools like imx-usb-loader. These tools may
147
# be enabled within the defconfig file so depend on it here to be more user
158
# friendly (do not abort the build). The actual tools are provided by the
169
# barebox-tools package.
1710
DEPENDS:append = " bison-native flex-native libusb1"
18-
19-
export KBUILD_BUILD_USER ?= "oe-user"
20-
export KBUILD_BUILD_HOST ?= "oe-host"
11+
PROVIDES = "virtual/bootloader"
2112

2213
SRC_URI = "https://barebox.org/download/barebox-${PV}.tar.bz2"
2314

2415
S = "${WORKDIR}/barebox-${PV}"
2516
B = "${WORKDIR}/build"
2617

18+
PACKAGE_ARCH = "${MACHINE_ARCH}"
19+
20+
inherit kernel-arch deploy cml1 pkgconfig
21+
22+
export KBUILD_BUILD_USER ?= "oe-user"
23+
export KBUILD_BUILD_HOST ?= "oe-host"
24+
2725
def get_layer_rev(path):
2826
try:
2927
rev, _ = bb.process.run("git describe --match='' --always --dirty --broken", cwd=path)

meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.10.0.bb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# included.
77
require barebox.inc
88

9+
DEPENDS:append = " panel-shineworld-lh133k"
10+
911
SRC_URI:append = " \
1012
file://defconfig \
1113
file://env \
@@ -28,8 +30,6 @@ do_deploy:append () {
2830
done
2931
}
3032

31-
DEPENDS:append = " panel-shineworld-lh133k"
32-
3333
do_copy_fw[doc] = "Copy the LCD display firmware to the barebox env"
3434
do_copy_fw() {
3535
mkdir -p ${WORKDIR}/env/firmware/

meta-lxatac-bsp/recipes-core/lxatac-factory-data/lxatac-factory-data.bb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1+
SUMMARY = "Read out and distribute factory data from the devicetree"
2+
13
LICENSE = "MIT"
24
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
35

4-
SUMMARY = "Read out and distribute factory data from the devicetree"
5-
66
inherit allarch systemd
77

8-
RDEPENDS:${PN} = "bash"
9-
108
SYSTEMD_SERVICE:${PN} = "lxatac-factory-data.service"
119

1210
SRC_URI:append = " \
1311
file://lxatac-factory-data.service \
1412
file://lxatac-factory-data.sh \
1513
"
1614

15+
RDEPENDS:${PN} = "bash"
16+
1717
do_install() {
1818
install -m 0644 -D ${WORKDIR}/lxatac-factory-data.service ${D}${systemd_system_unitdir}/lxatac-factory-data.service
1919
install -m 0755 -D ${WORKDIR}/lxatac-factory-data.sh ${D}${sbindir}/lxatac-factory-data

meta-lxatac-bsp/recipes-core/lxatac-net-switch-hacks/lxatac-net-switch-hacks.bb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ do_install() {
3636

3737
SYSTEMD_SERVICE:${PN} = "spi-irq-prio-44009000.service"
3838

39+
FILES:${PN} += "${libdir}/sysctl.d/"
40+
3941
# For pgrep and chrt in spi-irq-prio-44009000.service
4042
RDEPENDS:${PN} += "busybox util-linux-chrt"
41-
42-
FILES:${PN} += "${libdir}/sysctl.d/"

meta-lxatac-bsp/recipes-core/lxatac-repart/lxatac-repart.bb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ SRC_URI = "\
1010

1111
S = "${WORKDIR}"
1212

13-
RDEPENDS:${PN} = "systemd"
14-
1513
do_install () {
1614
install -d ${D}${libdir}/systemd/system/systemd-repart.service.d/
1715
install -m 0644 -t ${D}${libdir}/systemd/system/systemd-repart.service.d/ ${S}/*.conf
@@ -33,3 +31,4 @@ FILES:${PN} += "\
3331
${libdir}/systemd/system/systemd-repart.service.d \
3432
"
3533

34+
RDEPENDS:${PN} = "systemd"

meta-lxatac-bsp/recipes-devtools/fiptool/fiptool-native_git.bb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44

55
SUMMARY = "fiptool - Trusted Firmware tool for packaging"
66
LICENSE = "BSD-3-Clause"
7-
8-
SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;destsuffix=fiptool-${PV};protocol=https;branch=master"
97
LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde"
108

11-
SRCREV = "a921da5ed29fa3bb295b18349bc5e03dcab3fa6d"
12-
139
DEPENDS += "openssl-native"
1410

11+
SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;destsuffix=fiptool-${PV};protocol=https;branch=master"
12+
SRCREV = "a921da5ed29fa3bb295b18349bc5e03dcab3fa6d"
13+
1514
inherit_defer native
1615

1716
EXTRA_OEMAKE = "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}"

meta-lxatac-bsp/recipes-kernel/linux/linux-lxatac.bb

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,25 @@ SECTION = "kernel"
77
LICENSE = "GPL-2.0-only"
88
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
99

10+
# The coreutils-native dependency is required since kernel 6.11,
11+
# which uses the `truncate` tool in a script.
12+
# It can likely be removed again once the kernel.bbclass is updated.
13+
DEPENDS:append = " panel-shineworld-lh133k coreutils-native"
14+
15+
PV = "${UMPF_PV}"
16+
1017
# nooelint: oelint.vars.downloadfilename
1118
SRC_URI = "https://www.kernel.org/pub/linux/kernel/v6.x/linux-${LINUX_VERSION}.tar.xz \
1219
file://defconfig \
1320
"
1421

1522
SRC_URI[sha256sum] = "b1a2562be56e42afb3f8489d4c2a7ac472ac23098f1ef1c1e40da601f54625eb"
1623

17-
require files/patches/series.inc
18-
19-
PV = "${UMPF_PV}"
2024
S = "${WORKDIR}/linux-${LINUX_VERSION}"
2125

22-
COMPATIBLE_MACHINE = "lxatac"
26+
require files/patches/series.inc
2327

24-
# The coreutils-native dependency is required since kernel 6.11,
25-
# which uses the `truncate` tool in a script.
26-
# It can likely be removed again once the kernel.bbclass is updated.
27-
DEPENDS:append = " panel-shineworld-lh133k coreutils-native"
28+
COMPATIBLE_MACHINE = "lxatac"
2829

2930
# Some options depend on CONFIG_PAHOLE_VERSION, so need to make pahole-native available before do_kernel_configme
3031
do_kernel_configme[depends] += "pahole-native:do_populate_sysroot"

meta-lxatac-software/recipes-core/lxatac-profile/lxatac-profile.bb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ SRC_URI = "file://01-labgrid.sh"
66

77
S = "${WORKDIR}"
88

9-
RDEPENDS:${PN} = "bash"
10-
119
do_install () {
1210
install -d ${D}${sysconfdir}/profile.d/
1311
install -m 0755 ${S}/01-labgrid.sh ${D}${sysconfdir}/profile.d/
1412
}
1513

1614
FILES:${PN} += "${sysconfdir}/profile.d/01-labgrid.sh"
15+
16+
RDEPENDS:${PN} = "bash"

meta-lxatac-software/recipes-devtools/bcu/bcu_1.1.100.bb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ SECTION = "devel"
99
LICENSE = "BSD-3-Clause"
1010
LIC_FILES_CHKSUM = "file://LICENSE;md5=884d48c2aa7b82e1ad4a33909fab24b6"
1111

12+
DEPENDS = "curl libftdi libusb1 libyaml openssl"
13+
1214
SRC_URI = "git://github.com/nxp-imx/bcu;protocol=https;branch=master \
1315
file://0001-CMakeLists-do-not-use-vendored-libcurl.patch \
1416
"
1517
SRCREV = "c34d89b29f3d0d12793cd78b194d2f1d11728baf"
1618

1719
S = "${WORKDIR}/git"
1820

19-
DEPENDS = "curl libftdi libusb1 libyaml openssl"
20-
2121
inherit cmake pkgconfig
2222

2323
BBCLASSEXTEND = "native nativesdk"

0 commit comments

Comments
 (0)