diff options
Diffstat (limited to 'meta-oe/recipes-bsp')
22 files changed, 480 insertions, 245 deletions
diff --git a/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb b/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb new file mode 100644 index 0000000000..4688ae860b --- /dev/null +++ b/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb @@ -0,0 +1,22 @@ +SUMMARY = "Thunderbolt user-space management tool" +DESCRIPTION = "Userspace system daemon to enable security levels for Thunderbolt on GNU/Linux" +HOMEPAGE = "https://gitlab.freedesktop.org/bolt/bolt" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "udev polkit dbus" +REQUIRED_DISTRO_FEATURES = "polkit" + +SRC_URI = "git://gitlab.freedesktop.org/bolt/bolt.git;protocol=https;branch=master" +SRCREV = "f03c50b22ae3fda26711ddabd91e2c5dd8103478" + +S = "${WORKDIR}/git" + +CVE_PRODUCT = "freedesktop:bolt" + +inherit cmake pkgconfig meson features_check + +FILES:${PN} += "${datadir}/dbus-1/* \ + ${datadir}/polkit-1/* \ + ${libdir}/systemd/* \ + " diff --git a/meta-oe/recipes-bsp/con2fbmap/con2fbmap/0001-con2fbmap-Add-missing-include-on-string.h.patch b/meta-oe/recipes-bsp/con2fbmap/con2fbmap/0001-con2fbmap-Add-missing-include-on-string.h.patch new file mode 100644 index 0000000000..d1b75f1c54 --- /dev/null +++ b/meta-oe/recipes-bsp/con2fbmap/con2fbmap/0001-con2fbmap-Add-missing-include-on-string.h.patch @@ -0,0 +1,28 @@ +From 0a948d8d91b789e9c9b60136fada75b1d464af63 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Sep 2022 18:31:27 -0700 +Subject: [PATCH] con2fbmap: Add missing include on string.h + +strerror() is from string.h therefore include it to fix -Wimplicit-function-declaration +warnings + +Upstream-Status: Submitted [https://gitlab.com/pibox/con2fbmap/-/merge_requests/1] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/con2fbmap.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/con2fbmap.c b/src/con2fbmap.c +index 7831931..7a2e870 100644 +--- a/src/con2fbmap.c ++++ b/src/con2fbmap.c +@@ -1,5 +1,6 @@ + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> /* for strerror */ + #include <unistd.h> + #include <fcntl.h> + #include <sys/ioctl.h> +-- +2.37.3 + diff --git a/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb b/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb index 5d1c5ba7e4..302a61e8a8 100644 --- a/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb +++ b/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb @@ -9,7 +9,9 @@ SECTION = "console/utils" DEPENDS = "" SRCREV = "61ed2f28b294b1ebeb767df8cb5fcd391709c8e2" -SRC_URI = "git://gitlab.com/pibox/con2fbmap.git;protocol=https;branch=master" +SRC_URI = "git://gitlab.com/pibox/con2fbmap.git;protocol=https;branch=master \ + file://0001-con2fbmap-Add-missing-include-on-string.h.patch \ + " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch index fb2f07f073..72f4801000 100644 --- a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch +++ b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- git.old/Makefile 2012-04-17 13:29:46.280435340 +0200 +++ git/Makefile 2012-04-17 13:31:13.664433470 +0200 @@ -77,17 +77,7 @@ INSTALL_PROGRAM = ${INSTALL} diff --git a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb index 1304ba9e03..cb62ee46af 100644 --- a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb +++ b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb @@ -16,7 +16,6 @@ SRC_URI = "git://github.com/emagii/cpufrequtils.git;branch=master;protocol=https EXTRA_OEMAKE:append = " ${@['', 'NLS=false']['${USE_NLS}' == 'no']} " -PR = "r5" S = "${WORKDIR}/git" 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 455859ec86..03076cbc60 100644 --- a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb +++ b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " sysfsutils" SRCREV = "1c57818ecee186aa47af0342149577df5302c022" -PV = "0.18+git${SRCPV}" +PV = "0.18+git" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb index e8b491a435..0a041835e1 100644 --- a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb +++ b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE-APACHE;md5=7b486c2338d225a1405d979ed2c15ce8 \ SRC_URI = "git://github.com/teg/firmwared.git;branch=master;protocol=https \ file://firmwared.service" -PV = "0+git${SRCPV}" +PV = "0+git" SRCREV = "2e6b5db43d63a5c0283a4cae9a6a20b7ad107a04" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch deleted file mode 100644 index f2302dbcc3..0000000000 --- a/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch +++ /dev/null @@ -1,45 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From 3a0c1966e4c66f91e6e8551e906b6db38002acb4 Mon Sep 17 00:00:00 2001 -From: Angel Pons <th3fanbus@gmail.com> -Date: Wed, 27 May 2020 12:15:51 +0200 -Subject: [PATCH] libflashrom.c: Use casts on enum conversions - -This allows flashrom to build with GCC 10. - -Change-Id: I2166cdf3681452631ef8e980face2924e9a6c81a -Signed-off-by: Angel Pons <th3fanbus@gmail.com> -Reviewed-on: https://review.coreboot.org/c/flashrom/+/41775 -Tested-by: build bot (Jenkins) <no-reply@coreboot.org> -Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> ---- - libflashrom.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/libflashrom.c b/libflashrom.c -index ab7e364..c20d9c7 100644 ---- a/libflashrom.c -+++ b/libflashrom.c -@@ -188,7 +188,8 @@ struct flashrom_board_info *flashrom_supported_boards(void) - for (; i < boards_known_size; ++i) { - supported_boards[i].vendor = binfo[i].vendor; - supported_boards[i].name = binfo[i].name; -- supported_boards[i].working = binfo[i].working; -+ supported_boards[i].working = -+ (enum flashrom_test_state) binfo[i].working; - } - } else { - msg_gerr("Memory allocation error!\n"); -@@ -226,7 +227,8 @@ struct flashrom_chipset_info *flashrom_supported_chipsets(void) - supported_chipsets[i].chipset = chipset[i].device_name; - supported_chipsets[i].vendor_id = chipset[i].vendor_id; - supported_chipsets[i].chipset_id = chipset[i].device_id; -- supported_chipsets[i].status = chipset[i].status; -+ supported_chipsets[i].status = -+ (enum flashrom_test_state) chipset[i].status; - } - } else { - msg_gerr("Memory allocation error!\n"); --- -2.25.1 diff --git a/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb b/meta-oe/recipes-bsp/flashrom/flashrom_1.2.1.bb index bdc3ca084c..b2592d294b 100644 --- a/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb +++ b/meta-oe/recipes-bsp/flashrom/flashrom_1.2.1.bb @@ -4,13 +4,11 @@ HOMEPAGE = "http://flashrom.org" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \ - file://0001-typecast-enum-conversions-explicitly.patch \ file://meson-fixes.patch \ file://0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch \ file://0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch \ " -SRC_URI[md5sum] = "7f8e4b87087eb12ecee0fcc5445b4956" -SRC_URI[sha256sum] = "e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b" +SRC_URI[sha256sum] = "89a7ff5beb08c89b8795bbd253a51b9453547a864c31793302296b56bbc56d65" S = "${WORKDIR}/flashrom-v${PV}" diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.1.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.8.1.bb deleted file mode 100644 index 7576b846fb..0000000000 --- a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.1.bb +++ /dev/null @@ -1,127 +0,0 @@ -SUMMARY = "A simple daemon to allow session software to update firmware" -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "glib-2.0 libxmlb json-glib sqlite3 libjcat gcab vala-native" - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://run-ptest" -SRC_URI[sha256sum] = "5756466442eb9134fb40cdc8a46f9e01003247c8eac82fa5d8b16f6420375b79" - -UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" - -# Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages - -GIDOCGEN_MESON_OPTION = 'docs' -GIDOCGEN_MESON_ENABLE_FLAG = 'docgen' -GIDOCGEN_MESON_DISABLE_FLAG = 'none' - -PACKAGECONFIG ??= "curl gnutls gudev gusb \ - ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests plugin_dummy', '', d)} \ - hsi \ - plugin_acpi_phat \ - plugin_amt \ - plugin_bcm57xx \ - plugin_emmc \ - plugin_ep963x \ - plugin_fastboot \ - plugin_flashrom \ - plugin_gpio \ - plugin_intel_spi \ - plugin_logitech_bulkcontroller \ - plugin_modem_manager \ - plugin_msr \ - plugin_nitrokey \ - plugin_nvme \ - plugin_parade_lspcon \ - plugin_pixart_rf \ - plugin_platform_integrity \ - plugin_realtek_mst \ - plugin_redfish \ - plugin_synaptics_mst \ - plugin_synaptics_rmi \ - plugin_scsi \ - plugin_thunderbolt \ - plugin_uf2 \ - plugin_upower \ - sqlite" - -PACKAGECONFIG[bluetooth] = "-Dbluez=true,-Dbluez=false" -PACKAGECONFIG[compat-cli] = "-Dcompat_cli=true,-Dcompat_cli=false" -PACKAGECONFIG[consolekit] = "-Dconsolekit=true,-Dconsolekit=false,consolekit" -PACKAGECONFIG[curl] = "-Dcurl=true,-Dcurl=false,curl" -PACKAGECONFIG[firmware-packager] = "-Dfirmware-packager=true,-Dfirmware-packager=false" -PACKAGECONFIG[fish-completion] = "-Dfish_completion=true,-Dfish_completion=false" -PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" -PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" -PACKAGECONFIG[gusb] = "-Dgusb=true,-Dgusb=false,libgusb" -PACKAGECONFIG[hsi] = "-Dhsi=true,-Dhsi=false" -PACKAGECONFIG[libarchive] = "-Dlibarchive=true,-Dlibarchive=false,libarchive" -PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" -PACKAGECONFIG[metainfo] = "-Dmetainfo=true,-Dmetainfo=false" -PACKAGECONFIG[offline] = "-Doffline=true,-Doffline=false" -PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit" -PACKAGECONFIG[sqlite] = "-Dsqlite=true,-Dsqlite=false,sqlite3" -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" -PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native" - - -# TODO plugins-all meta-option that expands to all plugin_*? -PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=true,-Dplugin_acpi_phat=false" -PACKAGECONFIG[plugin_amt] = "-Dplugin_amt=true,-Dplugin_amt=false" -PACKAGECONFIG[plugin_bcm57xx] = "-Dplugin_bcm57xx=true,-Dplugin_bcm57xx=false" -PACKAGECONFIG[plugin_cfu] = "-Dplugin_cfu=true,-Dplugin_cfu=false" -PACKAGECONFIG[plugin_dell] = "-Dplugin_dell=true,-Dplugin_dell=false,libsmbios" -PACKAGECONFIG[plugin_dummy] = "-Dplugin_dummy=true,-Dplugin_dummy=false" -PACKAGECONFIG[plugin_emmc] = "-Dplugin_emmc=true,-Dplugin_emmc=false" -PACKAGECONFIG[plugin_ep963x] = "-Dplugin_ep963x=true,-Dplugin_ep963x=false" -PACKAGECONFIG[plugin_fastboot] = "-Dplugin_fastboot=true,-Dplugin_fastboot=false" -PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=true,-Dplugin_flashrom=false,flashrom" -PACKAGECONFIG[plugin_gpio] = "-Dplugin_gpio=true,-Dplugin_gpio" -PACKAGECONFIG[plugin_intel_spi] = "-Dplugin_intel_spi=true -Dlzma=true,-Dplugin_intel_spi=false -Dlzma=false,xz" -PACKAGECONFIG[plugin_logitech_bulkcontroller] = "-Dplugin_logitech_bulkcontroller=true,-Dplugin_logitech_bulkcontroller=false,protobuf-c-native protobuf-c" -PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=true,-Dplugin_modem_manager=false,libqmi modemmanager" -PACKAGECONFIG[plugin_msr] = "-Dplugin_msr=true,-Dplugin_msr=false,cpuid" -PACKAGECONFIG[plugin_nitrokey] = "-Dplugin_nitrokey=true,-Dplugin_nitrokey=false" -PACKAGECONFIG[plugin_nvme] = "-Dplugin_nvme=true,-Dplugin_nvme=false" -PACKAGECONFIG[plugin_parade_lspcon] = "-Dplugin_parade_lspcon=true,-Dplugin_parade_lspcon=false" -PACKAGECONFIG[plugin_pixart_rf] = "-Dplugin_pixart_rf=true,-Dplugin_pixart_rf=false" -PACKAGECONFIG[plugin_platform_integrity] = "-Dplugin_platform_integrity=true,-Dplugin_platform_integrity=false" -PACKAGECONFIG[plugin_powerd] = "-Dplugin_powerd=true,-Dplugin_powerd=false" -PACKAGECONFIG[plugin_realtek_mst] = "-Dplugin_realtek_mst=true,-Dplugin_realtek_mst=false" -PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=true,-Dplugin_redfish=false" -PACKAGECONFIG[plugin_scsi] = "-Dplugin_scsi=true,-Dplugin_scsi=false" -PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=true,-Dplugin_synaptics_mst=false" -PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=true,-Dplugin_synaptics_rmi=false" -PACKAGECONFIG[plugin_thunderbolt] = "-Dplugin_thunderbolt=true,-Dplugin_thunderbolt=false" -PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=true,-Dplugin_tpm=false,tpm2-tss" -# Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported -PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=true -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=false,efivar fwupd-efi" -PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=true,-Dplugin_uefi_pk=false" -PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=true,-Dplugin_uf2=false" -PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=true,-Dplugin_upower=false" - -# Always disable these plugins on non-x86 platforms as they don't compile or are useless -DISABLE_NON_X86 = "plugin_amt plugin_intel_spi plugin_msr plugin_thunderbolt" -DISABLE_NON_X86:x86 = "" -DISABLE_NON_X86:x86-64 = "" -PACKAGECONFIG:remove = "${DISABLE_NON_X86}" - -FILES:${PN} += "${libdir}/fwupd-plugins-* \ - ${systemd_unitdir} \ - ${datadir}/fish \ - ${datadir}/metainfo \ - ${datadir}/icons \ - ${datadir}/dbus-1 \ - ${datadir}/polkit-1 \ - ${nonarch_libdir}/modules-load.d" - -FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \ - ${datadir}/installed-tests/" -RDEPENDS:${PN}-ptest += "gnome-desktop-testing" diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb new file mode 100644 index 0000000000..d20d5ed2ae --- /dev/null +++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb @@ -0,0 +1,142 @@ +SUMMARY = "A simple daemon to allow session software to update firmware" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native python3-jinja2-native" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://run-ptest" +SRC_URI[sha256sum] = "4e554f77a8a73383a41d5637b62e6c8a8936e66cd1d18585baf29d7fe47fc4d7" + +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" + +# Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages useradd + +GIDOCGEN_MESON_OPTION = 'docs' +GIDOCGEN_MESON_ENABLE_FLAG = 'enabled' +GIDOCGEN_MESON_DISABLE_FLAG = 'disabled' +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +PACKAGECONFIG ??= "curl gnutls gudev gusb \ + ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ + hsi \ + plugin_android_boot \ + plugin_acpi_phat \ + plugin_bcm57xx \ + plugin_emmc \ + plugin_ep963x \ + plugin_fastboot \ + plugin_flashrom \ + plugin_gpio \ + plugin_igsc \ + plugin_intel_me \ + plugin_intel_spi \ + plugin_logitech_bulkcontroller \ + plugin_logitech_scribe \ + plugin_modem_manager \ + plugin_msr \ + plugin_nitrokey \ + plugin_nvme \ + plugin_parade_lspcon \ + plugin_pixart_rf \ + plugin_realtek_mst \ + plugin_redfish \ + plugin_synaptics_mst \ + plugin_synaptics_rmi \ + plugin_scsi \ + plugin_uf2 \ + plugin_upower \ + sqlite" + +PACKAGECONFIG[bluetooth] = "-Dbluez=enabled,-Dbluez=disabled" +PACKAGECONFIG[compat-cli] = "-Dcompat_cli=true,-Dcompat_cli=false" +PACKAGECONFIG[consolekit] = "-Dconsolekit=enabled,-Dconsolekit=disabled,consolekit" +PACKAGECONFIG[curl] = "-Dcurl=enabled,-Dcurl=disabled,curl" +PACKAGECONFIG[firmware-packager] = "-Dfirmware-packager=true,-Dfirmware-packager=false" +PACKAGECONFIG[fish-completion] = "-Dfish_completion=true,-Dfish_completion=false" +PACKAGECONFIG[gnutls] = "-Dgnutls=enabled,-Dgnutls=disabled,gnutls" +PACKAGECONFIG[gudev] = "-Dgudev=enabled,-Dgudev=disabled,libgudev" +PACKAGECONFIG[gusb] = "-Dgusb=enabled,-Dgusb=disabled,libgusb" +PACKAGECONFIG[hsi] = "-Dhsi=enabled,-Dhsi=disabled" +PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" +PACKAGECONFIG[metainfo] = "-Dmetainfo=true,-Dmetainfo=false" +PACKAGECONFIG[offline] = "-Doffline=enabled,-Doffline=disabled" +PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled,polkit" +PACKAGECONFIG[sqlite] = "-Dsqlite=enabled,-Dsqlite=disabled,sqlite3" +PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native" + + +# TODO plugins-all meta-option that expands to all plugin_*? +PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=enabled,-Dplugin_acpi_phat=disabled" +PACKAGECONFIG[plugin_android_boot] = "-Dplugin_android_boot=enabled,-Dplugin_android_boot=disabled" +PACKAGECONFIG[plugin_bcm57xx] = "-Dplugin_bcm57xx=enabled,-Dplugin_bcm57xx=disabled" +PACKAGECONFIG[plugin_cfu] = "-Dplugin_cfu=enabled,-Dplugin_cfu=disabled" +PACKAGECONFIG[plugin_emmc] = "-Dplugin_emmc=enabled,-Dplugin_emmc=disabled" +PACKAGECONFIG[plugin_ep963x] = "-Dplugin_ep963x=enabled,-Dplugin_ep963x=disabled" +PACKAGECONFIG[plugin_fastboot] = "-Dplugin_fastboot=enabled,-Dplugin_fastboot=disabled" +PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=enabled,-Dplugin_flashrom=disabled,flashrom" +PACKAGECONFIG[plugin_gpio] = "-Dplugin_gpio=enabled,-Dplugin_gpio=disabled" +PACKAGECONFIG[plugin_igsc] = "-Dplugin_igsc=enabled,-Dplugin_igsc=disabled" +PACKAGECONFIG[plugin_intel_me] = "-Dplugin_intel_me=enabled,-Dplugin_intel_me=disabled" +PACKAGECONFIG[plugin_intel_spi] = "-Dplugin_intel_spi=true -Dlzma=enabled,-Dplugin_intel_spi=false -Dlzma=disabled,xz" +PACKAGECONFIG[plugin_logitech_bulkcontroller] = "-Dplugin_logitech_bulkcontroller=enabled,-Dplugin_logitech_bulkcontroller=disabled,protobuf-c-native protobuf-c" +PACKAGECONFIG[plugin_logitech_scribe] = "-Dplugin_logitech_scribe=enabled,-Dplugin_logitech_scribe=disabled" +PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=enabled,-Dplugin_modem_manager=disabled,libqmi modemmanager" +PACKAGECONFIG[plugin_msr] = "-Dplugin_msr=enabled,-Dplugin_msr=disabled,cpuid" +PACKAGECONFIG[plugin_nitrokey] = "-Dplugin_nitrokey=enabled,-Dplugin_nitrokey=disabled" +PACKAGECONFIG[plugin_nvme] = "-Dplugin_nvme=enabled,-Dplugin_nvme=disabled" +PACKAGECONFIG[plugin_parade_lspcon] = "-Dplugin_parade_lspcon=enabled,-Dplugin_parade_lspcon=disabled" +PACKAGECONFIG[plugin_pixart_rf] = "-Dplugin_pixart_rf=enabled,-Dplugin_pixart_rf=disabled" +PACKAGECONFIG[plugin_powerd] = "-Dplugin_powerd=enabled,-Dplugin_powerd=disabled" +PACKAGECONFIG[plugin_realtek_mst] = "-Dplugin_realtek_mst=enabled,-Dplugin_realtek_mst=disabled" +PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=enabled,-Dplugin_redfish=disabled" +PACKAGECONFIG[plugin_scsi] = "-Dplugin_scsi=enabled,-Dplugin_scsi=disabled" +PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=enabled,-Dplugin_synaptics_mst=disabled" +PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=enabled,-Dplugin_synaptics_rmi=disabled" +PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=enabled,-Dplugin_tpm=disabled,tpm2-tss" +# Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported +PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=enabled -Dplugin_uefi_capsule_splash=disabled,-Dplugin_uefi_capsule=disabled,efivar fwupd-efi" +PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=enabled,-Dplugin_uefi_pk=disabled" +PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=enabled,-Dplugin_uf2=disabled" +PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=enabled,-Dplugin_upower=disabled" + +# Always disable these plugins on non-x86 platforms as they don't compile or are useless +DISABLE_NON_X86 = "plugin_intel_me plugin_intel_spi plugin_msr" +DISABLE_NON_X86:x86 = "" +DISABLE_NON_X86:x86-64 = "" +PACKAGECONFIG:remove = "${DISABLE_NON_X86}" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" + +do_install:append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then + #Fix up permissions on polkit rules.d to work with rpm4 constraints + chmod 700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + fi +} + +FILES:${PN} += "${libdir}/fwupd-plugins-* \ + ${libdir}/fwupd-${PV} \ + ${systemd_unitdir} \ + ${nonarch_libdir}/sysusers.d/fwupd.conf \ + ${datadir}/fish \ + ${datadir}/metainfo \ + ${datadir}/icons \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ + ${nonarch_libdir}/modules-load.d" + +FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \ + ${datadir}/installed-tests/" +RDEPENDS:${PN}-ptest += "gnome-desktop-testing" diff --git a/meta-oe/recipes-bsp/i2cdev/i2cdev/fix-lsi2c-makefile.patch b/meta-oe/recipes-bsp/i2cdev/i2cdev/fix-lsi2c-makefile.patch new file mode 100644 index 0000000000..820d4bb447 --- /dev/null +++ b/meta-oe/recipes-bsp/i2cdev/i2cdev/fix-lsi2c-makefile.patch @@ -0,0 +1,28 @@ +From 57c09727220e00ab961325a2c85f5611bd1770d6 Mon Sep 17 00:00:00 2001 +Message-Id: <57c09727220e00ab961325a2c85f5611bd1770d6.1701984646.git.joerg.sommer@navimatix.de> +From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de> +Date: Thu, 7 Dec 2023 22:29:40 +0100 +Subject: [PATCH] lsi2c/Makefile: Use builddir to refer to libi2cdev.a + +Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de> +Upstream-Status: Submitted [https://github.com/costad2/i2cdev/pull/2/commits/43f15e97d869797dbfeaacafa13216aaaf353426] +--- + lsi2c/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lsi2c/Makefile.am b/lsi2c/Makefile.am +index 6defc1f..0d81d01 100644 +--- a/lsi2c/Makefile.am ++++ b/lsi2c/Makefile.am +@@ -14,7 +14,7 @@ bin_PROGRAMS=lsi2c + lsi2c_SOURCES = lsi2c.c + + # Linker options for lsi2c +-lsi2c_LDADD = $(top_srcdir)/libi2cdev/libi2cdev.a ++lsi2c_LDADD = $(top_builddir)/libi2cdev/libi2cdev.a + + # Compiler options for lsi2c + lsi2c_CFLAGS = -I$(top_srcdir)/include -std=c99 -fPIC +-- +2.34.1 + diff --git a/meta-oe/recipes-bsp/i2cdev/i2cdev/fix-musl.patch b/meta-oe/recipes-bsp/i2cdev/i2cdev/fix-musl.patch new file mode 100644 index 0000000000..a15514bafe --- /dev/null +++ b/meta-oe/recipes-bsp/i2cdev/i2cdev/fix-musl.patch @@ -0,0 +1,110 @@ +From ce3affeb45a65649dda1edc9a4f0586e9db47ada Mon Sep 17 00:00:00 2001 +Message-Id: <ce3affeb45a65649dda1edc9a4f0586e9db47ada.1705064898.git.joerg.sommer@navimatix.de> +From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <joerg.sommer@navimatix.de> +Date: Fri, 12 Jan 2024 13:59:51 +0100 +Subject: [PATCH] lsi2c: Replace error() by fprintf, drop error.h + +The MUSL C library doesn't support error.h. Because the only usage of this +is the *error* function in lsi2c.c, this gets replaced by a *fprintf*. This +doesn't print the program name, but keeps the message and the error +description. + +Upstream-Status: Submitted [https://github.com/costad2/i2cdev/pull/5] +--- + libi2cdev/access.c | 1 - + libi2cdev/i2c-bus-parser.c | 1 - + libi2cdev/i2c-dev-path.c | 1 - + libi2cdev/i2c-error.c | 1 - + libi2cdev/init.c | 2 -- + libi2cdev/sysfs.c | 1 - + lsi2c/lsi2c.c | 4 ++-- + 7 files changed, 2 insertions(+), 9 deletions(-) + +--- a/libi2cdev/access.c ++++ b/libi2cdev/access.c +@@ -16,7 +16,6 @@ + + #include "busses.h" + #include "data.h" +-#include "error.h" + #include "sysfs.h" + + #include "i2cdiscov.h" +--- a/libi2cdev/i2c-bus-parser.c ++++ b/libi2cdev/i2c-bus-parser.c +@@ -27,9 +27,9 @@ + #include <dirent.h> + #include <fcntl.h> + #include <errno.h> +-#include <error.h> + #include <alloca.h> + #include <search.h> ++#include <libgen.h> + + #include "common.h" + #include "sysfs.h" +--- a/libi2cdev/i2c-dev-path.c ++++ b/libi2cdev/i2c-dev-path.c +@@ -11,7 +11,6 @@ + #include <string.h> + #include <errno.h> + #include <stdio.h> +-#include <error.h> + + #include <linux/limits.h> + +--- a/libi2cdev/i2c-error.c ++++ b/libi2cdev/i2c-error.c +@@ -9,7 +9,6 @@ + + #include <stdlib.h> + #include <stdio.h> +-#include <error.h> + #include <errno.h> + #include <stdbool.h> + #include <stdarg.h> +--- a/libi2cdev/init.c ++++ b/libi2cdev/init.c +@@ -16,10 +16,8 @@ + #include <errno.h> + #include <dirent.h> + #include <unistd.h> +-#include <error.h> + #include <limits.h> + #include <ctype.h> +-#include <error.h> + #include <fcntl.h> + #include <assert.h> + +--- a/libi2cdev/sysfs.c ++++ b/libi2cdev/sysfs.c +@@ -17,8 +17,8 @@ + #include <assert.h> + #include <string.h> + #include <fcntl.h> +-#include <error.h> + #include <errno.h> ++#include <libgen.h> + + #include <sys/types.h> + #include <sys/stat.h> +--- a/lsi2c/lsi2c.c ++++ b/lsi2c/lsi2c.c +@@ -38,7 +38,6 @@ + #include <stdlib.h> + #include <string.h> + #include <errno.h> +-#include <error.h> + #include <getopt.h> + #include <stdbool.h> + +@@ -205,7 +204,8 @@ static int read_config_file(const char * + if (err < 0) { + err = -err; + } +- error(0, err, "Failed to initialize i2cdevices"); ++ fflush(stdout); ++ fprintf(stderr, "Failed to initialize i2cdevices: %s", strerror(err)); + if (config_file) { + fclose(config_file); + } diff --git a/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb b/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb new file mode 100644 index 0000000000..57057c9bf5 --- /dev/null +++ b/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb @@ -0,0 +1,26 @@ +SUMMARY = "i2c dev tools for Linux" +DESCRIPTION = "\ + This package contains an I2C dev library and the i2c bus scanning \ + utility lsi2c. \ +" +HOMEPAGE = "https://github.com/costad2/i2cdev" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=768997ba510a952bef1775c50bc22b00 \ + file://include/libi2cdev.h;beginline=12;endline=25;md5=72486a5e192d6ac5c7e55a4a95e380a6 \ + file://libi2cdev/smbus.c;beginline=9;endline=22;md5=d9a0de5a611b960fa75912ded6c60096 \ + file://lsi2c/lsi2c.c;beginline=11;endline=24;md5=72486a5e192d6ac5c7e55a4a95e380a6 \ +" + +PV = "0.7.0+git" + +SRC_URI = "\ + git://github.com/costad2/i2cdev.git;protocol=https;branch=master \ + file://fix-lsi2c-makefile.patch \ + file://fix-musl.patch \ +" +SRCREV = "ed9ad777d842880e7ac6ca5e0de4bd2d3b4d02dc" + +S = "${WORKDIR}/git" + +inherit autotools diff --git a/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch b/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch deleted file mode 100644 index 09f4993a25..0000000000 --- a/meta-oe/recipes-bsp/ledmon/ledmon/0001-Don-t-build-with-Werror-to-fix-compile-error.patch +++ /dev/null @@ -1,30 +0,0 @@ -Subject: [PATCH] Don't build with -Werror to fix compile error. - -| 550 | _dump_sgpio_amd(&amd_reg->amd); -| | ^~~~~~~~~~~~~ -| amd_sgpio.c: In function '_write_amd_register': -| amd_sgpio.c:558:18: error: taking address of packed member of 'struct amd_register' may result in an unaligned pointer value [-Werror=address-of-packed-member] - -Upstream-Status: Submitted -https://github.com/intel/ledmon/pull/48/commits - -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7bc20f8..7e01bd5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,6 @@ AX_AM_CFLAGS_ADD([-Werror=format-truncation=1]) - AX_AM_CFLAGS_ADD([-Werror=shift-negative-value]) - AX_AM_CFLAGS_ADD([-Werror=alloca]) - AX_AM_CFLAGS_ADD([-Werror=missing-field-initializers]) --AX_AM_CFLAGS_ADD([-Werror]) - AX_AM_CFLAGS_ADD([-Werror=format-signedness]) - - AC_SUBST([AM_CFLAGS]) --- -2.7.4 - diff --git a/meta-oe/recipes-bsp/ledmon/ledmon/0001-fix-build-with-clang.patch b/meta-oe/recipes-bsp/ledmon/ledmon/0001-fix-build-with-clang.patch new file mode 100644 index 0000000000..f1e1d6f780 --- /dev/null +++ b/meta-oe/recipes-bsp/ledmon/ledmon/0001-fix-build-with-clang.patch @@ -0,0 +1,90 @@ +From 28fd86fb4e18af181174176530a80672de4449d2 Mon Sep 17 00:00:00 2001 +From: alperak <alperyasinak1@gmail.com> +Date: Sat, 18 Nov 2023 12:27:17 +0300 +Subject: [PATCH] fix build with clang + +struct ibpi2value is a structure which contains 2 unsigned integers. In +a number of cases the code was not initializing a value for the last value +in the pair in struct ibpi2value ibpi_to_attention. This was raised when +using clang compiler. + +vmdssd.c:49:27: error: missing field 'value' initializer +[-Werror,-Wmissing-field-initializers] + {LED_IBPI_PATTERN_UNKNOWN} + +dellssd.c:74:27: error: missing field 'value' initializer +[-Werror,-Wmissing-field-initializers] + {LED_IBPI_PATTERN_UNKNOWN} + +amd_ipmi.c:57:27: error: missing field 'value' +initializer [-Werror,-Wmissing-field-initializers] + {LED_IBPI_PATTERN_UNKNOWN} + +npem.c:76:27: error: missing field 'value' +initializer [-Werror,-Wmissing-field-initializers] + {LED_IBPI_PATTERN_UNKNOWN} + +Upstream-Status: Submitted [https://github.com/intel/ledmon/pull/179] +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + src/amd_ipmi.c | 2 +- + src/dellssd.c | 2 +- + src/npem.c | 2 +- + src/vmdssd.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/amd_ipmi.c b/src/amd_ipmi.c +index 726f77d..ad36e9e 100644 +--- a/src/amd_ipmi.c ++++ b/src/amd_ipmi.c +@@ -53,7 +53,7 @@ const struct ibpi2value ibpi2amd_ipmi[] = { + {IBPI_PATTERN_FAILED_ARRAY, 0x45}, + {IBPI_PATTERN_REBUILD, 0x46}, + {IBPI_PATTERN_HOTSPARE, 0x47}, +- {IBPI_PATTERN_UNKNOWN} ++ {IBPI_PATTERN_UNKNOWN, 0} + }; + + #define MG9098_CHIP_ID_REG 0x63 +diff --git a/src/dellssd.c b/src/dellssd.c +index 3c10ec7..7f02ea1 100644 +--- a/src/dellssd.c ++++ b/src/dellssd.c +@@ -71,7 +71,7 @@ static const struct ibpi2value ibpi2ssd[] = { + {IBPI_PATTERN_FAILED_DRIVE, BP_FAULT | BP_ONLINE}, + {IBPI_PATTERN_LOCATE, BP_IDENTIFY | BP_ONLINE}, + {IBPI_PATTERN_LOCATE_OFF, BP_ONLINE}, +- {IBPI_PATTERN_UNKNOWN} ++ {IBPI_PATTERN_UNKNOWN, 0} + }; + + #define DELL_OEM_NETFN 0x30 +diff --git a/src/npem.c b/src/npem.c +index c21276d..3499169 100644 +--- a/src/npem.c ++++ b/src/npem.c +@@ -72,7 +72,7 @@ const struct ibpi2value ibpi_to_npem_capability[] = { + {IBPI_PATTERN_FAILED_DRIVE, PCI_NPEM_FAIL_CAP}, + {IBPI_PATTERN_LOCATE, PCI_NPEM_LOCATE_CAP}, + {IBPI_PATTERN_LOCATE_OFF, PCI_NPEM_OK_CAP}, +- {IBPI_PATTERN_UNKNOWN} ++ {IBPI_PATTERN_UNKNOWN, 0} + }; + + static struct pci_access *get_pci_access() +diff --git a/src/vmdssd.c b/src/vmdssd.c +index 51af591..9c63d90 100644 +--- a/src/vmdssd.c ++++ b/src/vmdssd.c +@@ -45,7 +45,7 @@ struct ibpi2value ibpi_to_attention[] = { + {IBPI_PATTERN_REBUILD, ATTENTION_REBUILD}, + {IBPI_PATTERN_LOCATE_OFF, ATTENTION_OFF}, + {IBPI_PATTERN_ONESHOT_NORMAL, ATTENTION_OFF}, +- {IBPI_PATTERN_UNKNOWN} ++ {IBPI_PATTERN_UNKNOWN, 0} + }; + + #define SYSFS_PCIEHP "/sys/module/pciehp" +-- +2.25.1 + diff --git a/meta-oe/recipes-bsp/ledmon/ledmon_git.bb b/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb index dbfd1e7bc0..88a6e5bb30 100644 --- a/meta-oe/recipes-bsp/ledmon/ledmon_git.bb +++ b/meta-oe/recipes-bsp/ledmon/ledmon_0.97.bb @@ -5,37 +5,30 @@ DESCRIPTION = "The utilities are designed primarily to be used on storage server " HOMEPAGE = "https://github.com/intel/ledmon" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ -" +LICENSE = "LGPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" -DEPENDS = "sg3-utils udev" +DEPENDS = "sg3-utils udev pciutils" -inherit autotools systemd +inherit autotools systemd pkgconfig SYSTEMD_SERVICE:${PN} = "ledmon.service" -# 0.93 SRC_URI = "git://github.com/intel/ledmon;branch=master;protocol=https \ - file://0002-include-sys-select.h-and-sys-types.h.patch \ - file://0001-Don-t-build-with-Werror-to-fix-compile-error.patch \ - " + file://0002-include-sys-select.h-and-sys-types.h.patch \ + file://0001-fix-build-with-clang.patch" -SRCREV = "1d72f9cb5c9163b2ecdf19709935720e65f5b90e" +SRCREV = "b0edae14e8660b80ffe0384354038a9f62e2978d" COMPATIBLE_HOST = "(i.86|x86_64).*-linux" COMPATIBLE_HOST:libc-musl = "null" S = "${WORKDIR}/git" + +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '', d)}" + EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}' CFLAGS='${CFLAGS}'" # The ledmon sources include headers in ${S}/config to build but not in CFLAGS. # We need to add this include path in CFLAGS. CFLAGS += "-I${S}/config" - -do_install:append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0755 ${S}/systemd/ledmon.service ${D}${systemd_unitdir}/system - fi -} 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 f821cdaf4a..aba5ab5878 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 @@ -151,12 +151,13 @@ RRECOMMENDS:${PN}-fancontrol = "lmsensors-config-fancontrol" # sensors-detect script files FILES:${PN}-sensorsdetect = "${sbindir}/sensors-detect" FILES:${PN}-sensorsdetect-doc = "${mandir}/man8/sensors-detect.8" -RDEPENDS:${PN}-sensorsdetect = "${PN}-sensors perl perl-modules" +RDEPENDS:${PN}-sensorsdetect = "${PN}-sensors perl perl-module-fcntl perl-module-file-basename \ + perl-module-strict perl-module-constant" # sensors-conf-convert script files FILES:${PN}-sensorsconfconvert = "${bindir}/sensors-conf-convert" FILES:${PN}-sensorsconfconvert-doc = "${mandir}/man8/sensors-conf-convert.8" -RDEPENDS:${PN}-sensorsconfconvert = "${PN}-sensors perl perl-modules" +RDEPENDS:${PN}-sensorsconfconvert = "${PN}-sensors perl perl-module-strict perl-module-vars" # pwmconfig script files FILES:${PN}-pwmconfig = "${sbindir}/pwmconfig" diff --git a/meta-oe/recipes-bsp/lsscsi/lsscsi_0.32.bb b/meta-oe/recipes-bsp/lsscsi/lsscsi_030.bb index 9e6eb7b724..9d3d7d8060 100644 --- a/meta-oe/recipes-bsp/lsscsi/lsscsi_0.32.bb +++ b/meta-oe/recipes-bsp/lsscsi/lsscsi_030.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM="file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "http://sg.danny.cz/scsi/${BP}.tgz" -SRC_URI[sha256sum] = "0a800e9e94dca2ab702d65d72777ae8cae078e3d74d0bcbed64ba0849e8029a1" +SRC_URI[sha256sum] = "619a2187405f02c5f57682f3478bffc75326803cd08839e39d434250c5518b15" inherit autotools -S = "${WORKDIR}/lsscsi-${PV}" +S = "${WORKDIR}/lsscsi-${PV}r154" diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.8.bb index 1055fa42a9..81b30c283d 100644 --- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.8.bb @@ -1,23 +1,20 @@ SUMMARY = "NVMe management command line interface" -AUTHOR = "Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com>" HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" SECTION = "console/utils" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" -DEPENDS = "util-linux" -PV .= "+git${SRCPV}" +LICENSE = "GPL-2.0-only & CC0-1.0 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \ + file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ + file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" +DEPENDS = "json-c libnvme" +SRCREV = "43b716b982da3df1cf8c4658f7c31b0fe28d377b" SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" -SRCREV = "f0e9569df9289d6ee55ba2c23615cc7c73a9b088" S = "${WORKDIR}/git" -inherit bash-completion systemd +inherit bash-completion meson pkgconfig systemd -do_install() { - oe_runmake install-spec DESTDIR=${D} PREFIX=${prefix} \ - UDEVDIR=${nonarch_base_libdir}/udev SYSTEMDDIR=${systemd_unitdir} -} +EXTRA_OEMESON += "-Dsystemddir=${systemd_unitdir}/system" pkg_postinst_ontarget:${PN}() { ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn diff --git a/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb index 42dfcd1e5b..2a736716db 100644 --- a/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb +++ b/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb @@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "udev sysfsutils flex-native bison-native" RDEPENDS:${PN} = "udev module-init-tools" -PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/${BP}.tar.xz \ file://makefile_fix.patch \ @@ -28,11 +27,10 @@ export pcmciaconfdir = "${sysconfdir}/pcmcia" export udevdir = "`pkg-config --variable=udevdir udev`" export udevrulesdir = "`pkg-config --variable=udevdir udev`/rules.d" export UDEV = "1" -LD = "${CC}" CFLAGS =+ "-I${S}/src" CFLAGS =+ "-DPCMCIAUTILS_VERSION=\\"${PV}\\"" -EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'" +EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex' 'LD=${CC}'" do_install () { oe_runmake 'DESTDIR=${D}' install diff --git a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb index d3e7973329..61be5b2dcc 100644 --- a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb +++ b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb @@ -1,6 +1,5 @@ SUMMARY = "Touchscreen calibration data" SECTION = "base" -PR = "r11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=4b5fcfc87fb615860d398b5e38685edf" @@ -20,3 +19,5 @@ do_install() { ALLOW_EMPTY:${PN} = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_DEFAULT_DEPS = "1" + +BBCLASSEXTEND = "native nativesdk" |