diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-oe/recipes-bsp | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-bsp')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb | 1 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch | 69 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb (renamed from meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb) | 5 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch | 26 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb (renamed from meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb) | 6 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-bsp/rwmem/rwmem_1.2.bb | 35 |
7 files changed, 104 insertions, 41 deletions
diff --git a/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb index 09e7384882..b89fe6771c 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb @@ -30,6 +30,7 @@ RDEPENDS_${PN}_arm = "dmidecode" RDEPENDS_${PN}_aarch64 = "dmidecode" RDEPENDS_${PN}_powerpc = "dmidecode" RDEPENDS_${PN}_powerpc64 = "dmidecode" +RDEPENDS_${PN}_powerpc64le = "dmidecode" RDEPENDS_${PN}_append = " \ perl \ perl-module-file-basename \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch new file mode 100644 index 0000000000..7ac53650f2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch @@ -0,0 +1,69 @@ +From 8a236330f2af56bde21e9f69208ea3e59f529f0c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Mar 2020 17:02:30 -0700 +Subject: [PATCH] typecast enum conversions explicitly + +clang complains like below + +libflashrom.c:191:43: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion] + supported_boards[i].working = binfo[i].working; + ~ ~~~~~~~~~^~~~~~~ +libflashrom.c:229:46: error: implicit conversion from enumeration type 'const enum test_state' to different enumeration type 'enum flashrom_test_state' [-Werror,-Wenum-conversion] + supported_chipsets[i].status = chipset[i].status; + ~ ~~~~~~~~~~~^~~~~~ + +However these enums are exactly same so they can be typecasted + +libflashrom.h + +/** @ingroup flashrom-query */ +enum flashrom_test_state { + FLASHROM_TESTED_OK = 0, + FLASHROM_TESTED_NT = 1, + FLASHROM_TESTED_BAD = 2, + FLASHROM_TESTED_DEP = 3, + FLASHROM_TESTED_NA = 4, +}; + +flash.h + +enum test_state { + OK = 0, + NT = 1, /* Not tested */ + BAD, /* Known to not work */ + DEP, /* Support depends on configuration (e.g. Intel flash descriptor) */ + NA, /* Not applicable (e.g. write support on ROM chips) */ + }; + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libflashrom.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libflashrom.c b/libflashrom.c +index 0dec22e..7956685 100644 +--- a/libflashrom.c ++++ b/libflashrom.c +@@ -188,7 +188,7 @@ 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 +226,7 @@ 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-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb index 074a1a5f69..642cec1598 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb @@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "pciutils libusb libusb-compat" SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \ + file://0001-typecast-enum-conversions-explicitly.patch \ " -SRC_URI[md5sum] = "91bab6c072e38a493bb4eb673e4fe0d6" -SRC_URI[sha256sum] = "aeada9c70c22421217c669356180c0deddd0b60876e63d2224e3260b90c14e19" +SRC_URI[md5sum] = "7f8e4b87087eb12ecee0fcc5445b4956" +SRC_URI[sha256sum] = "e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b" S = "${WORKDIR}/flashrom-v${PV}" diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index 48490e8d83..890db55bcc 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ DEPENDS = " \ bison-native \ flex-native \ - rrdtool \ virtual/libiconv \ " @@ -91,7 +90,7 @@ ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += " \ ${PN}-libsensors \ ${PN}-sensors \ - ${PN}-sensord \ + ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ ${PN}-fancontrol \ ${PN}-sensorsdetect \ ${PN}-sensorsconfconvert \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch new file mode 100644 index 0000000000..be5d0dac79 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch @@ -0,0 +1,26 @@ +From 0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f Mon Sep 17 00:00:00 2001 +From: Neel Chotai <neel@chot.ai> +Date: Fri, 14 Feb 2020 17:56:23 +0000 +Subject: [PATCH] fix musl compilation + +Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f] +Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> +--- + plugins/micron/micron-nvme.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c +index 8240887..165fcf0 100644 +--- a/plugins/micron/micron-nvme.c ++++ b/plugins/micron/micron-nvme.c +@@ -13,6 +13,7 @@ + #include "nvme-print.h" + #include "nvme-ioctl.h" + #include <sys/ioctl.h> ++#include <limits.h> + + #define CREATE_CMD + #include "micron-nvme.h" +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb index ea8bc1738e..4f4bb2dfab 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb @@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" DEPENDS = "util-linux" PV .= "+git${SRCPV}" -SRC_URI = "git://github.com/linux-nvme/nvme-cli.git" -SRCREV = "977e7d4cf59c3c7f89e9c093c91f991b07292e45" +SRC_URI = "git://github.com/linux-nvme/nvme-cli.git \ + file://0001-fix-musl-compilation.patch \ +" +SRCREV = "1d84d6ae0c7d7ceff5a73fe174dde8b0005f6108" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-openembedded/meta-oe/recipes-bsp/rwmem/rwmem_1.2.bb deleted file mode 100644 index 065243ccfe..0000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/rwmem/rwmem_1.2.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "A small tool to read/write memory" -DESCRIPTION = "rwmem is a small tool for reading and writing device registers. \ -rwmem supports two modes: mmap mode and i2c mode. \ -\ -In mmap mode rwmem accesses a file by memory mapping it. \ -Using /dev/mem as the memory mapped file makes rwmem access memory and \ -can thus be used to access devices which have memory mapped registers. \ -\ -In i2c mode rwmem accesses an i2c peripheral by sending i2c messages to it." - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS += "python3 python3-pybind11" - -PV .= "+git${SRCPV}" - -SRCREV_rwmem = "3ec3e421211b58e766651c2e3a3a21acf14a1906" -SRCREV_inih = "4b10c654051a86556dfdb634c891b6c3224c4109" - -SRCREV_FORMAT = "rwmem_inih" - -SRC_URI = " \ - git://github.com/tomba/rwmem.git;protocol=https;name=rwmem \ - git://github.com/benhoyt/inih.git;protocol=https;name=inih;nobranch=1;destsuffix=git/ext/inih \ -" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -do_install() { - install -D -m 0755 ${B}/bin/rwmem ${D}${bindir}/rwmem - install -D -m 0644 ${B}/lib/librwmem.a ${D}${libdir}/librwmem.a -} |