diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-03-09 00:45:46 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-03-09 00:45:46 +0300 |
commit | 930df2e58b9725756edbccf99fd4979026fc28fd (patch) | |
tree | 8c5fa9f20219e9bc4580bb18e03b8dd8043a9a4f /meta-openembedded/meta-oe/recipes-core | |
parent | 7c5f8839ec3d71a2170b8f3514a16a67c69d1c7c (diff) | |
parent | 377d8f40e88eeb9ccb1321590a3af3c2caa94dda (diff) | |
download | openbmc-930df2e58b9725756edbccf99fd4979026fc28fd.tar.xz |
Merge tag '0.35' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core')
9 files changed, 93 insertions, 8 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb new file mode 100644 index 000000000..db4e591cb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb @@ -0,0 +1,26 @@ +SUMMARY = "D-Bus wrapper in C++ for dbus" +HOMEPAGE = "https://dbus-cxx.github.io/" +SECTION = "base" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" + +FILEEXTRAPATHS_prepend = "${THISDIR}/files" +SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master" +SRC_URI += "file://fix_build_musl.patch" +SRCREV = "ea7f8e361d11dc7d41d9ae2c4128aed2cdadd84e" + +DEPENDS = "\ + dbus \ + libsigc++-2.0 \ +" + +RDEPENDS_${PN} = "\ + dbus \ + libsigc++-2.0 \ +" + +S = "${WORKDIR}/git" + +inherit pkgconfig cmake + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch new file mode 100644 index 000000000..3d912e0b0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch @@ -0,0 +1,26 @@ +diff --git a/dbus-cxx/timeout.cpp b/dbus-cxx/timeout.cpp +index 16e9f7e..aa0b99f 100644 +--- a/dbus-cxx/timeout.cpp ++++ b/dbus-cxx/timeout.cpp +@@ -132,7 +132,7 @@ namespace DBus + return m_cobj; + } + +- void Timeout::timer_callback_proxy( sigval_t sv ) { ++ void Timeout::timer_callback_proxy( union sigval sv ) { + SIMPLELOGGER_DEBUG( "dbus.Timeout","Timeout::timer_callback_proxy" ); + Timeout* t; + t = ( Timeout* ) sv.sival_ptr; +diff --git a/dbus-cxx/timeout.h b/dbus-cxx/timeout.h +index 1e469b5..5b69fbb 100644 +--- a/dbus-cxx/timeout.h ++++ b/dbus-cxx/timeout.h +@@ -83,7 +83,7 @@ namespace DBus + + std::mutex m_arming_mutex; + +- static void timer_callback_proxy( sigval_t sv ); ++ static void timer_callback_proxy( union sigval sv ); + + }; + diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb index 36355dd92..2e43939b9 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1238d5bccbb6bda30654e48dcc0a554b" SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https" -PV = "2.2.13+git${SRCPV}" -SRCREV = "3b7ded60ebb7e1afddcbae6f82ac8645b276e358" +PV = "2.2.14+git${SRCPV}" +SRCREV = "109694ef2686fe25538c05f3c856912f8ef571a9" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb index 0e29324cf..0148c0c2e 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb @@ -6,8 +6,8 @@ SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -PV = "2.0.12+git${SRCPV}" -SRCREV = "524f5ca96c3b9775f9d1debbdbcc2666bcce5c07" +PV = "2.0.13+git${SRCPV}" +SRCREV = "b230a96b61e9e35b8da1565893d74380646e03c8" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb index d262dd147..4a165001d 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "base" S = "${WORKDIR}/git" -# v2020.06.16 -SRCREV = "b04034a17e214322772c19e7ccd2adf0cd306920" +# v2020.12.18 +SRCREV = "c57ba81c460ee97b6b9d0b8d18faf5ba6883114b" SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git" do_configure[noexec] = "1" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb index ed27b2616..b951dabce 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb @@ -9,8 +9,8 @@ DEPENDS += "opencl-headers" inherit pkgconfig cmake S = "${WORKDIR}/git" -PV = "2020.06.16+git${SRCPV}" -SRCREV = "862eebe7ca733c398334a8db8481172a7d3a3c47" +PV = "2020.12.18+git${SRCPV}" +SRCREV = "1d5315c3ed30d026acb79a1aa53a276fc833ffa7" SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git" do_install () { diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 2c46d21b7..2a84d669a 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -179,6 +179,7 @@ RDEPENDS_packagegroup-meta-oe-core = "\ sdbus-c++ \ toybox \ usleep \ + dbus-cxx \ " RDEPENDS_packagegroup-meta-oe-core_append_libc-glibc = " glfw" RDEPENDS_packagegroup-meta-oe-core_remove_riscv64 = "safec" @@ -307,6 +308,7 @@ RDEPENDS_packagegroup-meta-oe-devtools_remove_x86-64 = "${@bb.utils.contains("TU RDEPENDS_packagegroup-meta-oe-devtools_remove_x86 = "ply" RDEPENDS_packagegroup-meta-oe-extended ="\ + bitwise \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "boinc-client", "", d)} \ brotli \ byacc \ @@ -365,6 +367,7 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ canutils \ libsocketcan \ libconfig \ + linuxconsole \ uml-utilities \ libidn \ libqb \ @@ -446,11 +449,13 @@ RDEPENDS_packagegroup-meta-oe-graphics ="\ ${@bb.utils.contains("PACKAGE_CLASSES", "package_rpm", "dnfdragora", "", d)} \ fontforge \ fbida \ + feh \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "freeglut", "", d)} \ ftgl \ fvwm \ gtkperf \ gphoto2 \ + imlib2 \ libgphoto2 \ graphviz \ gtkwave \ @@ -458,6 +463,7 @@ RDEPENDS_packagegroup-meta-oe-graphics ="\ libforms \ lxdm \ numlockx \ + obconf \ openbox \ packagegroup-fonts-truetype \ qrencode \ @@ -884,6 +890,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ liburing \ zbar \ libmicrohttpd \ + yaml-cpp \ " RDEPENDS_packagegroup-meta-oe-support_append_armv7a = " ne10" RDEPENDS_packagegroup-meta-oe-support_append_armv7ve = " ne10" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch new file mode 100644 index 000000000..d3d339d56 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/0001-meson-Fix-reallocarray-check.patch @@ -0,0 +1,25 @@ +From 1ebf1a1df17afd8b89f84b1928a89069035bf20b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 12 Dec 2020 16:15:57 -0800 +Subject: [PATCH] meson: Fix reallocarray check + +reallocarray() is defined in stdlib.h, so that would be right header to +check for its presense. + +Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/17951] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/meson.build ++++ b/meson.build +@@ -501,7 +501,7 @@ foreach ident : [ + #include <sys/stat.h> + #include <unistd.h>'''], + ['explicit_bzero' , '''#include <string.h>'''], +- ['reallocarray', '''#include <malloc.h>'''], ++ ['reallocarray', '''#include <stdlib.h>'''], + ['set_mempolicy', '''#include <stdlib.h> + #include <unistd.h>'''], + ['get_mempolicy', '''#include <stdlib.h> diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb index c8e81a412..4b93087f4 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb @@ -41,6 +41,7 @@ SRC_URI_MUSL = "\ file://0002-src-login-brightness.c-include-sys-wait.h.patch \ file://0003-src-basic-copy.c-include-signal.h.patch \ file://0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch \ + file://0001-meson-Fix-reallocarray-check.patch \ " PACKAGECONFIG ??= "gshadow idn" |