summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-bsp
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-bsp')
-rw-r--r--meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb3
-rw-r--r--meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb5
-rw-r--r--meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb4
-rw-r--r--meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb4
-rw-r--r--meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch21
-rw-r--r--meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch39
-rw-r--r--meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb38
-rw-r--r--meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb3
-rw-r--r--meta-oe/recipes-bsp/firmwared/firmwared_git.bb6
-rw-r--r--meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch44
-rw-r--r--meta-oe/recipes-bsp/flashrom/flashrom/0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch52
-rw-r--r--meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch49
-rw-r--r--meta-oe/recipes-bsp/flashrom/flashrom/meson-fixes.patch68
-rw-r--r--meta-oe/recipes-bsp/flashrom/flashrom_1.5.1.bb (renamed from meta-oe/recipes-bsp/flashrom/flashrom_1.2.1.bb)13
-rw-r--r--meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch23
-rw-r--r--meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch53
-rw-r--r--meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb (renamed from meta-oe/recipes-bsp/fwupd/fwupd-efi_1.3.bb)19
-rw-r--r--meta-oe/recipes-bsp/fwupd/fwupd_1.9.25.bb (renamed from meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb)18
-rw-r--r--meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb3
-rw-r--r--meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb3
-rw-r--r--meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb1
-rw-r--r--meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb12
-rw-r--r--meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch36
-rw-r--r--meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb12
-rw-r--r--meta-oe/recipes-bsp/lsscsi/lsscsi_0.32.bb15
-rw-r--r--meta-oe/recipes-bsp/lsscsi/lsscsi_030.bb13
-rw-r--r--meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.12.bb (renamed from meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.8.bb)16
-rw-r--r--meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb1
-rw-r--r--meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb2
29 files changed, 285 insertions, 291 deletions
diff --git a/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb b/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb
index b392581ecb..2a9ba574ef 100644
--- a/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb
+++ b/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb
@@ -9,5 +9,6 @@ SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BP}.tar.
9 9
10inherit autotools 10inherit autotools
11 11
12SRC_URI[md5sum] = "9e4ec55201be0be71ffbc56d38b42b57"
13SRC_URI[sha256sum] = "004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f" 12SRC_URI[sha256sum] = "004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f"
13
14UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/acpitool/files/acpitool/"
diff --git a/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb b/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb
index 4688ae860b..ec3cdcaa75 100644
--- a/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb
+++ b/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb
@@ -10,7 +10,6 @@ REQUIRED_DISTRO_FEATURES = "polkit"
10SRC_URI = "git://gitlab.freedesktop.org/bolt/bolt.git;protocol=https;branch=master" 10SRC_URI = "git://gitlab.freedesktop.org/bolt/bolt.git;protocol=https;branch=master"
11SRCREV = "f03c50b22ae3fda26711ddabd91e2c5dd8103478" 11SRCREV = "f03c50b22ae3fda26711ddabd91e2c5dd8103478"
12 12
13S = "${WORKDIR}/git"
14 13
15CVE_PRODUCT = "freedesktop:bolt" 14CVE_PRODUCT = "freedesktop:bolt"
16 15
@@ -18,5 +17,5 @@ inherit cmake pkgconfig meson features_check
18 17
19FILES:${PN} += "${datadir}/dbus-1/* \ 18FILES:${PN} += "${datadir}/dbus-1/* \
20 ${datadir}/polkit-1/* \ 19 ${datadir}/polkit-1/* \
21 ${libdir}/systemd/* \ 20 ${systemd_system_unitdir} \
22 " 21"
diff --git a/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb b/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb
index 302a61e8a8..515c009ead 100644
--- a/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb
+++ b/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb
@@ -13,7 +13,9 @@ SRC_URI = "git://gitlab.com/pibox/con2fbmap.git;protocol=https;branch=master \
13 file://0001-con2fbmap-Add-missing-include-on-string.h.patch \ 13 file://0001-con2fbmap-Add-missing-include-on-string.h.patch \
14 " 14 "
15 15
16S = "${WORKDIR}/git" 16# Upstream repo does not tag
17UPSTREAM_CHECK_COMMITS = "1"
18
17 19
18inherit autotools 20inherit autotools
19 21
diff --git a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb
index cb62ee46af..9e23a4b67d 100644
--- a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb
+++ b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb
@@ -14,10 +14,12 @@ SRC_URI = "git://github.com/emagii/cpufrequtils.git;branch=master;protocol=https
14 file://0001-dont-unset-cflags.patch \ 14 file://0001-dont-unset-cflags.patch \
15" 15"
16 16
17# Upstream repo does not tag
18UPSTREAM_CHECK_COMMITS = "1"
19
17EXTRA_OEMAKE:append = " ${@['', 'NLS=false']['${USE_NLS}' == 'no']} " 20EXTRA_OEMAKE:append = " ${@['', 'NLS=false']['${USE_NLS}' == 'no']} "
18 21
19 22
20S = "${WORKDIR}/git"
21 23
22TARGET_CC_ARCH += "${LDFLAGS}" 24TARGET_CC_ARCH += "${LDFLAGS}"
23 25
diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch
new file mode 100644
index 0000000000..fbc0f5a18e
--- /dev/null
+++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch
@@ -0,0 +1,21 @@
1Author: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
2Date: Fri Jul 5 16:39:13 2024 +0200
3Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/86]
4
5 Makefile: allow overriding CC
6
7 Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
8
9diff --git a/Makefile b/Makefile
10index 139e5c0c3c3c..226303a6921e 100644
11--- a/Makefile
12+++ b/Makefile
13@@ -12,7 +12,7 @@ endif
14 endif
15
16 PROGRAM = dpcmd
17-CC = gcc
18+CC ?= gcc
19 PREFIX ?= /usr/local
20
21 PKG_CONFIG ?= pkg-config
diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch
new file mode 100644
index 0000000000..0fc8ac5bd2
--- /dev/null
+++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch
@@ -0,0 +1,39 @@
1From dac9d0ea5c419049c9ab0a5ba90d15d77a3271b0 Mon Sep 17 00:00:00 2001
2From: Tymoteusz Burak <tymoteusz.burak@3mdeb.com>
3Date: Mon, 22 Jul 2024 13:02:59 +0000
4Subject: [PATCH] Makefile: add conditional stripping
5Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/88]
6
7This patch introduces a `NOSTRIP` conditional flag to the `install`
8target in the Makefile. The purpose of this flag is to allow the
9disabling of binary stripping during installation. This is
10particularly useful in development environments, such as BitBake,
11which handle stripping internally.
12
13When `NOSTRIP` is set to `1`, the `strip` command will be skipped
14during the installation process, preventing potential conflicts or
15redundant operations.
16
17Signed-off-by: Tymoteusz Burak <tymoteusz.burak@3mdeb.com>
18
19---
20 Makefile | 2 ++
21 1 file changed, 2 insertions(+)
22
23diff --git a/Makefile b/Makefile
24index 139e5c0..8b33320 100644
25--- a/Makefile
26+++ b/Makefile
27@@ -58,7 +58,9 @@ install: $(PROGRAM)
28 [ $(shell id -u) -eq 0 ] || (echo "Error: install needs root privileges" && false)
29 install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/DediProg
30 echo -n "install: " && install -v -o 0 -g 0 -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM)
31+ifneq ($(NOSTRIP),1)
32 strip $(DESTDIR)$(PREFIX)/bin/$(PROGRAM)
33+endif
34 install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/share/DediProg
35 echo -n "install: " && install -v -o 0 -g 0 -m 0644 ChipInfoDb.dedicfg $(DESTDIR)$(PREFIX)/share/DediProg/ChipInfoDb.dedicfg
36 install -v -o 0 -g 0 -m 755 -d $(DESTDIR)/etc/udev/rules.d
37--
382.30.2
39
diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb
new file mode 100644
index 0000000000..e0041b58e6
--- /dev/null
+++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb
@@ -0,0 +1,38 @@
1DESCRIPTION = "Linux software for Dediprog SF100 and SF600 SPI flash programmers"
2SECTION = "devel"
3LICENSE = "GPL-2.0-or-later"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb"
5
6DEPENDS = "libusb"
7
8SRCREV = "e691f2d432144e3dbc82e9e0eea1ebaed4f3becf"
9SRC_URI = " \
10 git://github.com/DediProgSW/SF100Linux.git;protocol=https;branch=master \
11 file://0001-add-support-for-cross-compilation.patch \
12 file://0002-Makefile-add-conditional-stripping.patch \
13 "
14
15EXTRA_OEMAKE = "NOSTRIP=1 DESTDIR=${D} PREFIX=${prefix}"
16
17PV = "1.0+${SRCPV}"
18
19
20do_install() {
21 oe_runmake install
22}
23
24do_install:append:class-nativesdk() {
25 # QA override: omit packaging dediprog's udev rule under /etc/udev.
26 # The file resides outside the nativesdk ${prefix} and must not pollute the
27 # host environment.
28 rm -rf ${D}/etc
29}
30
31FILES:${PN} += " \
32 ${bindir} \
33 ${datadir}/DediProg \
34"
35
36inherit pkgconfig
37
38BBCLASSEXTEND += " native nativesdk"
diff --git a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb
index 03076cbc60..0d8f3c8a6b 100644
--- a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb
+++ b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb
@@ -13,7 +13,6 @@ DEPENDS = " sysfsutils"
13SRCREV = "1c57818ecee186aa47af0342149577df5302c022" 13SRCREV = "1c57818ecee186aa47af0342149577df5302c022"
14PV = "0.18+git" 14PV = "0.18+git"
15 15
16S = "${WORKDIR}/git"
17 16
18SRC_URI = "git://github.com/grondo/edac-utils;branch=master;protocol=https \ 17SRC_URI = "git://github.com/grondo/edac-utils;branch=master;protocol=https \
19 file://make-init-script-be-able-to-automatically-load-EDAC-.patch \ 18 file://make-init-script-be-able-to-automatically-load-EDAC-.patch \
@@ -48,7 +47,7 @@ RDEPENDS:${PN}:append = " \
48 47
49do_install:append() { 48do_install:append() {
50 install -d ${D}${systemd_unitdir}/system 49 install -d ${D}${systemd_unitdir}/system
51 install -m 644 ${WORKDIR}/edac.service ${D}/${systemd_unitdir}/system 50 install -m 644 ${UNPACKDIR}/edac.service ${D}/${systemd_unitdir}/system
52 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}/${systemd_unitdir}/system/edac.service 51 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}/${systemd_unitdir}/system/edac.service
53} 52}
54 53
diff --git a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb
index 0a041835e1..1542ee73d1 100644
--- a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb
+++ b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb
@@ -13,7 +13,9 @@ SRC_URI = "git://github.com/teg/firmwared.git;branch=master;protocol=https \
13PV = "0+git" 13PV = "0+git"
14SRCREV = "2e6b5db43d63a5c0283a4cae9a6a20b7ad107a04" 14SRCREV = "2e6b5db43d63a5c0283a4cae9a6a20b7ad107a04"
15 15
16S = "${WORKDIR}/git" 16# Upstream repo does not tag
17UPSTREAM_CHECK_COMMITS = "1"
18
17 19
18DEPENDS = "glib-2.0 systemd" 20DEPENDS = "glib-2.0 systemd"
19 21
@@ -29,6 +31,6 @@ do_configure:prepend() {
29 31
30do_install:append() { 32do_install:append() {
31 install -d ${D}${systemd_system_unitdir} 33 install -d ${D}${systemd_system_unitdir}
32 install -m 0644 ${WORKDIR}/firmwared.service ${D}${systemd_system_unitdir} 34 install -m 0644 ${UNPACKDIR}/firmwared.service ${D}${systemd_system_unitdir}
33 sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/firmwared.service 35 sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/firmwared.service
34} 36}
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch
deleted file mode 100644
index e481c5a161..0000000000
--- a/meta-oe/recipes-bsp/flashrom/flashrom/0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 2c777126765b4095bf481d5cfe4a21470374d940 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 30 Mar 2021 15:12:09 -0700
4Subject: [PATCH] flashrom: Mark RISCV as non memory-mapped I/O architecture
5
6Upstream-Status: Submitted [https://review.coreboot.org/c/flashrom/+/51960]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8Change-Id: I55c4e8529d36f0850dd56441c3fb8602c5d889fd
9---
10 Makefile | 2 +-
11 hwaccess.h | 4 ++++
12 2 files changed, 5 insertions(+), 1 deletion(-)
13
14diff --git a/Makefile b/Makefile
15index 6d37d55..203e04b 100644
16--- a/Makefile
17+++ b/Makefile
18@@ -559,7 +559,7 @@ endif
19 # Disable all drivers needing raw access (memory, PCI, port I/O) on
20 # architectures with unknown raw access properties.
21 # Right now those architectures are alpha hppa m68k sh s390
22-ifneq ($(ARCH),$(filter $(ARCH),x86 mips ppc arm sparc arc))
23+ifneq ($(ARCH),$(filter $(ARCH),x86 mips ppc arm sparc arc riscv))
24 ifeq ($(CONFIG_RAYER_SPI), yes)
25 UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes
26 else
27diff --git a/hwaccess.h b/hwaccess.h
28index 5602c15..e79988a 100644
29--- a/hwaccess.h
30+++ b/hwaccess.h
31@@ -295,6 +295,10 @@ int libpayload_wrmsr(int addr, msr_t msr);
32
33 /* Non memory mapped I/O is not supported on ARC. */
34
35+#elif IS_RISCV
36+
37+/* Non memory mapped I/O is not supported on RISCV. */
38+
39 #else
40
41 #error Unknown architecture, please check if it supports PCI port IO.
42--
432.31.1
44
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch
deleted file mode 100644
index f3316aa264..0000000000
--- a/meta-oe/recipes-bsp/flashrom/flashrom/0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 3334dd4e9fc34c79c3925c3c24869939d8955f21 Mon Sep 17 00:00:00 2001
2From: Rosen Penev <rosenp@gmail.com>
3Date: Sat, 18 Jul 2020 12:16:00 -0700
4Subject: [PATCH] hwaccess: use __asm__ as is done elsewhere
5
6Fixes compilation under powerpc platform. Made the change for the SPARC
7platform as well.
8
9../hwaccess.c: In function 'sync_primitive':
10../hwaccess.c:74:2: warning: implicit declaration of function 'asm'
11 [-Wimplicit-function-declaration]
12 74 | asm("eieio" : : : "memory");
13 | ^~~
14../hwaccess.c:74:13: error: expected ')' before ':' token
15 74 | asm("eieio" : : : "memory");
16
17Upstream-Status: Submitted [https://github.com/flashrom/flashrom/pull/155]
18Signed-off-by: Rosen Penev <rosenp@gmail.com>
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 hwaccess.c | 6 +++---
22 1 file changed, 3 insertions(+), 3 deletions(-)
23
24diff --git a/hwaccess.c b/hwaccess.c
25index 48ccb34..2a39989 100644
26--- a/hwaccess.c
27+++ b/hwaccess.c
28@@ -71,18 +71,18 @@ static inline void sync_primitive(void)
29 * See also https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/memory-barriers.txt
30 */
31 #if IS_PPC // cf. http://lxr.free-electrons.com/source/arch/powerpc/include/asm/barrier.h
32- asm("eieio" : : : "memory");
33+ __asm__ ("eieio" : : : "memory");
34 #elif IS_SPARC
35 #if defined(__sparc_v9__) || defined(__sparcv9)
36 /* Sparc V9 CPUs support three different memory orderings that range from x86-like TSO to PowerPC-like
37 * RMO. The modes can be switched at runtime thus to make sure we maintain the right order of access we
38 * use the strongest hardware memory barriers that exist on Sparc V9. */
39- asm volatile ("membar #Sync" ::: "memory");
40+ __asm__ volatile ("membar #Sync" ::: "memory");
41 #elif defined(__sparc_v8__) || defined(__sparcv8)
42 /* On SPARC V8 there is no RMO just PSO and that does not apply to I/O accesses... but if V8 code is run
43 * on V9 CPUs it might apply... or not... we issue a write barrier anyway. That's the most suitable
44 * operation in the V8 instruction set anyway. If you know better then please tell us. */
45- asm volatile ("stbar");
46+ __asm__ volatile ("stbar");
47 #else
48 #error Unknown and/or unsupported SPARC instruction set version detected.
49 #endif
50--
512.32.0
52
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch
new file mode 100644
index 0000000000..8dfed855b4
--- /dev/null
+++ b/meta-oe/recipes-bsp/flashrom/flashrom/0002-meson-Add-options-pciutils-ftdi-usb.patch
@@ -0,0 +1,49 @@
1From 3ea99c117aa4c7a3502c93e4e4df50b3623e46c3 Mon Sep 17 00:00:00 2001
2From: Patrick Rudolph <patrick.rudolph@9elements.com>
3Date: Tue, 15 Oct 2024 10:42:05 +0200
4Subject: [PATCH 2/2] meson: Add options pciutils, ftdi, usb
5
6The options have been dropped in favor of an array option called programmer.
7Since this doesn't integrate well into yocto add back the old options.
8
9Upstream-Status: Inappropriate Just to fix yocto build system
10
11Change-Id: Ib697b9f7cc7fc553cfdeb75ae9d49a367badd286
12Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
13---
14 meson.build | 6 +++---
15 meson_options.txt | 3 +++
16 2 files changed, 6 insertions(+), 3 deletions(-)
17
18diff --git a/meson.build b/meson.build
19index 6c8d3d3..61b794d 100644
20--- a/meson.build
21+++ b/meson.build
22@@ -150,9 +150,9 @@ systems_serial = [ 'linux', 'openbsd', 'freebsd', 'dragonfly', 'netbsd', 'da
23
24 cpus_port_io = [ 'x86', 'x86_64' ]
25
26-group_ftdi = get_option('programmer').contains('group_ftdi')
27-group_pci = get_option('programmer').contains('group_pci')
28-group_usb = get_option('programmer').contains('group_usb')
29+group_ftdi = get_option('programmer').contains('group_ftdi') or get_option('ftdi')
30+group_pci = get_option('programmer').contains('group_pci') or get_option('pciutils')
31+group_usb = get_option('programmer').contains('group_usb') or get_option('usb')
32 group_i2c = get_option('programmer').contains('group_i2c')
33 group_serial = get_option('programmer').contains('group_serial')
34 group_jlink = get_option('programmer').contains('group_jlink')
35diff --git a/meson_options.txt b/meson_options.txt
36index 87456a9..570b152 100644
37--- a/meson_options.txt
38+++ b/meson_options.txt
39@@ -24,4 +24,7 @@ option('ni845x_search_path', type : 'string', value : 'C:\Program Files (x86)\Na
40 option('delay_minimum_sleep_us', type : 'integer', min : 0, value : 100,
41 description : 'Minimum time in microseconds to suspend execution for (rather than polling) when a delay is required.'
42 + ' Larger values may perform better on machines with low timer resolution, at the cost of increased power.')
43+option('pciutils', type : 'boolean', value : false, description : 'Select programmer group pci')
44+option('usb', type : 'boolean', value : false, description : 'Select programmer group usb')
45+option('ftdi', type : 'boolean', value : false, description : 'Select programmer group ftdi')
46 option('rpmc', type : 'feature', value : 'auto', description : 'Support for Replay Protected Monotonic Counter (RPMC) commands as specified by JESD260')
47--
482.43.0
49
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/meson-fixes.patch b/meta-oe/recipes-bsp/flashrom/flashrom/meson-fixes.patch
deleted file mode 100644
index e45236ee07..0000000000
--- a/meta-oe/recipes-bsp/flashrom/flashrom/meson-fixes.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1Add a ftdi option alongside USB and PCI to control the external dependency, and
2ensure that the build is successful in all combinations of options.
3
4Upstream-Status: Pending
5Signed-off-by: Ross Burton <ross.burton@arm.com>
6
7diff --git a/meson.build b/meson.build
8index 375089c..0df9d69 100644
9--- a/meson.build
10+++ b/meson.build
11@@ -91,6 +91,8 @@ else
12 config_digilent_spi = false
13 config_developerbox_spi = false
14 config_pickit2_spi = false
15+ config_stlinkv3_spi = false
16+ config_usbblaster_spi = false
17 endif
18
19 # some programmers require libpci
20@@ -118,6 +120,21 @@ else
21 config_satasii = false
22 endif
23
24+# some programmers require libftdi
25+if get_option('ftdi')
26+ deps += dependency('libftdi1')
27+else
28+ config_ft2232_spi = false
29+ config_usbblaster_spi = false
30+endif
31+
32+if not (target_machine.cpu_family() == 'x86' or target_machine.cpu_family() == 'x86_64')
33+ config_satamv = false
34+ config_nic3com = false
35+ config_rayer_spi = false
36+ config_nicrealtek = false
37+endif
38+
39 # set defines for configured programmers
40 if config_atahpt
41 srcs += 'atahpt.c'
42@@ -163,7 +180,6 @@ endif
43 if config_ft2232_spi
44 srcs += 'ft2232_spi.c'
45 cargs += '-DCONFIG_FT2232_SPI=1'
46- deps += dependency('libftdi1')
47 cargs += '-DHAVE_FT232H=1'
48 endif
49 if config_gfxnvidia
50@@ -216,6 +232,7 @@ endif
51 if config_nicintel
52 srcs += 'nicintel.c'
53 cargs += '-DCONFIG_NICINTEL=1'
54+ need_raw_access = true
55 endif
56 if config_nicintel_eeprom
57 srcs += 'nicintel_eeprom.c'
58diff --git a/meson_options.txt b/meson_options.txt
59index ea87311..b6b842d 100644
60--- a/meson_options.txt
61+++ b/meson_options.txt
62@@ -1,5 +1,6 @@
63 option('pciutils', type : 'boolean', value : true, description : 'use pciutils')
64 option('usb', type : 'boolean', value : true, description : 'use libusb1')
65+option('ftdi', type : 'boolean', value : true, description : 'use libftdi')
66
67 option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers')
68 option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller')
diff --git a/meta-oe/recipes-bsp/flashrom/flashrom_1.2.1.bb b/meta-oe/recipes-bsp/flashrom/flashrom_1.5.1.bb
index b2592d294b..f7121e2503 100644
--- a/meta-oe/recipes-bsp/flashrom/flashrom_1.2.1.bb
+++ b/meta-oe/recipes-bsp/flashrom/flashrom_1.5.1.bb
@@ -3,14 +3,13 @@ LICENSE = "GPL-2.0-or-later"
3HOMEPAGE = "http://flashrom.org" 3HOMEPAGE = "http://flashrom.org"
4 4
5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
6SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \ 6SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.xz \
7 file://meson-fixes.patch \ 7 file://0002-meson-Add-options-pciutils-ftdi-usb.patch \
8 file://0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch \
9 file://0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch \
10 " 8 "
11SRC_URI[sha256sum] = "89a7ff5beb08c89b8795bbd253a51b9453547a864c31793302296b56bbc56d65"
12 9
13S = "${WORKDIR}/flashrom-v${PV}" 10SRC_URI[sha256sum] = "1f934b076ed49eace203655ec249fc7861a6b8e87fe4aef732e47b6e485b6293"
11
12S = "${UNPACKDIR}/flashrom-v${PV}"
14 13
15inherit meson pkgconfig 14inherit meson pkgconfig
16 15
@@ -18,3 +17,5 @@ PACKAGECONFIG ??= "pci usb ftdi"
18PACKAGECONFIG[pci] = "-Dpciutils=true,-Dpciutils=false,pciutils" 17PACKAGECONFIG[pci] = "-Dpciutils=true,-Dpciutils=false,pciutils"
19PACKAGECONFIG[usb] = "-Dusb=true,-Dusb=false,libusb" 18PACKAGECONFIG[usb] = "-Dusb=true,-Dusb=false,libusb"
20PACKAGECONFIG[ftdi] = "-Dftdi=true,-Dftdi=false,libftdi" 19PACKAGECONFIG[ftdi] = "-Dftdi=true,-Dftdi=false,libftdi"
20
21EXTRA_OEMESON = "-Dbash_completion=disabled -Dtests=disabled"
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch b/meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch
new file mode 100644
index 0000000000..c362681421
--- /dev/null
+++ b/meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch
@@ -0,0 +1,23 @@
1From 4c8f95fedecbc590eb7cd98aaf97912fa36b8f2e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jun 2024 23:58:36 -0700
4Subject: [PATCH] efi/generate_binary.py: Use env to detect python3
5
6This enables python3 from native sysroot correctly
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 efi/generate_binary.py | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/efi/generate_binary.py b/efi/generate_binary.py
15index 443472a..a4611bb 100755
16--- a/efi/generate_binary.py
17+++ b/efi/generate_binary.py
18@@ -1,4 +1,4 @@
19-#!/usr/bin/python3
20+#!/usr/bin/env python3
21 #
22 # Copyright (C) 2021 Javier Martinez Canillas <javierm@redhat.com>
23 # Copyright (C) 2021 Richard Hughes <richard@hughsie.com>
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch b/meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch
deleted file mode 100644
index 6fd2eca941..0000000000
--- a/meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1Change the efi-cc argument to take an array, so that we can pass compiler flags
2such as --sysroot.
3
4In the long term changing the fwupd-efi build to use the standard Meson
5CC/LD/etc would be the preferred fix.
6
7Upstream-Status: Inappropriate [better fix in progress]
8Signed-off-by: Ross Burton <ross.burton@arm.com>
9
10diff --git a/efi/generate_sbat.py b/efi/generate_sbat.py
11index e42b365..4831a48 100755
12--- a/efi/generate_sbat.py
13+++ b/efi/generate_sbat.py
14@@ -7,6 +7,7 @@
15 #
16 # pylint: disable=missing-docstring, invalid-name
17
18+import shlex
19 import subprocess
20 import sys
21 import argparse
22@@ -19,7 +20,7 @@ def _generate_sbat(args):
23 FWUPD_URL = "https://github.com/fwupd/fwupd-efi"
24
25 subprocess.run(
26- [args.cc, "-x", "c", "-c", "-o", args.outfile, "/dev/null"], check=True
27+ shlex.split(args.cc) + ["-x", "c", "-c", "-o", args.outfile, "/dev/null"], check=True
28 )
29
30 # not specified
31diff --git a/efi/meson.build b/efi/meson.build
32index 68ea4aa..dcf0d43 100644
33--- a/efi/meson.build
34+++ b/efi/meson.build
35@@ -187,7 +187,7 @@ o_file5 = custom_target('fwup-sbat.o',
36 command : [
37 generate_sbat,
38 '@OUTPUT@',
39- '--cc', efi_cc,
40+ '--cc', ' '.join(efi_cc),
41 '--objcopy', objcopy,
42 '--project-name', meson.project_name(),
43 '--project-version', meson.project_version(),
44diff --git a/meson_options.txt b/meson_options.txt
45index d869cd2..17ef7fb 100644
46--- a/meson_options.txt
47+++ b/meson_options.txt
48@@ -1,4 +1,4 @@
49-option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules')
50+option('efi-cc', type : 'array', value : ['gcc'], description : 'the compiler to use for EFI modules')
51 option('efi-ld', type : 'string', value : 'ld', description : 'the linker to use for EFI modules')
52 option('efi-libdir', type : 'string', description : 'path to the EFI lib directory')
53 option('efi-ldsdir', type : 'string', description : 'path to the EFI lds directory')
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.3.bb b/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb
index b53cabeaeb..bbf2b1fdac 100644
--- a/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.3.bb
+++ b/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb
@@ -3,23 +3,22 @@ LICENSE = "LGPL-2.1-or-later"
3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
4 4
5SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \ 5SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \
6 file://cc.patch" 6 file://0001-efi-generate_binary.py-Use-env-to-detect-python3.patch"
7SRCREV = "36ce593f58e391cca43fd388824496ff98d83480"
8S = "${WORKDIR}/git"
9 7
10DEPENDS = "gnu-efi" 8SRCREV = "58a2928f778278ab1f7f8fcddbab81ba587a8962"
9
10DEPENDS = "gnu-efi python3-pefile-native"
11 11
12COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" 12COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
13 13
14inherit meson 14inherit meson pkgconfig python3native
15 15
16# These should be configured as needed 16# These should be configured as needed
17SBAT_DISTRO_ID ?= "${DISTRO}" 17SBAT_DISTRO_ID ?= "${DISTRO}"
18SBAT_DISTRO_SUMMARY ?= "${DISTRO_NAME}" 18SBAT_DISTRO_SUMMARY ?= "${DISTRO_NAME}"
19SBAT_DISTRO_URL ?= "" 19SBAT_DISTRO_URL ?= ""
20 20
21EXTRA_OEMESON += "-Defi-cc="${@meson_array('CC', d)}" \ 21EXTRA_OEMESON += "\
22 -Defi-ld='${HOST_PREFIX}ld' \
23 -Defi-includedir=${STAGING_INCDIR}/efi \ 22 -Defi-includedir=${STAGING_INCDIR}/efi \
24 -Defi-libdir=${STAGING_LIBDIR} \ 23 -Defi-libdir=${STAGING_LIBDIR} \
25 -Defi_sbat_distro_id='${SBAT_DISTRO_ID}' \ 24 -Defi_sbat_distro_id='${SBAT_DISTRO_ID}' \
@@ -31,3 +30,9 @@ EXTRA_OEMESON += "-Defi-cc="${@meson_array('CC', d)}" \
31 30
32# The compile assumes GCC at present 31# The compile assumes GCC at present
33TOOLCHAIN = "gcc" 32TOOLCHAIN = "gcc"
33
34# Multiple errors like below with gcc14
35#| ../git/efi/fwupdate.c:611:20: error: passing argument 5 of 'fwup_log' from incompatible pointer type [-Wincompatible-pointer-types]
36#| 611 | fwup_debug(L"n_updates: %d", n_updates);
37#| | ^~~~~~~~~~~~~~~~
38TOOLCHAIN_OPTIONS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.25.bb
index e6c276ba4e..a098bf8eea 100644
--- a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb
+++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.25.bb
@@ -6,14 +6,15 @@ DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native python3-jinja2-na
6 6
7SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ 7SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \
8 file://run-ptest" 8 file://run-ptest"
9SRC_URI[sha256sum] = "4e554f77a8a73383a41d5637b62e6c8a8936e66cd1d18585baf29d7fe47fc4d7" 9SRC_URI[sha256sum] = "a1d484778ae87c69b38f417659b33fe3d689373ce0831d1f95617b8aa76e8c37"
10 10
11UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" 11UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
12UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
12 13
13# Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins 14# Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins
14PACKAGE_ARCH = "${MACHINE_ARCH}" 15PACKAGE_ARCH = "${MACHINE_ARCH}"
15 16
16inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages useradd 17inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages
17 18
18GIDOCGEN_MESON_OPTION = 'docs' 19GIDOCGEN_MESON_OPTION = 'docs'
19GIDOCGEN_MESON_ENABLE_FLAG = 'enabled' 20GIDOCGEN_MESON_ENABLE_FLAG = 'enabled'
@@ -115,17 +116,6 @@ DISABLE_NON_X86:x86 = ""
115DISABLE_NON_X86:x86-64 = "" 116DISABLE_NON_X86:x86-64 = ""
116PACKAGECONFIG:remove = "${DISABLE_NON_X86}" 117PACKAGECONFIG:remove = "${DISABLE_NON_X86}"
117 118
118USERADD_PACKAGES = "${PN}"
119USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd"
120
121do_install:append() {
122 if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then
123 #Fix up permissions on polkit rules.d to work with rpm4 constraints
124 chmod 700 ${D}/${datadir}/polkit-1/rules.d
125 chown polkitd:root ${D}/${datadir}/polkit-1/rules.d
126 fi
127}
128
129FILES:${PN} += "${libdir}/fwupd-plugins-* \ 119FILES:${PN} += "${libdir}/fwupd-plugins-* \
130 ${libdir}/fwupd-${PV} \ 120 ${libdir}/fwupd-${PV} \
131 ${systemd_unitdir} \ 121 ${systemd_unitdir} \
@@ -140,3 +130,5 @@ FILES:${PN} += "${libdir}/fwupd-plugins-* \
140FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \ 130FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \
141 ${datadir}/installed-tests/" 131 ${datadir}/installed-tests/"
142RDEPENDS:${PN}-ptest += "gnome-desktop-testing" 132RDEPENDS:${PN}-ptest += "gnome-desktop-testing"
133
134INSANE_SKIP:${PN}-ptest += "buildpaths"
diff --git a/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb b/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb
index 57057c9bf5..d3d08720a6 100644
--- a/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb
+++ b/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "\
4 utility lsi2c. \ 4 utility lsi2c. \
5" 5"
6HOMEPAGE = "https://github.com/costad2/i2cdev" 6HOMEPAGE = "https://github.com/costad2/i2cdev"
7LICENSE = "GPL-2.0-or-later" 7LICENSE = "LGPL-2.1-only & GPL-2.0-or-later"
8LIC_FILES_CHKSUM = "\ 8LIC_FILES_CHKSUM = "\
9 file://COPYING;md5=768997ba510a952bef1775c50bc22b00 \ 9 file://COPYING;md5=768997ba510a952bef1775c50bc22b00 \
10 file://include/libi2cdev.h;beginline=12;endline=25;md5=72486a5e192d6ac5c7e55a4a95e380a6 \ 10 file://include/libi2cdev.h;beginline=12;endline=25;md5=72486a5e192d6ac5c7e55a4a95e380a6 \
@@ -21,6 +21,5 @@ SRC_URI = "\
21" 21"
22SRCREV = "ed9ad777d842880e7ac6ca5e0de4bd2d3b4d02dc" 22SRCREV = "ed9ad777d842880e7ac6ca5e0de4bd2d3b4d02dc"
23 23
24S = "${WORKDIR}/git"
25 24
26inherit autotools 25inherit autotools
diff --git a/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb b/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb
index fa1bb928ca..d4d76e0e59 100644
--- a/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb
+++ b/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb
@@ -16,7 +16,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
16 file://musl.patch \ 16 file://musl.patch \
17 file://init" 17 file://init"
18 18
19SRC_URI[md5sum] = "84dc12aa4c3f61fccb8d8919bf4079bb"
20SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6" 19SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6"
21 20
22inherit update-rc.d 21inherit update-rc.d
@@ -60,5 +59,5 @@ do_install () {
60 done 59 done
61 60
62 install -d ${D}${sysconfdir}/init.d 61 install -d ${D}${sysconfdir}/init.d
63 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} 62 install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
64} 63}
diff --git a/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb b/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb
index 88a6e5bb30..ff3b29406b 100644
--- a/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb
+++ b/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb
@@ -23,7 +23,6 @@ SRCREV = "b0edae14e8660b80ffe0384354038a9f62e2978d"
23COMPATIBLE_HOST = "(i.86|x86_64).*-linux" 23COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
24COMPATIBLE_HOST:libc-musl = "null" 24COMPATIBLE_HOST:libc-musl = "null"
25 25
26S = "${WORKDIR}/git"
27 26
28EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '', d)}" 27EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '', d)}"
29 28
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
index 25ab44f75e..aebdd25bda 100644
--- a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
@@ -12,7 +12,7 @@ SRC_URI = "file://fancontrol \
12 file://sensors.conf \ 12 file://sensors.conf \
13 file://sensord \ 13 file://sensord \
14" 14"
15S = "${WORKDIR}" 15S = "${UNPACKDIR}"
16 16
17PACKAGECONFIG ??= "sensord" 17PACKAGECONFIG ??= "sensord"
18PACKAGECONFIG[sensord] = ",," 18PACKAGECONFIG[sensord] = ",,"
@@ -22,20 +22,20 @@ RDEPENDS:${PN}-dev = ""
22do_install() { 22do_install() {
23 # Install fancontrol configuration file 23 # Install fancontrol configuration file
24 install -d ${D}${sysconfdir}/sysconfig 24 install -d ${D}${sysconfdir}/sysconfig
25 install -m 0644 ${WORKDIR}/fancontrol ${D}${sysconfdir} 25 install -m 0644 ${UNPACKDIR}/fancontrol ${D}${sysconfdir}
26 install -m 0644 ${WORKDIR}/sensord ${D}${sysconfdir}/sysconfig 26 install -m 0644 ${UNPACKDIR}/sensord ${D}${sysconfdir}/sysconfig
27 # Install libsensors configuration file 27 # Install libsensors configuration file
28 install -d ${D}${sysconfdir}/sensors.d 28 install -d ${D}${sysconfdir}/sensors.d
29 install -m 0644 ${WORKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d 29 install -m 0644 ${UNPACKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d
30 30
31 if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then 31 if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then
32 # Install sensord configuration file 32 # Install sensord configuration file
33 install -m 0644 ${WORKDIR}/sensord.conf ${D}${sysconfdir} 33 install -m 0644 ${UNPACKDIR}/sensord.conf ${D}${sysconfdir}
34 34
35 # Install sensord.cgi script and create world-writable 35 # Install sensord.cgi script and create world-writable
36 # web-accessible sensord directory 36 # web-accessible sensord directory
37 install -d ${D}/www/pages/cgi-bin 37 install -d ${D}/www/pages/cgi-bin
38 install -m 0755 ${WORKDIR}/sensord.cgi ${D}/www/pages/cgi-bin 38 install -m 0755 ${UNPACKDIR}/sensord.cgi ${D}/www/pages/cgi-bin
39 install -d -m a=rwxs ${D}/www/pages/sensord 39 install -d -m a=rwxs ${D}/www/pages/sensord
40 fi 40 fi
41} 41}
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
new file mode 100644
index 0000000000..0ff8b3801b
--- /dev/null
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch
@@ -0,0 +1,36 @@
1From fd49cbcb7f3402e1a4a99b71b901a564060039b4 Mon Sep 17 00:00:00 2001
2From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
3Date: Fri, 24 May 2024 14:16:21 +0300
4Subject: [PATCH] Fix building with GCC 14
5
6Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
7Upstream-Status: Submitted [https://github.com/lm-sensors/lm-sensors/pull/497]
8---
9 prog/sensord/rrd.c | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c
13index a531362bddd5..36d685fce514 100644
14--- a/prog/sensord/rrd.c
15+++ b/prog/sensord/rrd.c
16@@ -299,7 +299,7 @@ int rrdInit(void)
17 argv[argc++] = rraBuff;
18 argv[argc] = NULL;
19
20- ret = rrd_create(argc, (char**) argv);
21+ ret = rrd_create(argc, (const char**) argv);
22 if (ret == -1) {
23 sensorLog(LOG_ERR, "Error creating RRD file: %s: %s",
24 sensord_args.rrdFile, rrd_get_error());
25@@ -455,7 +455,7 @@ int rrdUpdate(void)
26 const char *argv[] = {
27 "sensord", sensord_args.rrdFile, rrdBuff, NULL
28 };
29- if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) {
30+ if ((ret = rrd_update(3, (const char **) /* WEAK */ argv))) {
31 sensorLog(LOG_ERR, "Error updating RRD file: %s: %s",
32 sensord_args.rrdFile, rrd_get_error());
33 }
34--
352.39.2
36
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
index aba5ab5878..af0f5a7999 100644
--- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
+++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https;branch=mast
14 file://fancontrol.init \ 14 file://fancontrol.init \
15 file://sensord.init \ 15 file://sensord.init \
16 file://0001-Change-PIDFile-path-from-var-run-to-run.patch \ 16 file://0001-Change-PIDFile-path-from-var-run-to-run.patch \
17 file://0001-Fix-building-with-GCC-14.patch \
17" 18"
18SRCREV = "1667b850a1ce38151dae17156276f981be6fb557" 19SRCREV = "1667b850a1ce38151dae17156276f981be6fb557"
19 20
@@ -43,20 +44,19 @@ SYSTEMD_SERVICE:${PN}-fancontrol = "fancontrol.service"
43SYSTEMD_SERVICE:${PN}-sensord = "sensord.service" 44SYSTEMD_SERVICE:${PN}-sensord = "sensord.service"
44SYSTEMD_AUTO_ENABLE = "disable" 45SYSTEMD_AUTO_ENABLE = "disable"
45 46
46S = "${WORKDIR}/git"
47 47
48EXTRA_OEMAKE = 'EXLDFLAGS="${LDFLAGS}" \ 48EXTRA_OEMAKE = 'EXLDFLAGS="${LDFLAGS}" \
49 MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \ 49 MACHINE=${TARGET_ARCH} PREFIX=${prefix} MANDIR=${mandir} \
50 LIBDIR=${libdir} \ 50 LIBDIR=${libdir} \
51 CC="${CC}" AR="${AR}"' 51 CC="${CC}" AR="${AR}" \
52 PROG_EXTRA="sensors ${PACKAGECONFIG_CONFARGS}"'
52 53
53do_compile() { 54do_compile() {
54 sed -i -e 's:^# \(PROG_EXTRA\):\1:' ${S}/Makefile
55 # Respect LDFLAGS 55 # Respect LDFLAGS
56 sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' ${S}/Makefile 56 sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' ${S}/Makefile
57 sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \ 57 sed -i -e 's/\$(LIBSHSONAME) -o/$(LIBSHSONAME) \$(LDFLAGS) -o/g' \
58 ${S}/lib/Module.mk 58 ${S}/lib/Module.mk
59 oe_runmake user PROG_EXTRA="sensors ${PACKAGECONFIG_CONFARGS}" 59 oe_runmake user
60} 60}
61 61
62do_install() { 62do_install() {
@@ -70,11 +70,11 @@ do_install() {
70 install -d ${D}${INIT_D_DIR} 70 install -d ${D}${INIT_D_DIR}
71 71
72 # Install fancontrol init script 72 # Install fancontrol init script
73 install -m 0755 ${WORKDIR}/fancontrol.init ${D}${INIT_D_DIR}/fancontrol 73 install -m 0755 ${UNPACKDIR}/fancontrol.init ${D}${INIT_D_DIR}/fancontrol
74 74
75 if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then 75 if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then
76 # Install sensord init script 76 # Install sensord init script
77 install -m 0755 ${WORKDIR}/sensord.init ${D}${INIT_D_DIR}/sensord 77 install -m 0755 ${UNPACKDIR}/sensord.init ${D}${INIT_D_DIR}/sensord
78 fi 78 fi
79 79
80 # Insall sensord service script 80 # Insall sensord service script
diff --git a/meta-oe/recipes-bsp/lsscsi/lsscsi_0.32.bb b/meta-oe/recipes-bsp/lsscsi/lsscsi_0.32.bb
new file mode 100644
index 0000000000..9df6ee9efc
--- /dev/null
+++ b/meta-oe/recipes-bsp/lsscsi/lsscsi_0.32.bb
@@ -0,0 +1,15 @@
1SUMMARY = "The lsscsi command lists information about SCSI devices in Linux"
2HOMEPAGE = "http://sg.danny.cz/scsi/lsscsi.html"
3LICENSE = "GPL-2.0-only"
4SECTION = "base"
5LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
6
7SRC_URI = "http://sg.danny.cz/scsi/${BP}.tgz"
8
9SRC_URI[sha256sum] = "0a800e9e94dca2ab702d65d72777ae8cae078e3d74d0bcbed64ba0849e8029a1"
10
11inherit autotools
12
13S = "${UNPACKDIR}/lsscsi-${PV}"
14
15UPSTREAM_CHECK_REGEX = "lsscsi-(?P<pver>\d+(\.\d+)+)\.tgz"
diff --git a/meta-oe/recipes-bsp/lsscsi/lsscsi_030.bb b/meta-oe/recipes-bsp/lsscsi/lsscsi_030.bb
deleted file mode 100644
index 9d3d7d8060..0000000000
--- a/meta-oe/recipes-bsp/lsscsi/lsscsi_030.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1SUMMARY = "The lsscsi command lists information about SCSI devices in Linux"
2HOMEPAGE = "http://sg.danny.cz/scsi/lsscsi.html"
3LICENSE = "GPL-2.0-only"
4SECTION = "base"
5LIC_FILES_CHKSUM="file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
6
7SRC_URI = "http://sg.danny.cz/scsi/${BP}.tgz"
8
9SRC_URI[sha256sum] = "619a2187405f02c5f57682f3478bffc75326803cd08839e39d434250c5518b15"
10
11inherit autotools
12
13S = "${WORKDIR}/lsscsi-${PV}r154"
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.8.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.12.bb
index 81b30c283d..eae49b04ea 100644
--- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.8.bb
+++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.12.bb
@@ -6,25 +6,29 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \
6 file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ 6 file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \
7 file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" 7 file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2"
8DEPENDS = "json-c libnvme" 8DEPENDS = "json-c libnvme"
9SRCREV = "43b716b982da3df1cf8c4658f7c31b0fe28d377b" 9SRCREV = "71fa5d9310d6b41a69e844593423ac91b1453472"
10 10
11SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" 11SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https"
12 12
13S = "${WORKDIR}/git"
14
15inherit bash-completion meson pkgconfig systemd 13inherit bash-completion meson pkgconfig systemd
16 14
17EXTRA_OEMESON += "-Dsystemddir=${systemd_unitdir}/system" 15EXTRA_OEMESON += "-Dsystemddir=${systemd_unitdir}/system"
18 16
19pkg_postinst_ontarget:${PN}() { 17pkg_postinst_ontarget:${PN}-user () {
20 ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn 18 ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn
21 ${bindir}/uuidgen > ${sysconfdir}/nvme/hostid 19 ${bindir}/uuidgen > ${sysconfdir}/nvme/hostid
22} 20}
23 21
24PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" 22PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion ${PN}-user"
25 23
26FILES:${PN} += "${systemd_system_unitdir}" 24FILES:${PN} += "${systemd_system_unitdir}"
27FILES:${PN}-dracut = "${nonarch_libdir}/dracut/dracut.conf.d" 25FILES:${PN}-dracut = "${nonarch_libdir}/dracut/dracut.conf.d"
28FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" 26FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions"
27ALLOW_EMPTY:${PN}-user = "1"
28
29RDEPENDS:${PN}-user = "util-linux-uuidgen"
29 30
30RDEPENDS:${PN} = "util-linux-uuidgen" 31# This one is reproducible only on 32bit MACHINEs
32# http://errors.yoctoproject.org/Errors/Details/766964/
33# git/plugins/virtium/virtium-nvme.c:205:63: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types]
34CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb
index 2a736716db..0bdd8042f8 100644
--- a/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb
+++ b/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb
@@ -15,7 +15,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/${BP}.tar.xz \
15 file://lex_sys_types.patch \ 15 file://lex_sys_types.patch \
16" 16"
17 17
18SRC_URI[md5sum] = "885431c3cefb76ffdad8cb985134e996"
19SRC_URI[sha256sum] = "57c27be8f04ef4d535bcfa988567316cc57659fe69068327486dab53791e6558" 18SRC_URI[sha256sum] = "57c27be8f04ef4d535bcfa988567316cc57659fe69068327486dab53791e6558"
20 19
21inherit pkgconfig 20inherit pkgconfig
diff --git a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb
index 61be5b2dcc..a270a23dde 100644
--- a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb
+++ b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4b5fcfc87fb615860d398b5e38685edf"
6SRC_URI = "file://pointercal \ 6SRC_URI = "file://pointercal \
7 file://COPYING" 7 file://COPYING"
8 8
9S = "${WORKDIR}" 9S = "${UNPACKDIR}"
10 10
11do_install() { 11do_install() {
12 # Only install file if it has a contents 12 # Only install file if it has a contents
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 21:36:06 +0000