diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support')
34 files changed, 780 insertions, 63 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.0.bb b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.1.bb index 7709075fe..36aff7503 100644 --- a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.1.bb @@ -17,8 +17,8 @@ ALLOW_EMPTY_${PN} = "1" LIC_FILES_CHKSUM = "file://COPYING;md5=de86c8210a433f72bd3cc98e797a6084" -SRC_URI[md5sum] = "ed1f2dc4cf24aa2da8361179ade01682" -SRC_URI[sha256sum] = "9d539e7c09aa6394d512c433c5601c1f26dc4975f022ad7d5e8e57c3b635b370" +SRC_URI[md5sum] = "00807b2e976f467b3cec85d1589f0825" +SRC_URI[sha256sum] = "4af9875df5497fdd507231f4b7346e17d96fc06fe10fd30e2b3750715a329113" SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" diff --git a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.5.bb b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.0.bb index ff05227aa..a49d13692 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.3.0.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" -SRCREV = "513f5edbcf2f2ec5c0cd711d1cc312eb2d753f1b" +SRCREV = "8c9f87227b99ac74509b01602dc21d814fe91516" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.17.bb index 5d7dbd8bd..c16e89329 100644 --- a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.17.bb @@ -11,8 +11,8 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste file://disable-float-tests.patch \ file://disable-outside-tests.patch " -# tag 2.10.16 -SRCREV= "18212a2a7967e12d740bfb957e500892b3463c88" +# tag 2.10.17 +SRCREV= "41e7d0074b6cb5b22c89f835b4531d848ab66987" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.1.bb index d9b310bce..2a386086f 100644 --- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.8.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gperftools/gperftools" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" -SRCREV = "180bfa10d7cb38e8b3784d60943d50e8fcef0dcb" +SRCREV = "d8eb315fb18f6fb0d6efa923401f166343727bc6" SRC_URI = "git://github.com/gperftools/gperftools \ file://0001-Support-Atomic-ops-on-clang.patch \ file://0001-fix-build-with-musl-libc.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb index 85646062f..0ac08bd51 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.341" -SRCREV = "82fc979083e959a749ea5bb919aa6d7d61123ae0" +PV = "0.342" +SRCREV = "bdcc84fca6eb97bef9a8a8b04f71cbed8f32a986" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb index 2bd8148e3..24677386f 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.72.bb @@ -8,8 +8,8 @@ DEPENDS = "file" SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ " -SRC_URI[md5sum] = "c7e230e9b899282b43d9a9faa41e893d" -SRC_URI[sha256sum] = "e8f445e85faf727b89e9f9590daea4473ae00ead38b237cf1eda55172b89b182" +SRC_URI[md5sum] = "2a286193af88ab2ae3149748d4b46187" +SRC_URI[sha256sum] = "0ae825f8e0d7f41201fd44a0df1cf454c1cb0bc50fe9d59c26552260264c2ff8" inherit autotools lib_package pkgconfig gettext diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch b/meta-openembedded/meta-oe/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch new file mode 100644 index 000000000..5ff9bf846 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/files/0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch @@ -0,0 +1,46 @@ +From f9e3e2ee7b18ba5bb8efe083171f3e701eb0a663 Mon Sep 17 00:00:00 2001 +From: Your Name <you@example.com> +Date: Mon, 28 Dec 2020 02:08:03 +0000 +Subject: [PATCH] Don't let host enviroment to decide if a test is build + +test ssh2.sh need sshd, for cross compile, we need it on target, so +don't use SSHD on host to decide weither to build a test + +Upstream-Status: Inappropriate[oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + tests/Makefile.am | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index dc0922f..6cbc35d 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1,16 +1,12 @@ + AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src + LDADD = ../src/libssh2.la + +-if SSHD + noinst_PROGRAMS = ssh2 + ssh2_SOURCES = ssh2.c +-endif + + ctests = simple$(EXEEXT) + TESTS = $(ctests) mansyntax.sh +-if SSHD + TESTS += ssh2.sh +-endif + check_PROGRAMS = $(ctests) + + TESTS_ENVIRONMENT = SSHD=$(SSHD) EXEEXT=$(EXEEXT) +@@ -38,4 +34,4 @@ if OPENSSL + # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c + # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c + EXTRA_DIST += test_public_key_auth_succeeds_with_correct_rsa_openssh_key.c +-endif +\ No newline at end of file ++endif +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest b/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest index c213b32e5..5fd7ec65f 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest @@ -2,7 +2,7 @@ ptestdir=$(dirname "$(readlink -f "$0")") cd tests -for test in $(ls) +for test in simple ssh2.sh mansyntax.sh do ./../test-driver --test-name $test --log-file ../$test.log --trs-file ../$test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./$test done diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb index 38f162693..4a5a05060 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb @@ -11,6 +11,9 @@ SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ file://CVE-2019-17498.patch \ file://run-ptest \ " + +SRC_URI_append_ptest = " file://0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch" + SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" @@ -29,7 +32,7 @@ PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGI BBCLASSEXTEND = "native nativesdk" # required for ptest on documentation -RDEPENDS_${PN}-ptest = "man-db" +RDEPENDS_${PN}-ptest = "man-db openssh" RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-en-us" do_compile_ptest() { @@ -39,9 +42,11 @@ do_compile_ptest() { do_install_ptest() { install -d ${D}${PTEST_PATH}/tests - install -m 0755 ${B}/tests/.libs/simple ${D}${PTEST_PATH}/tests/ - install -m 0755 ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ + cp -rf ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/ssh2.sh ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/tests/etc ${D}${PTEST_PATH}/tests/ mkdir -p ${D}${PTEST_PATH}/docs cp -r ${S}/docs/* ${D}${PTEST_PATH}/docs/ } diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch new file mode 100644 index 000000000..d261b13d9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch @@ -0,0 +1,39 @@ +From 8579d8a35886f91974e0ac4dbdf2edb7dac06d52 Mon Sep 17 00:00:00 2001 +From: Joe Slater <joe.slater@windriver.com> +Date: Fri, 18 Dec 2020 11:17:50 +0800 +Subject: [PATCH] libmultipath/uevent.c: fix error handling for + udev_monitor_set_receive_buffer_size + +Since systemd v246.5[1], udev_monitor_set_receive_buffer_size() will +return 0 or 1 if successful. We only need to check a negative value for +the failure. + +[1] https://github.com/systemd/systemd-stable/commit/4dcae666889ae9469e4406c0bcaffadbc01c4f66 + https://github.com/systemd/systemd-stable/commit/fe9b92e566f837665cc06c82374e4e42f9295c99 + https://github.com/systemd/systemd-stable/commit/5dd4cc4b10daea5d2ba969425ba02d2098dd06a4 + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <joe.slater@windriver.com> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + libmultipath/uevent.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libmultipath/uevent.c b/libmultipath/uevent.c +index d38e8a7f..4b298052 100644 +--- a/libmultipath/uevent.c ++++ b/libmultipath/uevent.c +@@ -810,7 +810,8 @@ int uevent_listen(struct udev *udev) + } + pthread_cleanup_push(monitor_cleanup, monitor); + #ifdef LIBUDEV_API_RECVBUF +- if (udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024)) ++ err = udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024); ++ if (err < 0) + condlog(2, "failed to increase buffer size"); + #endif + fd = udev_monitor_get_fd(monitor); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index 331c0cd01..186f78b8f 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -47,6 +47,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ file://0001-fix-bug-of-do_compile-and-do_install.patch \ file://0001-add-explicit-dependency-on-libraries.patch \ file://0001-fix-boolean-value-with-json-c-0.14.patch \ + file://0001-libmultipath-uevent.c-fix-error-handling-for-udev_mo.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.4.bb index 48e92de4c..68c326b52 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.4.bb @@ -12,7 +12,7 @@ RDEPENDS_${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "c5c1cbcf622d9a96b6030d66409ed12b204e8bc01ef5e6554ebbe6fb1d734352" +SRC_URI[sha256sum] = "fe993408b22286355809ce48ebecc4444d19af8203ed4959d269969112ed86e9" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.59.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.bb index eb9162bea..112f67629 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.59.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.60.bb @@ -32,7 +32,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ " -SRC_URI[sha256sum] = "e6298174caa8527beacdc2858f77ed098d7047c1792846040e27e420fed0ce24" +SRC_URI[sha256sum] = "84abd5575ab874c53ae511bd461e5d0868d1a1b384ee40753154cdd1d590fe3d" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" diff --git a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb index 1514c7a95..3dae8b33c 100644 --- a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -35,7 +35,7 @@ EXTRA_OECONF=" \ --enable-pcsc \ --enable-doc \ --enable-api-doc \ - --with-udev=${nonarch_base_libdir}/udev \ + --with-udev=${nonarch_libdir}/udev \ --with-bundle=${libdir}/pcsc/drivers \ " @@ -43,10 +43,9 @@ inherit autotools pkgconfig FILES_${PN} += " \ ${libdir}/ctapi \ - ${nonarch_base_libdir}/udev \ + ${nonarch_libdir}/udev \ ${libdir}/openct-ifd.so \ ${libdir}/pcsc \ - /run/openct/status \ " FILES_${PN}-dbg += " \ @@ -56,10 +55,10 @@ FILES_${PN}-dbg += " \ INSANE_SKIP_${PN} += "dev-deps" +do_install[cleandirs] += "${D}" + do_install () { - rm -rf ${D} - install -d ${D}/etc - install -dm 755 ${D}${nonarch_base_libdir}/udev + install -d ${D}${sysconfdir} # fix up hardcoded paths sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ ${WORKDIR}/openct.service ${WORKDIR}/openct.init @@ -67,22 +66,18 @@ do_install () { oe_runmake install DESTDIR=${D} install -dm 755 ${D}${libdir}/ctapi/ mv ${D}${libdir}/libopenctapi.so ${D}${libdir}/ctapi/ - install -Dpm 644 etc/openct.udev ${D}/etc/udev/rules.d/60-openct.rules - install -pm 644 etc/openct.conf ${D}/etc/openct.conf + install -Dpm 644 etc/openct.udev ${D}${nonarch_libdir}/udev/rules.d/60-openct.rules + install -pm 644 etc/openct.conf ${D}${sysconfdir}/openct.conf - install -Dpm 755 ${WORKDIR}/openct.init ${D}/etc/init.d/openct - install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}/etc/sysconfig/openct + install -Dpm 755 ${WORKDIR}/openct.init ${D}${sysconfdir}/init.d/openct + install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}${sysconfdir}/sysconfig/openct - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/openct.service ${D}${systemd_unitdir}/system so=$(find ${D} -name \*.so | sed "s|^${D}||") sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf - install -Dpm 644 etc/reader.conf ${D}/etc/reader.conf.d/openct.conf - - install -dm 755 ${D}${localstatedir}/run/openct - touch ${D}${localstatedir}/run/openct/status - chmod 644 ${D}${localstatedir}/run/openct/status - - rm -r ${D}/${localstatedir}/run + install -Dpm 644 etc/reader.conf ${D}${sysconfdir}/reader.conf.d/openct.conf } + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch new file mode 100644 index 000000000..1dc7ca3f1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch @@ -0,0 +1,36 @@ +From fedef3c0b1772cee97d7288bee7d5d50805a5964 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 12 Dec 2020 08:56:04 -0800 +Subject: [PATCH] configure: Do not add native paths to pkgconfig search + +This does not work in cross environments, secondly in OE we already +point pkkconfig into recipe sysroot where it will find all the +dependencies therefore this setting is not needed + +Upstream-Status: Inappropriate [ OE-Specific ] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0df85b0..2481153 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -70,12 +70,6 @@ AC_CHECK_HEADERS([]) + dnl checks for library functions + AC_CHECK_FUNCS([]) + +-dnl tell pkgconfig to look in the same prefix where we're installing this to, +-dnl as that is likely where libpurple will be found if it is not in the default +-dnl pkgconfig path +-PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${libdir}/pkgconfig" +-export PKG_CONFIG_PATH +- + dnl debug mode + AC_ARG_ENABLE(debug, + [AS_HELP_STRING([--enable-debug], +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index 99fcf3c6d..f6b4c7cee 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -10,6 +10,7 @@ inherit autotools gettext pkgconfig SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \ file://0001-sipe-consider-64bit-time_t-when-printing.patch \ file://0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch \ + file://0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch \ " SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch index 05e0abede..afb0b5df0 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch @@ -15,12 +15,12 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- a/cmake/modules/PopplerMacros.cmake +++ b/cmake/modules/PopplerMacros.cmake -@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) +@@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - + set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") -+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") +- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") ++ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") @@ -32,16 +32,16 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") -@@ -167,7 +167,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL +@@ -149,7 +149,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - + set(_save_cxxflags "${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 -@@ -175,7 +175,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL +@@ -157,7 +157,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") set(_save_cflags "${CMAKE_C_FLAGS}") @@ -50,3 +50,6 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.11.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.12.1.bb index 729923d40..87a57523f 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.12.1.bb @@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[sha256sum] = "021557074516492375c2bb4226a413aad431159e9177f9f14dff4159d2723b14" +SRC_URI[sha256sum] = "d0aa2586c0a4296c775f0d2045f28bb95a694113fc995f95350faa12930f7b35" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb index 34937c83c..67ec802cd 100644 --- a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gabime/spdlog/wiki" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRCREV = "cbe9448650176797739dbab13961ef4c07f4290f" +SRCREV = "de0dbfa3596a18cd70a4619b6a9766847a941276" SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x; \ file://0001-Enable-use-of-external-fmt-library.patch" diff --git a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb index 06fb82b85..56c2d4447 100644 --- a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb @@ -4,9 +4,9 @@ AUTHOR = "Christophe BLAESS" LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381" -BPV = "0.8.5" +BPV = "0.8.6" PV = "${BPV}" -SRCREV = "3c93b9038a7c4d9de4302ab6f14372e9fa381f3c" +SRCREV = "9ce73aab05873b2d3996bd21076305463133f102" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 2b38f4d69..818cad5bc 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -13,7 +13,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=24c0c5cb2c83d9f2ab725481e4df5240" # util-linux added to get libuuid -DEPENDS = "libpcre flex glib-2.0 openssl util-linux" +DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native" # We expect the recipe to add anything specific for that version to these defaults. # diff --git a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb index fb60446cb..7970ca3c4 100644 --- a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb @@ -6,7 +6,7 @@ DEPENDS = "libusb1" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "5ee8260c71647f687b5e71af11f45244814835d7" +SRCREV = "1b52efddbd68b4395df3ac9cd10eeb984af22439" SRC_URI = "git://github.com/mvp/${BPN}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.1.0.bb b/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.2.0.bb index 09cef44a8..4ec7bc2f5 100644 --- a/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.2.0.bb @@ -8,8 +8,8 @@ DESCRIPTION = " uthash-dev provides a hash table implementation using C preproce HOMEPAGE = "https://troydhanson.github.io/uthash/" SECTION = "base" LICENSE = "BSD-1-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a2513f7d2291df840527b76b2a8f9718" -SRCREV = "8b214aefcb81df86a7e5e0d4fa20e59a6c18bc02" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6891c324eb59289db33bac74d4cbb0d4" +SRCREV = "66e2668795d0aaf4977523f828e548470a680c33" SRC_URI = "\ git://github.com/troydhanson/${BPN}.git \ diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch new file mode 100644 index 000000000..a444901f8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch @@ -0,0 +1,321 @@ +From b6c765d693a0833b94cb2e91b32842570c3458d2 Mon Sep 17 00:00:00 2001 +From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> +Date: Tue, 15 Dec 2020 22:29:56 +0000 +Subject: [PATCH] Additions/linux/drm: Adjustment for Linux 5.10. + +Upstream-Status: Backport + +git-svn-id: http://www.virtualbox.org/svn/vbox@87092 cfe28804-0f27-0410-a406-dd0f0b0b656f + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> + +--- + src/VBox/Additions/linux/drm/vbox_drv.h | 10 +- + src/VBox/Additions/linux/drm/vbox_fb.c | 2 +- + .../src/VBox/Additions/linux/drm/vbox_mode.c | 2 +- + src/VBox/Additions/linux/drm/vbox_ttm.c | 99 +++++++++++++++++-- + 4 files changed, 99 insertions(+), 14 deletions(-) + +diff --git a/src/VBox/Additions/linux/drm/vbox_drv.h b/src/VBox/Additions/linux/drm/vbox_drv.h +index 8c85371749..7937f2f2d2 100644 +--- a/src/VBox/Additions/linux/drm/vbox_drv.h ++++ b/src/VBox/Additions/linux/drm/vbox_drv.h +@@ -175,6 +175,9 @@ + #include <drm/ttm/ttm_placement.h> + #include <drm/ttm/ttm_memory.h> + #include <drm/ttm/ttm_module.h> ++#if RTLNX_VER_MIN(5,10,0) ++# include <drm/ttm/ttm_resource.h> ++#endif + + #include "vboxvideo_guest.h" + #include "vboxvideo_vbe.h" +@@ -444,7 +447,10 @@ int vbox_bo_create(struct drm_device *dev, int size, int align, + int vbox_gem_create(struct drm_device *dev, + u32 size, bool iskernel, struct drm_gem_object **obj); + +-int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr); ++#define VBOX_MEM_TYPE_VRAM 0x1 ++#define VBOX_MEM_TYPE_SYSTEM 0x2 ++ ++int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr); + int vbox_bo_unpin(struct vbox_bo *bo); + + static inline int vbox_bo_reserve(struct vbox_bo *bo, bool no_wait) +@@ -469,7 +475,7 @@ static inline void vbox_bo_unreserve(struct vbox_bo *bo) + ttm_bo_unreserve(&bo->bo); + } + +-void vbox_ttm_placement(struct vbox_bo *bo, int domain); ++void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type); + int vbox_bo_push_sysram(struct vbox_bo *bo); + int vbox_mmap(struct file *filp, struct vm_area_struct *vma); + +diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c b/src/VBox/Additions/linux/drm/vbox_fb.c +index adead98d3d..7182d9da1a 100644 +--- a/src/VBox/Additions/linux/drm/vbox_fb.c ++++ b/src/VBox/Additions/linux/drm/vbox_fb.c +@@ -295,7 +295,7 @@ static int vboxfb_create(struct drm_fb_helper *helper, + if (ret) + return ret; + +- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL); ++ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, NULL); + if (ret) { + vbox_bo_unreserve(bo); + return ret; +diff --git a/src/VBox/Additions/linux/drm/vbox_mode.c b/src/VBox/Additions/linux/drm/vbox_mode.c +index ce7d135cb6..5557db5ef8 100644 +--- a/src/VBox/Additions/linux/drm/vbox_mode.c ++++ b/src/VBox/Additions/linux/drm/vbox_mode.c +@@ -227,7 +227,7 @@ static int vbox_crtc_set_base(struct drm_crtc *crtc, + if (ret) + return ret; + +- ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, &gpu_addr); ++ ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, &gpu_addr); + vbox_bo_unreserve(bo); + if (ret) + return ret; +diff --git a/src/VBox/Additions/linux/drm/vbox_ttm.c b/src/VBox/Additions/linux/drm/vbox_ttm.c +index bf87aabc05..5eac926a42 100644 +--- a/src/VBox/Additions/linux/drm/vbox_ttm.c ++++ b/src/VBox/Additions/linux/drm/vbox_ttm.c +@@ -41,6 +41,7 @@ + #define PLACEMENT_FLAGS(placement) ((placement).flags) + #endif + ++ + static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd) + { + return container_of(bd, struct vbox_private, ttm.bdev); +@@ -125,6 +126,7 @@ static bool vbox_ttm_bo_is_vbox_bo(struct ttm_buffer_object *bo) + return false; + } + ++#if RTLNX_VER_MAX(5,10,0) + static int + vbox_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type, + struct ttm_mem_type_manager *man) +@@ -148,6 +150,7 @@ vbox_bo_init_mem_type(struct ttm_bo_device *bdev, u32 type, + + return 0; + } ++#endif + + static void + vbox_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl) +@@ -157,7 +160,7 @@ vbox_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl) + if (!vbox_ttm_bo_is_vbox_bo(bo)) + return; + +- vbox_ttm_placement(vboxbo, TTM_PL_FLAG_SYSTEM); ++ vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_SYSTEM); + *pl = vboxbo->placement; + } + +@@ -167,11 +170,12 @@ static int vbox_bo_verify_access(struct ttm_buffer_object *bo, + return 0; + } + ++#if RTLNX_VER_MAX(5,10,0) + static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, + struct ttm_mem_reg *mem) + { +- struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; + struct vbox_private *vbox = vbox_bdev(bdev); ++ struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; + + mem->bus.addr = NULL; + mem->bus.offset = 0; +@@ -194,12 +198,53 @@ static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, + } + return 0; + } ++#else ++static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, ++ struct ttm_resource *mem) ++{ ++ struct vbox_private *vbox = vbox_bdev(bdev); ++ mem->bus.addr = NULL; ++ mem->bus.offset = 0; ++ mem->size = mem->num_pages << PAGE_SHIFT; ++ mem->start = 0; ++ mem->bus.is_iomem = false; ++ switch (mem->mem_type) { ++ case TTM_PL_SYSTEM: ++ /* system memory */ ++ return 0; ++ case TTM_PL_VRAM: ++ mem->bus.offset = mem->start << PAGE_SHIFT; ++ mem->start = pci_resource_start(vbox->dev->pdev, 0); ++ mem->bus.is_iomem = true; ++ break; ++ default: ++ return -EINVAL; ++ } ++ return 0; ++} ++#endif + ++ ++ ++#if RTLNX_VER_MIN(5,10,0) ++static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev, ++ struct ttm_resource *mem) ++{ ++} ++#else + static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev, + struct ttm_mem_reg *mem) + { + } ++#endif + ++#if RTLNX_VER_MIN(5,10,0) ++static void vbox_ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt) ++{ ++ ttm_tt_fini(tt); ++ kfree(tt); ++} ++#else + static void vbox_ttm_backend_destroy(struct ttm_tt *tt) + { + ttm_tt_fini(tt); +@@ -209,6 +254,7 @@ static void vbox_ttm_backend_destroy(struct ttm_tt *tt) + static struct ttm_backend_func vbox_tt_backend_func = { + .destroy = &vbox_ttm_backend_destroy, + }; ++#endif + + #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) + static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev, +@@ -226,7 +272,9 @@ static struct ttm_tt *vbox_ttm_tt_create(struct ttm_buffer_object *bo, + if (!tt) + return NULL; + ++#if RTLNX_VER_MAX(5,10,0) + tt->func = &vbox_tt_backend_func; ++#endif + #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) + if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) { + #else +@@ -261,11 +309,16 @@ static void vbox_ttm_tt_unpopulate(struct ttm_tt *ttm) + + static struct ttm_bo_driver vbox_bo_driver = { + .ttm_tt_create = vbox_ttm_tt_create, ++#if RTLNX_VER_MIN(5,10,0) ++ .ttm_tt_destroy = vbox_ttm_tt_destroy, ++#endif + #if RTLNX_VER_MAX(4,17,0) + .ttm_tt_populate = vbox_ttm_tt_populate, + .ttm_tt_unpopulate = vbox_ttm_tt_unpopulate, + #endif ++#if RTLNX_VER_MAX(5,10,0) + .init_mem_type = vbox_bo_init_mem_type, ++#endif + #if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4) + .eviction_valuable = ttm_bo_eviction_valuable, + #endif +@@ -318,8 +371,13 @@ int vbox_mm_init(struct vbox_private *vbox) + #endif + } + ++#if RTLNX_VER_MIN(5,10,0) ++ ret = ttm_range_man_init(bdev, TTM_PL_VRAM, false, ++ vbox->available_vram_size >> PAGE_SHIFT); ++#else + ret = ttm_bo_init_mm(bdev, TTM_PL_VRAM, + vbox->available_vram_size >> PAGE_SHIFT); ++#endif + if (ret) { + DRM_ERROR("Failed ttm VRAM init: %d\n", ret); + goto err_device_release; +@@ -359,7 +417,7 @@ void vbox_mm_fini(struct vbox_private *vbox) + #endif + } + +-void vbox_ttm_placement(struct vbox_bo *bo, int domain) ++void vbox_ttm_placement(struct vbox_bo *bo, u32 mem_type) + { + u32 c = 0; + #if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2) +@@ -372,15 +430,36 @@ void vbox_ttm_placement(struct vbox_bo *bo, int domain) + bo->placement.placement = bo->placements; + bo->placement.busy_placement = bo->placements; + +- if (domain & TTM_PL_FLAG_VRAM) ++ if (mem_type & VBOX_MEM_TYPE_VRAM) { ++#if RTLNX_VER_MIN(5,10,0) ++ bo->placements[c].mem_type = TTM_PL_VRAM; ++ PLACEMENT_FLAGS(bo->placements[c++]) = ++ TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED; ++#else + PLACEMENT_FLAGS(bo->placements[c++]) = + TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM; +- if (domain & TTM_PL_FLAG_SYSTEM) ++#endif ++ } ++ if (mem_type & VBOX_MEM_TYPE_SYSTEM) { ++#if RTLNX_VER_MIN(5,10,0) ++ bo->placements[c].mem_type = TTM_PL_SYSTEM; ++ PLACEMENT_FLAGS(bo->placements[c++]) = ++ TTM_PL_MASK_CACHING; ++#else + PLACEMENT_FLAGS(bo->placements[c++]) = + TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM; +- if (!c) ++#endif ++ } ++ if (!c) { ++#if RTLNX_VER_MIN(5,10,0) ++ bo->placements[c].mem_type = TTM_PL_SYSTEM; ++ PLACEMENT_FLAGS(bo->placements[c++]) = ++ TTM_PL_MASK_CACHING; ++#else + PLACEMENT_FLAGS(bo->placements[c++]) = + TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM; ++#endif ++ } + + bo->placement.num_placement = c; + bo->placement.num_busy_placement = c; +@@ -414,7 +493,7 @@ int vbox_bo_create(struct drm_device *dev, int size, int align, + vboxbo->bo.bdev->dev_mapping = dev->dev_mapping; + #endif + +- vbox_ttm_placement(vboxbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM); ++ vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM); + + acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size, + sizeof(struct vbox_bo)); +@@ -452,7 +531,7 @@ static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo) + #endif + } + +-int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr) ++int vbox_bo_pin(struct vbox_bo *bo, u32 mem_type, u64 *gpu_addr) + { + #if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) + struct ttm_operation_ctx ctx = { false, false }; +@@ -467,7 +546,7 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr) + return 0; + } + +- vbox_ttm_placement(bo, pl_flag); ++ vbox_ttm_placement(bo, mem_type); + + for (i = 0; i < bo->placement.num_placement; i++) + PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT; +@@ -540,7 +619,7 @@ int vbox_bo_push_sysram(struct vbox_bo *bo) + if (bo->kmap.virtual) + ttm_bo_kunmap(&bo->kmap); + +- vbox_ttm_placement(bo, TTM_PL_FLAG_SYSTEM); ++ vbox_ttm_placement(bo, VBOX_MEM_TYPE_SYSTEM); + + for (i = 0; i < bo->placement.num_placement; i++) + PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT; +-- +2.19.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch new file mode 100644 index 000000000..db27cb883 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch @@ -0,0 +1,119 @@ +From 2a6e3cf63f58e289802a11faad5fb495e2d04e97 Mon Sep 17 00:00:00 2001 +From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> +Date: Wed, 9 Dec 2020 18:59:04 +0000 +Subject: [PATCH] Runtime/memobj-r0drv-linux.c: Changes to support the upcoming + 5.10 kernel, bugref:9879 + +Upstream-Status: Backport + +git-svn-id: http://www.virtualbox.org/svn/vbox@87074 cfe28804-0f27-0410-a406-dd0f0b0b656f + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + .../Runtime/r0drv/linux/memobj-r0drv-linux.c | 68 ++++++++++++++++++- + 1 file changed, 67 insertions(+), 1 deletion(-) + +--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c ++++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +@@ -56,9 +56,19 @@ + * Whether we use alloc_vm_area (3.2+) for executable memory. + * This is a must for 5.8+, but we enable it all the way back to 3.2.x for + * better W^R compliance (fExecutable flag). */ +-#if RTLNX_VER_MIN(3,2,0) || defined(DOXYGEN_RUNNING) ++#if RTLNX_VER_RANGE(3,2,0, 5,10,0) || defined(DOXYGEN_RUNNING) + # define IPRT_USE_ALLOC_VM_AREA_FOR_EXEC + #endif ++/** @def IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC ++ * alloc_vm_area was removed with 5.10 so we have to resort to a different way ++ * to allocate executable memory. ++ * It would be possible to remove IPRT_USE_ALLOC_VM_AREA_FOR_EXEC and use ++ * this path execlusively for 3.2+ but no time to test it really works on every ++ * supported kernel, so better play safe for now. ++ */ ++#if RTLNX_VER_MIN(5,10,0) || defined(DOXYGEN_RUNNING) ++# define IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC ++#endif + + /* + * 2.6.29+ kernels don't work with remap_pfn_range() anymore because +@@ -502,6 +512,46 @@ static void rtR0MemObjLinuxFreePages(PRT + } + + ++#ifdef IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC ++/** ++ * User data passed to the apply_to_page_range() callback. ++ */ ++typedef struct LNXAPPLYPGRANGE ++{ ++ /** Pointer to the memory object. */ ++ PRTR0MEMOBJLNX pMemLnx; ++ /** The page protection flags to apply. */ ++ pgprot_t fPg; ++} LNXAPPLYPGRANGE; ++/** Pointer to the user data. */ ++typedef LNXAPPLYPGRANGE *PLNXAPPLYPGRANGE; ++/** Pointer to the const user data. */ ++typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE; ++ ++/** ++ * Callback called in apply_to_page_range(). ++ * ++ * @returns Linux status code. ++ * @param pPte Pointer to the page table entry for the given address. ++ * @param uAddr The address to apply the new protection to. ++ * @param pvUser The opaque user data. ++ */ ++#ifdef __i386__ ++static int rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) ++#else ++static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) ++#endif ++{ ++ PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser; ++ PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx; ++ size_t idxPg = (uAddr - (unsigned long)pMemLnx->Core.pv) >> PAGE_SHIFT; ++ ++ set_pte(pPte, mk_pte(pMemLnx->apPages[idxPg], pArgs->fPg)); ++ return 0; ++} ++#endif ++ ++ + /** + * Maps the allocation into ring-0. + * +@@ -584,6 +634,11 @@ static int rtR0MemObjLinuxVMap(PRTR0MEMO + else + # endif + { ++# if defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC) ++ if (fExecutable) ++ pgprot_val(fPg) |= _PAGE_NX; /* Uses RTR0MemObjProtect to clear NX when memory ready, W^X fashion. */ ++# endif ++ + # ifdef VM_MAP + pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_MAP, fPg); + # else +@@ -1851,6 +1906,21 @@ DECLHIDDEN(int) rtR0MemObjNativeProtect( + preempt_enable(); + return VINF_SUCCESS; + } ++# elif defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC) ++ PRTR0MEMOBJLNX pMemLnx = (PRTR0MEMOBJLNX)pMem; ++ if ( pMemLnx->fExecutable ++ && pMemLnx->fMappedToRing0) ++ { ++ LNXAPPLYPGRANGE Args; ++ Args.pMemLnx = pMemLnx; ++ Args.fPg = rtR0MemObjLinuxConvertProt(fProt, true /*fKernel*/); ++ int rcLnx = apply_to_page_range(current->active_mm, (unsigned long)pMemLnx->Core.pv + offSub, cbSub, ++ rtR0MemObjLinuxApplyPageRange, (void *)&Args); ++ if (rcLnx) ++ return VERR_NOT_SUPPORTED; ++ ++ return VINF_SUCCESS; ++ } + # endif + + NOREF(pMem); diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch new file mode 100644 index 000000000..3cfe2e917 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch @@ -0,0 +1,46 @@ +From a276f8bc5e4515f7ea51e2c56e0e634a723ca104 Mon Sep 17 00:00:00 2001 +From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> +Date: Tue, 8 Dec 2020 13:52:53 +0000 +Subject: [PATCH] linser/vboxsf: Adjustment for linux 5.10 - TASK_SIZE_MAX + replaces USER_DS.seg. bugref:9879 + +Upstream-Status: Backport + +git-svn-id: http://www.virtualbox.org/svn/vbox@87053 cfe28804-0f27-0410-a406-dd0f0b0b656f + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + src/VBox/Additions/linux/sharedfolders/regops.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c +index e1fad3d820..401fd69930 100644 +--- a/src/VBox/Additions/linux/sharedfolders/regops.c ++++ b/src/VBox/Additions/linux/sharedfolders/regops.c +@@ -147,7 +147,11 @@ static int vbsf_iov_iter_detect_type(struct iovec const *paIov, size_t cSegs) + while (cSegs-- > 0) { + if (paIov->iov_len > 0) { + if (access_ok(VERIFY_READ, paIov->iov_base, paIov->iov_len)) ++#if RTLNX_VER_MIN(5,10,0) ++ return (uintptr_t)paIov->iov_base >= TASK_SIZE_MAX ? ITER_KVEC : 0; ++#else + return (uintptr_t)paIov->iov_base >= USER_DS.seg ? ITER_KVEC : 0; ++#endif + AssertMsgFailed(("%p LB %#zx\n", paIov->iov_base, paIov->iov_len)); + break; + } +@@ -1401,7 +1405,10 @@ static int vbsf_lock_user_pages_failed_check_kernel(uintptr_t uPtrFrom, size_t c + /* + * Check that this is valid user memory that is actually in the kernel range. + */ +-#if RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1) ++#if RTLNX_VER_MIN(5,10,0) ++ if ( access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT) ++ && uPtrFrom >= TASK_SIZE_MAX) ++#elif RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_MIN(8,1) + if ( access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT) + && uPtrFrom >= USER_DS.seg) + #else +-- +2.19.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb index 9282f663b..ff639c09f 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb @@ -13,6 +13,9 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ + file://0001-Additions-linux-drm-Adjustment-for-Linux-5.10.patch \ + file://0001-Runtime-memobj-r0drv-linux.c-Changes-to-support-the-.patch \ + file://0001-linser-vboxsf-Adjustment-for-linux-5.10-TASK_SIZE_MA.patch \ " SRC_URI[md5sum] = "a12a647f6c114f2cb1571089b36841fe" SRC_URI[sha256sum] = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1" diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fixed-compiler-warnings-about-snprintf-truncations.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fixed-compiler-warnings-about-snprintf-truncations.patch new file mode 100644 index 000000000..5b9315cfb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fixed-compiler-warnings-about-snprintf-truncations.patch @@ -0,0 +1,28 @@ +From 9de23a9199d26e64ab6b5be2bb74f260200b2dc5 Mon Sep 17 00:00:00 2001 +From: matt335672 <30179339+matt335672@users.noreply.github.com> +Date: Fri, 21 Aug 2020 12:20:31 +0100 +Subject: [PATCH] Fixed compiler warnings about snprintf truncations + +Upstream-Status: Backport [https://github.com/neutrinolabs/xrdp/pull/1659] +--- + common/log.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/common/log.c b/common/log.c +index 4a0bd2f3..8686789d 100644 +--- a/common/log.c ++++ b/common/log.c +@@ -555,9 +555,7 @@ log_message(const enum logLevels lvl, const char *msg, ...) + now_t = time(&now_t); + now = localtime(&now_t); + +- snprintf(buff, 21, "[%.4d%.2d%.2d-%.2d:%.2d:%.2d] ", now->tm_year + 1900, +- now->tm_mon + 1, now->tm_mday, now->tm_hour, now->tm_min, +- now->tm_sec); ++ strftime(buff, 21, "[%Y%m%d-%H:%M:%S] ", now); + + internal_log_lvl2str(lvl, buff + 20); + +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-correct-the-location-of-errno.h.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-correct-the-location-of-errno.h.patch new file mode 100644 index 000000000..b06077bf0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-correct-the-location-of-errno.h.patch @@ -0,0 +1,30 @@ +From c8d3df40ece7d659ccc8212b18de916d28f4398a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 22 Dec 2020 23:10:52 -0800 +Subject: [PATCH] correct the location of errno.h + +Fixes build on musl + +Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/1761] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sesman/chansrv/sound.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sesman/chansrv/sound.c b/sesman/chansrv/sound.c +index b0480d33..45e17307 100644 +--- a/sesman/chansrv/sound.c ++++ b/sesman/chansrv/sound.c +@@ -23,7 +23,7 @@ + #include <stdio.h> + #include <sys/types.h> + #include <sys/socket.h> +-#include <sys/errno.h> ++#include <errno.h> + #include <signal.h> + #include <sys/un.h> + +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-riscv-doesn-t-require-pointers-to-be-aligned.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-riscv-doesn-t-require-pointers-to-be-aligned.patch new file mode 100644 index 000000000..4cd26df04 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-riscv-doesn-t-require-pointers-to-be-aligned.patch @@ -0,0 +1,28 @@ +From 229206aa5e55a6e26a074a54a1b50139ab794b36 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 22 Dec 2020 23:01:13 -0800 +Subject: [PATCH] riscv doesn't require pointers to be aligned + +Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/1761] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + common/arch.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/common/arch.h b/common/arch.h +index ccccfa5a..8c2ac1a4 100644 +--- a/common/arch.h ++++ b/common/arch.h +@@ -84,7 +84,8 @@ typedef int bool_t; + #define NEED_ALIGN + #elif defined(__x86__) || defined(__x86_64__) || \ + defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \ +- defined(__i386__) || defined(__aarch64__) ++ defined(__i386__) || defined(__aarch64__) || \ ++ defined(__riscv) + #define NO_NEED_ALIGN + #else + #warning unknown arch +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.14.bb index deda0fd1b..078e23c6e 100644 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.14.bb @@ -10,15 +10,15 @@ DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" REQUIRED_DISTRO_FEATURES = "x11 pam" -SRC_URI = "git://github.com/neutrinolabs/xrdp.git \ +SRC_URI = "git://github.com/neutrinolabs/xrdp.git;branch=devel \ file://xrdp.sysconfig \ file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ file://0001-Fix-the-compile-error.patch \ + file://0001-riscv-doesn-t-require-pointers-to-be-aligned.patch \ + file://0001-correct-the-location-of-errno.h.patch \ + file://0001-Fixed-compiler-warnings-about-snprintf-truncations.patch \ " - -SRCREV = "1e4b03eb3c9aa7173de251a328c93c073dcc0fca" - -PV = "0.9.11" +SRCREV = "1469d659dbccd6d042ac44f0afc4e1309788dc9d" S = "${WORKDIR}/git" @@ -52,15 +52,15 @@ do_compile_prepend() { do_install_append() { - install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir} install -d ${D}${sysconfdir}/xrdp install -d ${D}${sysconfdir}/xrdp/pam.d install -d ${D}${sysconfdir}/sysconfig/xrdp - + # deal with systemd unit files install -d ${D}${systemd_unitdir}/system install -m 0644 ${S}/instfiles/xrdp.service.in ${D}${systemd_unitdir}/system/xrdp.service - install -m 0644 ${S}/instfiles/xrdp-sesman.service.in ${D}${systemd_unitdir}/system/xrdp-sesman.service + install -m 0644 ${S}/instfiles/xrdp-sesman.service.in ${D}${systemd_unitdir}/system/xrdp-sesman.service sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service sed -i -e 's,@sysconfdir@,${sysconfdir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service sed -i -e 's,@sbindir@,${sbindir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service @@ -70,7 +70,6 @@ do_install_append() { install -m 0644 ${S}/sesman/startwm.sh ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/xrdp/xrdp.ini.in ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/xrdp/xrdp_keyboard.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/instfiles/xrdp.sh ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ install -m 0644 ${WORKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ chown xrdp:xrdp ${D}${sysconfdir}/xrdp @@ -92,6 +91,6 @@ pkg_postinst_${PN}() { -out ${sysconfdir}/xrdp/cert.pem \ -config ${sysconfdir}/xrdp/openssl.conf >/dev/null 2>&1 chmod 400 ${sysconfdir}/xrdp/key.pem - fi + fi fi } diff --git a/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.9.bb b/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb index b7dcc7089..170e0bf78 100644 --- a/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb @@ -8,8 +8,8 @@ DEPENDS += "pixman-native xorgproto-native libxrandr-native" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "afcae2f46d47c33863cab7fd9db7279a" -SRC_URI[sha256sum] = "e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571" +SRC_URI[md5sum] = "8cf8bd1f33e3736bc8dd279b20a32399" +SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" S = "${WORKDIR}/${XORG_PN}-${PV}" B = "${WORKDIR}/build" diff --git a/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb b/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb new file mode 100644 index 000000000..9d359d624 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.6.3.bb @@ -0,0 +1,17 @@ +SUMMARY = "yaml-cpp parser and emitter library" +DESCRIPTION = "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec." +HOMEPAGE = "https://github.com/jbeder/yaml-cpp" +SECTION = "devel" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6a8aaf0595c2efc1a9c2e0913e9c1a2c" + +# yaml-cpp releases are stored as archive files in github. +# download the exact revision of release +SRC_URI = "git://github.com/jbeder/yaml-cpp.git" +SRCREV = "9a3624205e8774953ef18f57067b3426c1c5ada6" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DYAML_CPP_BUILD_TESTS=OFF -DYAML_BUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TOOLS=OFF" diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.7.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.8.bb index df75a6e81..ee2d8801e 100644 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.8.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f" SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https" -SRCREV = "45720028e69f09d1bec3c6a2af802ae2b06feb6e" +SRCREV = "5715157da35898a7cb3293b7a5394ba23715b5a4" S = "${WORKDIR}/git" DEPENDS = "\ |