diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-08-26 22:04:05 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-08-26 22:04:05 +0300 |
commit | ae908254d22318b9e27acf6e5e28d1a4ab5e2195 (patch) | |
tree | 0d057ad30ca7f77c7c299762d60929e34ff51ab5 /meta-openembedded/meta-oe | |
parent | 67327ddc580cb9a85219a534844832a1682780d4 (diff) | |
parent | 66d661a7f7784d58c8a437f1cdeb0c0ab03f0364 (diff) | |
download | openbmc-ae908254d22318b9e27acf6e5e28d1a4ab5e2195.tar.xz |
Merge tag '0.70' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe')
145 files changed, 2235 insertions, 860 deletions
diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.3.bb index de4fa1642..949b45ba8 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.3.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit setuptools3 SRC_URI = "git://github.com/sivel/speedtest-cli.git" -SRCREV = "c58ad3367bf27f4b4a4d5b1bca29ebd574731c5d" +SRCREV = "42e96b13dda2afabbcec2622612d13495a415caa" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index 95e0cf7a8..9c1e485b3 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -61,6 +61,9 @@ PACKAGECONFIG[system-pcre] = "--use-system-pcre,,libpcre," MONGO_ARCH ?= "${HOST_ARCH}" MONGO_ARCH_powerpc64le = "ppc64le" +WIREDTIGER ?= "off" +WIREDTIGER_x86-64 = "on" +WIREDTIGER_aarch64 = "on" EXTRA_OESCONS = "PREFIX=${prefix} \ DESTDIR=${D} \ @@ -75,7 +78,7 @@ EXTRA_OESCONS = "PREFIX=${prefix} \ --use-system-zlib \ --nostrip \ --endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ - --wiredtiger=${@['off','on'][d.getVar('SITEINFO_BITS') != '32']} \ + --wiredtiger='${WIREDTIGER}' \ --separate-debug \ ${PACKAGECONFIG_CONFARGS}" diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.6.bb b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb index 93e00e6e0..39ed3d107 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.6.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master \ file://rasdaemon.service \ file://init" -SRCREV = "32b978fcf73215c90ce7383580224e4295930ae7" +SRCREV = "aa96737648d867a3d73e4151d05b54bbab494605" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/licenses/MINPACK b/meta-openembedded/meta-oe/licenses/MINPACK new file mode 100644 index 000000000..132cc3f33 --- /dev/null +++ b/meta-openembedded/meta-oe/licenses/MINPACK @@ -0,0 +1,51 @@ +Minpack Copyright Notice (1999) University of Chicago. All rights reserved + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the +following conditions are met: + +1. Redistributions of source code must retain the above +copyright notice, this list of conditions and the following +disclaimer. + +2. Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following +disclaimer in the documentation and/or other materials +provided with the distribution. + +3. The end-user documentation included with the +redistribution, if any, must include the following +acknowledgment: + + "This product includes software developed by the + University of Chicago, as Operator of Argonne National + Laboratory. + +Alternately, this acknowledgment may appear in the software +itself, if and wherever such third-party acknowledgments +normally appear. + +4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" +WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE +UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND +THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE +OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY +OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR +USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF +THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) +DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION +UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL +BE CORRECTED. + +5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT +HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF +ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, +INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF +ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF +PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER +SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT +(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE, +EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE +POSSIBILITY OF SUCH LOSS OR DAMAGES. diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.26.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.27.bb index 6f2464e5e..d18649db0 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.26.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.27.bb @@ -22,7 +22,7 @@ PACKAGECONFIG_NUMA_armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -SRCREV = "267b164c372d57145880f365bab8d8a52bf8baa7" +SRCREV = "0313e938c9c8bb37d71dade239f1f5326677b079" SRC_URI = "git://git.kernel.dk/fio.git \ " diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch index d5622ed2c..48069ff14 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch @@ -10,20 +10,24 @@ Only fixed linux targets for now Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending +--- + current/makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) - ---- current/makefile.org 2016-12-06 02:19:10.367911020 +0000 -+++ current/makefile 2016-12-06 02:21:38.767911020 +0000 -@@ -167,7 +167,7 @@ +diff --git current/makefile current/makefile +index 3a54701..7071427 100644 +--- current/makefile ++++ current/makefile +@@ -171,7 +171,7 @@ hpux_no_ansi: iozone_hpux_no.o libbif.o # # GNU 'C' compiler Linux build with threads, largefiles, async I/O # -linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o +linux: iozone_linux.o fileop_linux.o pit_server.o - $(CC) -O3 $(LDFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \ + $(CC) -O3 $(CFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \ -lrt -o iozone - $(CC) -O3 -Dlinux fileop_linux.o -o fileop -@@ -176,7 +176,7 @@ + $(CC) -O3 $(CFLAGS) -Dlinux fileop_linux.o -o fileop +@@ -180,7 +180,7 @@ linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o # # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O # @@ -32,7 +36,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-powerpc.o libasync.o \ libbif.o -lpthread -lrt -o iozone $(CC) -O3 -Dlinux fileop_linux-ppc.o -o fileop -@@ -184,7 +184,7 @@ +@@ -188,7 +188,7 @@ linux-powerpc: iozone_linux-powerpc.o libbif.o libasync.o fileop_linux-ppc.o pi # # GNU 'C' compiler Linux build for sparc chip with threads, largefiles, async I/O # @@ -41,7 +45,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-sparc.o libasync.o libbif.o \ -lpthread -lrt -o iozone $(CC) -O3 -Dlinux fileop_linux.o -o fileop -@@ -193,7 +193,7 @@ +@@ -197,7 +197,7 @@ linux-sparc: iozone_linux-sparc.o libbif.o libasync.o fileop_linux.o pit_server # # GNU 'C' compiler Linux build with threads, largefiles, async I/O # @@ -50,7 +54,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-ia64.o libbif.o libasync.o \ -lrt -lpthread -o iozone $(CC) -O3 -Dlinux fileop_linux-ia64.o -o fileop -@@ -202,7 +202,7 @@ +@@ -206,7 +206,7 @@ linux-ia64: iozone_linux-ia64.o libbif.o libasync.o fileop_linux-ia64.o pit_ser # # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O # @@ -59,7 +63,7 @@ Upstream-Status: Pending $(CC) -O3 -Dunix -DHAVE_ANSIC_C -DSHARED_MEM -DASYNC_IO \ -D_LARGEFILE64_SOURCE -Dlinux \ iozone_linux-powerpc64.o libasync.o libbif.o -lpthread \ -@@ -213,7 +213,7 @@ +@@ -217,7 +217,7 @@ linux-powerpc64: iozone_linux-powerpc64.o libbif.o libasync.o fileop_linux-ppc6 # # GNU 'C' compiler Linux build with threads, largefiles, async I/O # @@ -68,7 +72,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-arm.o libbif.o libasync.o \ -lrt -lpthread -o iozone $(CC) -O3 -Dlinux fileop_linux-arm.o -o fileop -@@ -222,7 +222,7 @@ +@@ -249,7 +249,7 @@ endif # # GNU 'C' compiler Linux build with threads, largefiles, async I/O # @@ -77,7 +81,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-AMD64.o libbif.o libasync.o \ -lrt -lpthread -o iozone $(CC) -O3 -Dlinux fileop_linux-AMD64.o -o fileop -@@ -231,7 +231,7 @@ +@@ -258,7 +258,7 @@ linux-AMD64: iozone_linux-AMD64.o libbif.o libasync.o fileop_linux-AMD64.o pit_ # # GNU 'C' compiler Linux build with S/390, threads, largfiles, async I/O # @@ -86,7 +90,7 @@ Upstream-Status: Pending $(CC) -O2 $(LDFLAGS) -lpthread -lrt iozone_linux-s390.o \ libbif.o libasync.o -o iozone $(CC) -O3 -Dlinux fileop_linux-s390.o -o fileop -@@ -240,7 +240,7 @@ +@@ -267,7 +267,7 @@ linux-S390: iozone_linux-s390.o libbif.o libasync.o fileop_linux-s390.o pit_serv # # GNU 'C' compiler Linux build with S/390, threads, largfiles, async I/O # @@ -95,3 +99,6 @@ Upstream-Status: Pending $(CC) -O2 $(LDFLAGS) -lpthread -lrt iozone_linux-s390x.o \ libbif.o libasync.o -o iozone $(CC) -O3 -Dlinux fileop_linux-s390x.o -o fileop +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_492.bb index 1d2e53a31..a68a27c97 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_492.bb @@ -11,8 +11,8 @@ SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ file://0001-let-system-headers-provide-pread64.patch \ file://copyright.txt \ " -SRC_URI[md5sum] = "95cb73dfdd58a0dfa42804f016dbb83c" -SRC_URI[sha256sum] = "5eadb4235ae2a956911204c50ebf2d8d8d59ddcd4a2841a1baf42f3145ad4fed" +SRC_URI[md5sum] = "228f54482c01d1c04c571a9414cd20e5" +SRC_URI[sha256sum] = "322981e168f32bd39f54772b82b2906d598d958c37e954e75742e71baf58bb9b" UPSTREAM_CHECK_REGEX = "iozone3_(?P<pver>\d+).tar" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench/0001-build-Do-not-override-ldflags-from-environment.patch b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench/0001-build-Do-not-override-ldflags-from-environment.patch new file mode 100644 index 000000000..060b418fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench/0001-build-Do-not-override-ldflags-from-environment.patch @@ -0,0 +1,30 @@ +From 419dac71dd524a39ad2333e91334b4650e277a78 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 25 Jun 2021 09:43:00 -0700 +Subject: [PATCH] build: Do not override ldflags from environment + +bitbake passed LDFLAGS contain important information e.g. which compiler +runtime to link etc. Therefore append -static to LDFLAGS instead + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index efda5c0..a867876 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,7 +3,7 @@ SRCS = $(sort $(wildcard *.c)) + OBJS = $(SRCS:.c=.o) + + CFLAGS = -Os -D_XOPEN_SOURCE=700 +-LDFLAGS = -static ++LDFLAGS += -static + LIBS = -lpthread -lrt -lpthread + + +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb index e81389431..f16bd99d5 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb @@ -10,6 +10,7 @@ SRCREV = "b6b2ce5f9f87a09b14499cb00c600c601f022634" PV = "20110206+git${SRCPV}" SRC_URI = "git://git.musl-libc.org/libc-bench \ + file://0001-build-Do-not-override-ldflags-from-environment.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.1.bb index 1a041101b..1628a0519 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.1.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \ file://Makefile.patch \ " -SRC_URI[md5sum] = "674a8a88ff54bdb229ca4148218a41f1" -SRC_URI[sha256sum] = "8ed52b0d06d4aeb61954994146e2a5b2d20448a8f3ce3ee995120e6dbde2ae37" +SRC_URI[md5sum] = "1bc22c01e987d6a67fac39dc5656a4d3" +SRC_URI[sha256sum] = "1c5fc2382576c084b314cfd334d127a66c20bd63892cac9f445bc1d8b4ca5a47" do_compile () { echo '${CC} ${CFLAGS} -DPOSIX -c' > conf-cc diff --git a/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench/0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch b/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench/0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch new file mode 100644 index 000000000..d628e81b5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench/0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch @@ -0,0 +1,40 @@ +From c1ebf893e32a0a77e820484d48a903523fef7c1b Mon Sep 17 00:00:00 2001 +From: Vasily Tarasov <tarasov@vasily.name> +Date: Fri, 10 Jun 2016 14:33:48 -0400 +Subject: [PATCH] Adding volatile modifier to tmp variable in memory test + +Issue explanation: + +./sysbench/sysbench --test=memory --num-threads=16 \ + --memory-block-size=268435456 \ + --memory-total-size=137438953472 \ + --memory-oper=read \ + --memory-access-mode=seq \ + --memory-scope=local run + +Without this commit the time to run the above command is 0.0004 seconds. +With this commit the time is greater than 3 seconds. Essentially, +without the volatile modifier, the compiler optimizes read access so +that no real access happens. + +Upstream-Status: Backport [part of v1.0.0 https://github.com/akopytov/sysbench/commit/8753cb93be4c0b81a20b704ced91e7a422da52b1] + +(cherry picked from commit 8753cb93be4c0b81a20b704ced91e7a422da52b1) +Signed-off-by: massimo toscanelli <massimo.toscanelli@leica-geosystems.com> +--- + sysbench/tests/memory/sb_memory.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysbench/tests/memory/sb_memory.c b/sysbench/tests/memory/sb_memory.c +index 2e8998f..7d22bb9 100644 +--- a/sysbench/tests/memory/sb_memory.c ++++ b/sysbench/tests/memory/sb_memory.c +@@ -244,7 +244,7 @@ sb_request_t memory_get_request(int tid) + int memory_execute_request(sb_request_t *sb_req, int thread_id) + { + sb_mem_request_t *mem_req = &sb_req->u.mem_request; +- int tmp = 0; ++ volatile int tmp = 0; + int idx; + int *buf, *end; + log_msg_t msg; diff --git a/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb b/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb index 708c71f4f..d1725dddd 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb @@ -8,7 +8,9 @@ inherit autotools # The project has moved from Sourceforge to Launchpad, to Github. Use the source tarball from # Launchpad until the next release is available from Github. -SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/${BPN}_${PV}.orig.tar.gz" +SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/${BPN}_${PV}.orig.tar.gz \ + file://0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch \ + " SRC_URI[md5sum] = "3a6d54fdd3fe002328e4458206392b9d" SRC_URI[sha256sum] = "83fa7464193e012c91254e595a89894d8e35b4a38324b52a5974777e3823ea9e" diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch new file mode 100644 index 000000000..f3316aa26 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch @@ -0,0 +1,52 @@ +From 3334dd4e9fc34c79c3925c3c24869939d8955f21 Mon Sep 17 00:00:00 2001 +From: Rosen Penev <rosenp@gmail.com> +Date: Sat, 18 Jul 2020 12:16:00 -0700 +Subject: [PATCH] hwaccess: use __asm__ as is done elsewhere + +Fixes compilation under powerpc platform. Made the change for the SPARC +platform as well. + +../hwaccess.c: In function 'sync_primitive': +../hwaccess.c:74:2: warning: implicit declaration of function 'asm' + [-Wimplicit-function-declaration] + 74 | asm("eieio" : : : "memory"); + | ^~~ +../hwaccess.c:74:13: error: expected ')' before ':' token + 74 | asm("eieio" : : : "memory"); + +Upstream-Status: Submitted [https://github.com/flashrom/flashrom/pull/155] +Signed-off-by: Rosen Penev <rosenp@gmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + hwaccess.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/hwaccess.c b/hwaccess.c +index 48ccb34..2a39989 100644 +--- a/hwaccess.c ++++ b/hwaccess.c +@@ -71,18 +71,18 @@ static inline void sync_primitive(void) + * See also https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/memory-barriers.txt + */ + #if IS_PPC // cf. http://lxr.free-electrons.com/source/arch/powerpc/include/asm/barrier.h +- asm("eieio" : : : "memory"); ++ __asm__ ("eieio" : : : "memory"); + #elif IS_SPARC + #if defined(__sparc_v9__) || defined(__sparcv9) + /* Sparc V9 CPUs support three different memory orderings that range from x86-like TSO to PowerPC-like + * RMO. The modes can be switched at runtime thus to make sure we maintain the right order of access we + * use the strongest hardware memory barriers that exist on Sparc V9. */ +- asm volatile ("membar #Sync" ::: "memory"); ++ __asm__ volatile ("membar #Sync" ::: "memory"); + #elif defined(__sparc_v8__) || defined(__sparcv8) + /* On SPARC V8 there is no RMO just PSO and that does not apply to I/O accesses... but if V8 code is run + * on V9 CPUs it might apply... or not... we issue a write barrier anyway. That's the most suitable + * operation in the V8 instruction set anyway. If you know better then please tell us. */ +- asm volatile ("stbar"); ++ __asm__ volatile ("stbar"); + #else + #error Unknown and/or unsupported SPARC instruction set version detected. + #endif +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb index 145a3cad0..1d0613214 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb @@ -7,6 +7,7 @@ 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" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.7.bb index 271a66875..f2a2a5fc8 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.7.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ " -SRCREV = "ed307629e067a9ef55d79beec9c9f67b86efbaaf" +SRCREV = "35c82812f2d6bb41686d49987e052b75e1836afd" SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=2.2.x" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.14.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.15.bb index dbcc319dc..9a5256f94 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.15.bb @@ -8,7 +8,7 @@ DEPENDS = "ell" SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ " -SRC_URI[sha256sum] = "21be6ad59ba666ba1e50e01889d647472b9b2f96f4941123db036fd33c257f0b" +SRC_URI[sha256sum] = "a7ab8e80592da5cb1a8b651b6d41e87e4507a3f07e04246e05bca89c547af659" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.8.bb index 6fe6a2e4f..6a8d2405e 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.6.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.8.bb @@ -12,6 +12,4 @@ DEPENDS = "glib-2.0 glib-2.0-native libgudev" inherit autotools pkgconfig bash-completion gobject-introspection SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" - -SRC_URI[md5sum] = "38d228548eae3ee144e19a42b028eab0" -SRC_URI[sha256sum] = "760465caaa1ccd699c14290e9791da456d5300dd11ebf4c1486151033e875dfd" +SRC_URI[sha256sum] = "02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.28.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.28.6.bb index c6422c392..f062d8631 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.28.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.28.6.bb @@ -14,7 +14,7 @@ inherit autotools pkgconfig bash-completion gobject-introspection SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "3b14cd2ab5221a7adbb39fed16ef697538ea1c79308821ad2d19b505e1daaea0" +SRC_URI[sha256sum] = "cbb890893de1dee06ea5ebdac2d22f0469314a6f93f15f61f2f1206a1c9ae5fd" PACKAGECONFIG ??= "udev mbim" PACKAGECONFIG[udev] = ",--without-udev,libgudev" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb index 89c98fec0..685aebee5 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb @@ -1,12 +1,12 @@ SUMMARY = "Canonical libwebsockets.org websocket library" HOMEPAGE = "https://libwebsockets.org/" -LICENSE = "MIT & Zlib & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c47b078124308a4e1354e8d59f606b7" +LICENSE = "MIT & Zlib & BSD-3-Clause & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c8bea43a2eb5d713c338819a0be07797" DEPENDS = "zlib" S = "${WORKDIR}/git" -SRCREV = "1367c11e1ee44d9e19daa50e1d015365bae17354" +SRCREV = "8a580b59b23d204ca72028370e97a8f6aa0c9202" SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.2-stable" UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb index c8527260b..a0f894a4d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb @@ -1,4 +1,5 @@ DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux" +HOMEPAGE = "http://linuxptp.sourceforge.net/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" @@ -7,17 +8,25 @@ SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}. file://Use-cross-cpp-in-incdefs.patch \ " +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/linuxptp/files/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" + SRC_URI[md5sum] = "2264cb69c9af947028835c12c89a7572" SRC_URI[sha256sum] = "f58f5b11cf14dc7c4f7c9efdfb27190e43d02cf20c3525f6639edac10528ce7d" -EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}'" +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}' mandir=${mandir}" export KBUILD_OUTPUT="${RECIPE_SYSROOT}" -do_install () { - install -d ${D}/${bindir} - install -p ${S}/ptp4l ${D}/${bindir} - install -p ${S}/pmc ${D}/${bindir} - install -p ${S}/phc2sys ${D}/${bindir} - install -p ${S}/hwstamp_ctl ${D}/${bindir} +do_install() { + oe_runmake install DESTDIR=${D} prefix=${prefix} + + # Install example configs from source tree + install -d ${D}${docdir}/${PN} + cp -R --no-dereference --preserve=mode,links ${S}/configs ${D}${docdir}/${PN} } + +PACKAGES =+ "${PN}-configs" + +FILES_${PN}-configs = "${docdir}" +FILES_${PN}-doc = "${mandir}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb index f8e8aa1d4..acfa113ed 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb @@ -12,7 +12,7 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" -SRC_URI[sha256sum] = "167e60b26fa05887f87a0b3fb54143d7845e6e4d8c2f2dd93afac059f41e7edf" +SRC_URI[sha256sum] = "21fdfaf94171261ad9d99771894f5ade4bc39ef3d1ff1d421054d14713e97880" S = "${WORKDIR}/ModemManager-${PV}" PACKAGECONFIG ??= "mbim qmi \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb index e6a4bc4c4..75584498a 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "5d720a204c2a58645d6f7643af15d563a712dad98c9d32c1ed913377da UPSTREAM_CHECK_URI = "https://github.com/zeromq/${BPN}/releases" -inherit cmake +inherit cmake pkgconfig PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg" @@ -23,10 +23,12 @@ FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" RDEPENDS_lib${BPN}-dev = "zeromq-dev" PACKAGECONFIG ??= "lz4 uuid curl ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[lz4] = ",-DCMAKE_DISABLE_FIND_PACKAGE_lz4=TRUE,lz4" -PACKAGECONFIG[uuid] = ",-DCMAKE_DISABLE_FIND_PACKAGE_uuid=TRUE,util-linux" -PACKAGECONFIG[curl] = ",-DCMAKE_DISABLE_FIND_PACKAGE_libcurl=TRUE,curl" -PACKAGECONFIG[systemd] = ",-DCMAKE_DISABLE_FIND_PACKAGE_systemd=TRUE,systemd" +PACKAGECONFIG[curl] = "-DCZMQ_WITH_LIBCURL=ON,-DCZMQ_WITH_LIBCURL=OFF,curl" +PACKAGECONFIG[httpd] = "-DCZMQ_WITH_LIBMICROHTTPD=ON,-DCZMQ_WITH_LIBMICROHTTPD=OFF,libmicrohttpd" +PACKAGECONFIG[lz4] = "-DCZMQ_WITH_LZ4=ON,-DCZMQ_WITH_LZ4=OFF,lz4" +PACKAGECONFIG[nss] = "-DCZMQ_WITH_NSS=ON,-DCZMQ_WITH_NSS=OFF,nss" +PACKAGECONFIG[systemd] = "-DCZMQ_WITH_SYSTEMD=ON,-DCZMQ_WITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[uuid] = "-DCZMQ_WITH_UUID=ON,-DCZMQ_WITH_UUID=OFF,util-linux" BBCLASSEXTEND = "nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_28.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_29.bb index a35f5c64c..8fcdb8c66 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_28.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_29.bb @@ -7,15 +7,15 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" -SRC_URI[sha256sum] = "abb8b54434faeeb6bf59a70ebf0732e851a50bd922995ba5928e8c28c18b05ea" +SRC_URI[sha256sum] = "4eca425db52b7ab1027153e93fea9b3f11759db9e93ffbf88759b73ddfb8026a" UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases" inherit meson pkgconfig systemd features_check DEPENDS = "expat systemd" -DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" -DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit', '', d)}" +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux (>= 3.2)', '', d)}" +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit (>= 3.0)', '', d)}" RDEPENDS_${PN} += "dbus-common" @@ -29,5 +29,4 @@ FILES_${PN} += "${nonarch_libdir}/systemd/catalog" EXTRA_OEMESON += " -Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" EXTRA_OEMESON += " -Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" -EXTRA_OEMESON += " -Dlinux-4-17=true" diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb index 75eea4e58..a40561138 100644 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb @@ -6,23 +6,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "mm-common glib-2.0 libsigc++-2.0 glib-2.0-native" + +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI += " \ - file://remove-examples.patch \ -" -SRC_URI[archive.md5sum] = "7da228e3f0c6a10024b9a7708c53691e" -SRC_URI[archive.sha256sum] = "36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe" +SRC_URI[archive.sha256sum] = "69bd6b5327716ca2f511ab580a969fd7bf0cd2c24ce15e1d0e530592d3ff209c" do_install_append() { - install -d ${D}${datadir}/glibmm-2.4 - install -d ${D}${datadir}/aclocal - - install -m 0644 glib/glibmmconfig.h ${D}${datadir}/glibmm-2.4/ - install -m 0644 scripts/glibmm_check_perl.m4 ${D}${datadir}/aclocal/ || true - for i in generate_wrap_init.pl gmmproc; do sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/glibmm-2.4/proc/$i done @@ -32,4 +25,3 @@ FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" RDEPENDS_${PN}-dev = "perl" -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.6.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.7.bb index f4c5aa396..de1aa4ea3 100644 --- a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.6.bb +++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.7.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" DEPENDS = "mm-common" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-${PV}.tar.xz" -SRC_URI[sha256sum] = "dda176dc4681bda9d5a2ac1bc55273bdd381662b7a6d49e918267d13e8774e1b" +SRC_URI[sha256sum] = "d082a2ce72c750f66b1a415abe3e852df2eae1e8af53010f4ac2ea261a478832" S = "${WORKDIR}/libsigc++-${PV}" 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 0148c0c2e..4ecfb3d44 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.13+git${SRCPV}" -SRCREV = "b230a96b61e9e35b8da1565893d74380646e03c8" +PV = "2.0.15+git${SRCPV}" +SRCREV = "f7237f3799009d856935e1eecfd7c9301fe522b4" S = "${WORKDIR}/git" 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 d0665f258..6db7f1e38 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 @@ -245,6 +245,7 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ lemon \ flatbuffers \ heaptrack \ + libparse-yapp-perl \ libubox \ ltrace \ lua \ @@ -355,6 +356,7 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ libleak \ libuio \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libwmf", "", d)} \ + libyang \ lprng \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "icewm", "", d)} \ md5deep \ @@ -425,6 +427,7 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ wxwidgets \ zlog \ zstd \ + zsync-curl \ redis-plus-plus \ " RDEPENDS_packagegroup-meta-oe-extended_append_libc-musl = " libexecinfo" @@ -437,8 +440,8 @@ RDEPENDS_packagegroup-meta-oe-extended_remove_mips = "sysdig" RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc = "upm mraa minifi-cpp" RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc64 = "upm mraa minifi-cpp" RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc64le = "upm mraa" -RDEPENDS_packagegroup-meta-oe-extended_remove_riscv64 = "upm libleak mraa sysdig tiptop" -RDEPENDS_packagegroup-meta-oe-extended_remove_riscv32 = "upm libleak mraa sysdig tiptop" +RDEPENDS_packagegroup-meta-oe-extended_remove_riscv64 = "upm libleak libyang mraa sysdig tiptop" +RDEPENDS_packagegroup-meta-oe-extended_remove_riscv32 = "upm libleak libyang mraa sysdig tiptop" RDEPENDS_packagegroup-meta-oe-extended-python2 ="\ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'openlmi-tools', '', d), "", d)} \ @@ -933,6 +936,7 @@ RDEPENDS_packagegroup-meta-oe-test ="\ bats \ cmocka \ cppunit \ + cpputest \ cukinia \ cunit \ cxxtest \ diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.4.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.5.bb index cc98b9ec0..90a0ad6c7 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.5.bb @@ -9,7 +9,7 @@ inherit cml1 update-alternatives SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "cb2a565a8d30015d08d73628795dca51a85b99b149aeabbbecd9e8dbdbd8fddc" +SRC_URI[sha256sum] = "bfd230c187726347f7e31a1fc5841705871dfe4f3cbc6628f512b54e57360949" SECTION = "base" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.5.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb index 0da9a26e8..9e83b90ea 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb @@ -16,13 +16,9 @@ DEPENDS = " \ util-linux-libuuid \ " -RDEPENDS_${PN} = " \ - libdevmapper \ -" - SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "408620e0df577ec04108ec0bc2b91dee" -SRC_URI[sha256sum] = "ced9946f444d132536daf92fc8aca4277638a3c2d96e20540b2bae4d36fd70c1" +SRC_URI[md5sum] = "504d1ab22cbc4d1a59a8d8c7ee5ed3bf" +SRC_URI[sha256sum] = "b296b7a21ea576c2b180611ccb19d06aec8dddaedf7c704b0c6a81210c25635f" inherit autotools gettext pkgconfig @@ -71,14 +67,6 @@ PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel" PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle" PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1" -RRECOMMENDS_${PN} = "kernel-module-aes-generic \ - kernel-module-dm-crypt \ - kernel-module-md5 \ - kernel-module-cbc \ - kernel-module-sha256-generic \ - kernel-module-xts \ -" - EXTRA_OECONF = "--enable-static" # Building without largefile is not supported by upstream EXTRA_OECONF += "--enable-largefile" @@ -89,4 +77,17 @@ EXTRA_OECONF += "--disable-libargon2" FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" +RDEPENDS_${PN} = " \ + libdevmapper \ +" + +RRECOMMENDS_${PN}_class-target = " \ + kernel-module-aes-generic \ + kernel-module-dm-crypt \ + kernel-module-md5 \ + kernel-module-cbc \ + kernel-module-sha256-generic \ + kernel-module-xts \ +" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.4.bb index 9b1ba4f2e..a39aeb617 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.4.bb @@ -9,7 +9,7 @@ SECTION = "console" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=bc974d217b525ea216a336adb73e1220" -SRCREV = "a92b1a54b003879322c044adf0ae3ea3e95e7348" +SRCREV = "9e082897d61a2449657651aa5a0931aca31428fd" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb index 73b2a0980..73b2a0980 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 25e630a16..5787ae4bd 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -12,7 +12,6 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://mysql-systemd-start \ file://configure.cmake-fix-valgrind.patch \ file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \ - file://sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ file://0001-disable-ucontext-on-musl.patch \ file://c11_atomics.patch \ file://clang_version_header_conflict.patch \ @@ -21,12 +20,12 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \ file://sys_futex.patch \ - file://cross-compiling.patch \ file://ssize_t.patch \ + file://mm_malloc.patch \ " SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb" +SRC_URI[sha256sum] = "761053605fe30ce393f324852117990350840a93b3e6305ef4d2f8c8305cc47a" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -37,15 +36,15 @@ BINCONFIG_GLOB = "mysql_config" inherit cmake gettext binconfig update-rc.d useradd systemd multilib_script MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ - ${PN}-server:${bindir}/mariadb-install-db" + ${PN}-setupdb:${bindir}/mariadb-install-db" INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" INITSCRIPT_NAME_${PN}-server = "mysqld" INITSCRIPT_PARAMS_${PN}-server ?= "start 45 5 . stop 45 0 6 1 ." -USERADD_PACKAGES = "${PN}-server" -USERADD_PARAM_${PN}-server = "--system --home-dir /var/mysql -g mysql --shell /bin/false mysql" -GROUPADD_PARAM_${PN}-server = "--system mysql" +USERADD_PACKAGES = "${PN}-setupdb" +USERADD_PARAM_${PN}-setupdb = "--system --home-dir /var/mysql -g mysql --shell /bin/false mysql" +GROUPADD_PARAM_${PN}-setupdb = "--system mysql" INITSCRIPT_NAME_${PN}-setupdb = "install_db" INITSCRIPT_PARAMS_${PN}-setupdb ?= "defaults 44 44" @@ -57,16 +56,18 @@ SYSTEMD_AUTO_ENABLE_${PN}-server ?= "disable" SYSTEMD_SERVICE_${PN}-setupdb = "install_db.service" SYSTEMD_AUTO_ENABLE_${PN}-setupdb ?= "enable" ALLOW_EMPTY_${PN}-setupdb ?= "1" -FILES_${PN}-setupdb = "${sysconfdir}/init.d/install_db" - -EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} setupdb" +FILES_${PN}-setupdb = "${sysconfdir}/init.d/install_db \ + ${bindir}/mariadb-install-db \ + ${bindir}/my_print_defaults \ + ${bindir}/mysql_install_db \ + ${bindir}/mysql-systemd-start \ + " + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG_class-native = "" PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind" PACKAGECONFIG[krb5] = ", ,krb5" -PACKAGECONFIG[setupdb] = ", ,,${PN}-setupdb" PACKAGECONFIG[zstd] = "-DWITH_ROCKSDB_ZSTD=ON,-DWITH_ROCKSDB_ZSTD=OFF,zstd" # MariaDB doesn't link properly with gold @@ -94,6 +95,8 @@ EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \ -DCAT_EXECUTABLE=`which cat` \ -DCMAKE_AR:FILEPATH=${AR}" +EXTRA_OECMAKE_prepend_class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper " + # With Ninja it fails with: # make: *** No rule to make target `install'. Stop. OECMAKE_GENERATOR = "Unix Makefiles" @@ -116,12 +119,18 @@ do_generate_toolchain_file_append_class-native () { sed -i "/set( CMAKE_SYSTEM_PROCESSOR/d" ${WORKDIR}/toolchain.cmake } -do_compile_prepend_class-target () { - # These need to be in-tree or make will think they need to be built, - # and since we're cross-compiling that is disabled - cp ${STAGING_BINDIR_NATIVE}/comp_err ${S}/extra - cp ${STAGING_BINDIR_NATIVE}/comp_sql ${S}/scripts +do_configure_prepend_class-target () { + # Write out a qemu wrapper that will be used by cmake + # so that it can run target helper binaries through that. + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper +} +do_compile_prepend_class-target () { if [ "${@bb.utils.contains('PACKAGECONFIG', 'krb5', 'yes', 'no', d)}" = "no" ]; then if ! [ -e ${B}/include/openssl/kssl.h ] ; then mkdir -p ${B}/include/openssl @@ -131,11 +140,6 @@ do_compile_prepend_class-target () { echo "#endif" >>${B}/include/openssl/kssl.h fi fi - # workaround to handle out-of-source build from source package - yacc_files="sql_yacc.hh sql_yacc.cc sql_yacc_ora.hh sql_yacc_ora.cc" - for yacc_file in ${yacc_files}; do - cp ${S}/sql/${yacc_file} ${B}/sql/${yacc_file} - done } SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess" @@ -185,10 +189,10 @@ do_install() { fi } -PACKAGES = "${PN}-dbg ${PN} \ +PACKAGES = "${PN}-dbg ${PN}-setupdb ${PN} \ libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev \ libmysqlclient libmysqlclient-dev libmysqlclient-staticdev \ - libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-setupdb ${PN}-leftovers" + libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-leftovers" CONFFILES_${PN}-server += "${sysconfdir}/my.cnf ${sysconfdir}/my.cnf.d/server.cnf" CONFFILES_${PN}-client += "${sysconfdir}/my.cnf.d/mysql-clients.cnf" CONFFILES_libmysqlclient += "${sysconfdir}/my.cnf.d/client.cnf" @@ -291,7 +295,6 @@ FILES_${PN}-server = "\ ${bindir}/mysql_convert_table_format \ ${bindir}/mariadb-convert-table-format \ ${bindir}/mysql_install_db \ - ${bindir}/mariadb-install-db \ ${bindir}/mysql_secure_installation \ ${bindir}/mariadb-secure-installation \ ${bindir}/mysql_setpermission \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch deleted file mode 100644 index 0f4815b18..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch +++ /dev/null @@ -1,25 +0,0 @@ -This is not needed for OE builds - -building failed since native does not generate import_executables.cmake -In fact, our building system will export the needed commands - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -392,11 +392,6 @@ CHECK_PCRE() - - CHECK_SYSTEMD() - --IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR) -- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") -- INCLUDE(${IMPORT_EXECUTABLES}) --ENDIF() -- - # - # Setup maintainer mode options. Platform checks are - # not run with the warning options as to not perturb fragile checks diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch new file mode 100644 index 000000000..347fcd851 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch @@ -0,0 +1,11 @@ +--- a/storage/rocksdb/rocksdb/port/jemalloc_helper.h ++++ b/storage/rocksdb/rocksdb/port/jemalloc_helper.h +@@ -5,7 +5,7 @@ + + #pragma once + +-#if defined(__clang__) ++#if defined(__clang__) && defined(__GLIBC__) + // glibc's `posix_memalign()` declaration specifies `throw()` while clang's + // declaration does not. There is a hack in clang to make its re-declaration + // compatible with glibc's if they are declared consecutively. That hack breaks diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch index d082d424b..d6e53c29e 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch @@ -36,7 +36,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + __builtin_ppc_get_timebase(); #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) /* Mainly, prevent the compiler from optimizing away delay loops */ - __asm__ __volatile__ ("isb":::"memory"); + #ifdef _aarch64_ --- a/storage/tokudb/PerconaFT/portability/toku_time.h +++ b/storage/tokudb/PerconaFT/portability/toku_time.h @@ -124,7 +124,7 @@ static inline tokutime_t toku_time_now(v diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch deleted file mode 100644 index 4cb044339..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch +++ /dev/null @@ -1,67 +0,0 @@ -From cfce1491827e5a581878b5e166bf4d30e6d90e07 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Thu, 23 Jul 2020 00:08:16 -0700 -Subject: [PATCH] sql/CMakeLists.txt: fix gen_lex_hash not found - -Fix the below do_compile issue in cross-compiling env. -| make[2]: *** No rule to make target '/build/tmp/work/aarch64-poky-linux/mariadb/10.3.13-r0/mariadb-10.3.13/sql/gen_lex_hash', needed by 'sql/lex_hash.h'. Stop. -| make[2]: *** No rule to make target '/build/tmp/work/aarch64-poky-linux/mariadb/10.3.13-r0/mariadb-10.3.13/sql/gen_lex_token', needed by 'sql/lex_token.h'. Stop. - -Upstream-Status: Inappropriate [oe build specific] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - sql/CMakeLists.txt | 30 ++++++++++++++++++++---------- - 1 file changed, 20 insertions(+), 10 deletions(-) - -diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt -index 0dc3caa..616017b 100644 ---- a/sql/CMakeLists.txt -+++ b/sql/CMakeLists.txt -@@ -52,11 +52,16 @@ ${CMAKE_BINARY_DIR}/sql - ${CMAKE_SOURCE_DIR}/tpool - ) - --ADD_CUSTOM_COMMAND( -- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h -- COMMAND gen_lex_token > lex_token.h -- DEPENDS gen_lex_token --) -+IF(NOT CMAKE_CROSSCOMPILING) -+ ADD_CUSTOM_COMMAND( -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h -+ COMMAND gen_lex_token > lex_token.h -+ DEPENDS gen_lex_token) -+ELSE() -+ ADD_CUSTOM_COMMAND( -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h -+ COMMAND gen_lex_token > lex_token.h) -+ENDIF() - - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.yy -@@ -345,11 +350,16 @@ IF(NOT CMAKE_CROSSCOMPILING) - ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) - ENDIF() - --ADD_CUSTOM_COMMAND( -- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h -- COMMAND gen_lex_hash > lex_hash.h -- DEPENDS gen_lex_hash --) -+IF(NOT CMAKE_CROSSCOMPILING) -+ ADD_CUSTOM_COMMAND( -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h -+ COMMAND gen_lex_hash > lex_hash.h -+ DEPENDS gen_lex_hash) -+ELSE() -+ ADD_CUSTOM_COMMAND( -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h -+ COMMAND gen_lex_hash > lex_hash.h) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mariadb-tzinfo-to-sql tztime.cc COMPONENT Server) - SET_TARGET_PROPERTIES(mariadb-tzinfo-to-sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL") --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb index 8ae8241b0..57d7736ea 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb @@ -1,8 +1,8 @@ require mariadb.inc -EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" +inherit qemu -DEPENDS += "mariadb-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" +DEPENDS += "qemu-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" PROVIDES += "mysql5 libmysqlclient" diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch index eb9928a0c..8bdd27ff2 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch @@ -25,11 +25,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 74 insertions(+) create mode 100644 cmake/modules/CheckAtomic.cmake -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9c8f3346..4d604004b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -852,7 +852,12 @@ endif() +@@ -935,7 +935,12 @@ endif() if(WIN32) set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib) else() @@ -41,10 +39,7 @@ index f9c8f3346..4d604004b 100644 + endif() endif() - add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES}) -diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake -new file mode 100644 -index 000000000..8b7dc8a37 + add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC}) --- /dev/null +++ b/cmake/modules/CheckAtomic.cmake @@ -0,0 +1,69 @@ @@ -117,6 +112,3 @@ index 000000000..8b7dc8a37 + endif() +endif() + --- -2.28.0 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch index 57433b057..d3054759a 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch @@ -11,8 +11,6 @@ Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7541] CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 676192913..801586c30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ @@ -24,7 +22,7 @@ index 676192913..801586c30 100644 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/") include(ReadVersion) -@@ -148,12 +148,7 @@ else() +@@ -152,12 +152,7 @@ else() if(WITH_BZ2) find_package(BZip2 REQUIRED) add_definitions(-DBZIP2) @@ -38,6 +36,3 @@ index 676192913..801586c30 100644 endif() if(WITH_LZ4) --- -2.28.0 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch index aa291daa3..9c70d4f6a 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch @@ -12,8 +12,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> third-party/folly/folly/detail/Futex.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -diff --git a/third-party/folly/folly/detail/Futex.cpp b/third-party/folly/folly/detail/Futex.cpp -index 62d6ea2b2..a914a8c73 100644 --- a/third-party/folly/folly/detail/Futex.cpp +++ b/third-party/folly/folly/detail/Futex.cpp @@ -48,9 +48,15 @@ namespace { @@ -42,6 +40,3 @@ index 62d6ea2b2..a914a8c73 100644 addr, /* addr1 */ op, /* op */ expected, /* val */ --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-jemalloc_helper-Limit-the-mm_malloc.h-hack-to-glibc-.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-jemalloc_helper-Limit-the-mm_malloc.h-hack-to-glibc-.patch new file mode 100644 index 000000000..dbb0dda22 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-jemalloc_helper-Limit-the-mm_malloc.h-hack-to-glibc-.patch @@ -0,0 +1,23 @@ +From 1a69d4cc3f97e348dba9714c7ec60da1a8650664 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Jun 2021 22:05:36 -0700 +Subject: [PATCH] jemalloc_helper: Limit the mm_malloc.h hack to glibc on linux + +Musl does not need this hack + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + port/jemalloc_helper.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/port/jemalloc_helper.h ++++ b/port/jemalloc_helper.h +@@ -5,7 +5,7 @@ + + #pragma once + +-#if defined(__clang__) ++#if defined(__clang__) && defined(__GLIBC__) + // glibc's `posix_memalign()` declaration specifies `throw()` while clang's + // declaration does not. There is a hack in clang to make its re-declaration + // compatible with glibc's if they are declared consecutively. That hack breaks diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-range_tree-Implement-toku_time_now-for-rv32-rv64-in-.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-range_tree-Implement-toku_time_now-for-rv32-rv64-in-.patch new file mode 100644 index 000000000..86c1bffea --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-range_tree-Implement-toku_time_now-for-rv32-rv64-in-.patch @@ -0,0 +1,44 @@ +From 89c032a9b4011385c0b504ea61e5df0db71f0ff5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 16 Jun 2021 19:06:02 -0700 +Subject: [PATCH] range_tree: Implement toku_time_now for rv32/rv64 in asm + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../range_tree/lib/portability/toku_time.h | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +index 4425a4a2e..4ac964f85 100644 +--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h ++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +@@ -133,6 +133,25 @@ static inline tokutime_t toku_time_now(void) { + return result; + #elif defined(__powerpc__) + return __ppc_get_timebase(); ++#elif defined(__riscv) // RISC-V ++#if __riscv_xlen == 32 ++ uint32_t lo, hi0, hi1; ++ __asm __volatile__( ++ "rdcycleh %0\n" ++ "rdcycle %1\n" ++ "rdcycleh %2\n" ++ "sub %0, %0, %2\n" ++ "seqz %0, %0\n" ++ "sub %0, zero, %0\n" ++ "and %1, %1, %0\n" ++ : "=r"(hi0), "=r"(lo), "=r"(hi1)); ++ return ((uint64_t)hi1 << 32) | lo; ++#else ++ uint64_t result; ++ __asm __volatile__("rdcycle %0" : "=r"(result)); ++ return result; ++#endif ++ + #else + #error No timer implementation for this platform + #endif +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch new file mode 100644 index 000000000..4aa91d9b2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch @@ -0,0 +1,59 @@ +From 114c42fba3fc86119710e8dd1bb2b7a9e39e3064 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 17 Jun 2021 19:35:01 -0700 +Subject: [PATCH] replace old sync with new atomic builtin equivalents + +Helps compiling with gcc on newer arches e.g. riscv32 where these +__sync* builtins are not implemented atleast for 64bit values + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../range/range_tree/lib/portability/toku_atomic.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_atomic.h ++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_atomic.h +@@ -77,37 +77,37 @@ template <typename T, typename U> + __attribute__((always_inline)) static inline T toku_sync_fetch_and_add(T *addr, + U diff) { + paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); +- return __sync_fetch_and_add(addr, diff); ++ return __atomic_fetch_add(addr, diff, 5); + } + template <typename T, typename U> + __attribute__((always_inline)) static inline T toku_sync_add_and_fetch(T *addr, + U diff) { + paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); +- return __sync_add_and_fetch(addr, diff); ++ return __atomic_add_fetch(addr, diff, 5); + } + template <typename T, typename U> + __attribute__((always_inline)) static inline T toku_sync_fetch_and_sub(T *addr, + U diff) { + paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); +- return __sync_fetch_and_sub(addr, diff); ++ return __atomic_fetch_sub(addr, diff, 5); + } + template <typename T, typename U> + __attribute__((always_inline)) static inline T toku_sync_sub_and_fetch(T *addr, + U diff) { + paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); +- return __sync_sub_and_fetch(addr, diff); ++ return __atomic_sub_fetch(addr, diff, 5); + } + template <typename T, typename U, typename V> + __attribute__((always_inline)) static inline T toku_sync_val_compare_and_swap( + T *addr, U oldval, V newval) { + paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); +- return __sync_val_compare_and_swap(addr, oldval, newval); ++ return __atomic_compare_exchange(addr, oldval, newval); + } + template <typename T, typename U, typename V> + __attribute__((always_inline)) static inline bool + toku_sync_bool_compare_and_swap(T *addr, U oldval, V newval) { + paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); +- return __sync_bool_compare_and_swap(addr, oldval, newval); ++ return static_cast<bool>(__atomic_compare_exchange(addr, oldval, newval)); + } + + // in case you include this but not toku_portability.h diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/arm.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/arm.patch new file mode 100644 index 000000000..d428a6624 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/arm.patch @@ -0,0 +1,26 @@ +implement timer for arm >= v6 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h ++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +@@ -161,6 +161,20 @@ static inline tokutime_t toku_time_now(v + struct timeval tv; + gettimeofday(&tv, nullptr); + return (uint64_t)tv.tv_sec * 1000000 + tv.tv_usec; ++#elif (__ARM_ARCH >= 6) ++ uint32_t pmccntr; ++ uint32_t pmuseren; ++ uint32_t pmcntenset; ++ // Read the user mode perf monitor counter access permissions. ++ asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); ++ if (pmuseren & 1) { // Allows reading perfmon counters for user mode code. ++ asm volatile("mrc p15, 0, %0, c9, c12, 1" : "=r"(pmcntenset)); ++ if (pmcntenset & 0x80000000ul) { // Is it counting? ++ asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr)); ++ // The counter is set up to count every 64th cycle ++ return (uint64_t)pmccntr * 64; // Should optimize to << 6 ++ } ++ } + #else + #error No timer implementation for this platform + #endif diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/mips.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/mips.patch new file mode 100644 index 000000000..db2305d29 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/mips.patch @@ -0,0 +1,19 @@ +implement timer implementation for mips platform + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h ++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +@@ -155,7 +155,12 @@ static inline tokutime_t toku_time_now(v + __asm __volatile__("rdcycle %0" : "=r"(result)); + return result; + #endif +- ++#elif defined(__mips__) ++ // mips apparently only allows rdtsc for superusers, so we fall ++ // back to gettimeofday. It's possible clock_gettime would be better. ++ struct timeval tv; ++ gettimeofday(&tv, nullptr); ++ return (uint64_t)tv.tv_sec * 1000000 + tv.tv_usec; + #else + #error No timer implementation for this platform + #endif diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch new file mode 100644 index 000000000..bc40f1b1e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch @@ -0,0 +1,28 @@ +implement support for musl/ppc64 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h ++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +@@ -58,7 +58,7 @@ Copyright (c) 2006, 2015, Percona and/or + #include <stdint.h> + #include <sys/time.h> + #include <time.h> +-#if defined(__powerpc__) ++#if defined(__powerpc__) && defined(__GLIBC__) + #include <sys/platform/ppc.h> + #endif + +@@ -131,8 +131,12 @@ static inline tokutime_t toku_time_now(v + uint64_t result; + __asm __volatile__("mrs %[rt], cntvct_el0" : [ rt ] "=r"(result)); + return result; +-#elif defined(__powerpc__) ++#elif defined(__powerpc__) && defined(__GLIBC__) + return __ppc_get_timebase(); ++#elif defined(__powerpc64__) || defined(__ppc64__) ++ uint64_t result; ++ asm volatile("mfspr %0, 268" : "=r"(result)); ++ return result; + #elif defined(__riscv) // RISC-V + #if __riscv_xlen == 32 + uint32_t lo, hi0, hi1; diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.15.5.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb index acef05b01..c89d5d431 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.15.5.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb @@ -6,15 +6,24 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "abd4b1ff1504ae2a7ed6e60bc9c9797b880c33a5" -SRCBRANCH = "6.15.fb" +SRCREV = "8608d75d85f8e1b3b64b73a4fb6d19baec61ba5c" +SRCBRANCH = "6.20.fb" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ file://0001-cmake-Add-check-for-atomic-support.patch \ file://0001-cmake-Use-exported-target-for-bz2.patch \ file://0001-folly-Use-SYS_futex-for-syscall.patch \ + file://0001-jemalloc_helper-Limit-the-mm_malloc.h-hack-to-glibc-.patch \ + file://0001-range_tree-Implement-toku_time_now-for-rv32-rv64-in-.patch \ + file://ppc64.patch \ + file://mips.patch \ + file://arm.patch \ " +SRC_URI_append_riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" +SRC_URI_append_mips = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" +SRC_URI_remove_toolchain-clang_riscv32 = "file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" + S = "${WORKDIR}/git" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch index 52d4f42d5..126b79261 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch @@ -1,6 +1,6 @@ -From a9831f1cbf93fb18dd951453635f488037454ce9 Mon Sep 17 00:00:00 2001 -From: Abseil Team <absl-team@google.com> -Date: Mon, 3 May 2021 07:37:39 -0700 +From c9250af98f48e4aa734cab0e2f5ae1f780c05ad0 Mon Sep 17 00:00:00 2001 +From: Zang Ruochen <zangrc.fnst@fujitsu.com> +Date: Fri, 11 Jun 2021 10:53:37 +0900 Subject: [PATCH] Export of internal Abseil changes -- @@ -27,15 +27,16 @@ Cmake builds should only install pkg-config when explicitly requested. PiperOrigin-RevId: 371403419 GitOrigin-RevId: cf88f9cf40eab54c06bca7f20795352ec23bb583 Change-Id: I4360a18c638a4d901ff44ab1e0a9d8f321c302ea + +Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com> --- CMake/AbseilHelpers.cmake | 3 ++- - absl/debugging/failure_signal_handler.cc | 3 ++- absl/strings/internal/str_format/arg.h | 8 ++++++++ absl/strings/internal/str_format/convert_test.cc | 3 +++ - 4 files changed, 15 insertions(+), 2 deletions(-) + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake -index 1f754392..1a80b5b4 100644 +index 54fb8df3..a32b94d5 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake @@ -141,7 +141,8 @@ function(absl_cc_library) @@ -48,20 +49,6 @@ index 1f754392..1a80b5b4 100644 if(NOT ABSL_CC_LIB_TESTONLY) if(absl_VERSION) set(PC_VERSION "${absl_VERSION}") -diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc -index e458a795..689e5979 100644 ---- a/absl/debugging/failure_signal_handler.cc -+++ b/absl/debugging/failure_signal_handler.cc -@@ -136,7 +136,8 @@ static bool SetupAlternateStackOnce() { - #else - const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; - #endif -- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; -+ size_t stack_size = -+ (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask; - #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ - defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) - // Account for sanitizer instrumentation requiring additional stack space. diff --git a/absl/strings/internal/str_format/arg.h b/absl/strings/internal/str_format/arg.h index 7040c866..3c91be70 100644 --- a/absl/strings/internal/str_format/arg.h @@ -96,5 +83,5 @@ index 926283cf..91e03609 100644 TEST_F(FormatConvertTest, NullString) { -- -2.31.1 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index 01dd9f550..3f89df558 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -7,8 +7,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" -PV = "20210324+git${SRCPV}" -SRCREV = "e1d388e7e74803050423d035e4374131b9b57919" +PV = "20210324.2+git${SRCPV}" +SRCREV = "278e0a071885a22dcd2fd1b5576cc44757299343" BRANCH = "lts_2021_03_24" SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ file://0001-absl-always-use-asm-sgidefs.h.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb index 616d56daa..e42b891d4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb @@ -5,9 +5,9 @@ LICENSE = "MIT & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \ file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" -SRCREV = "03e4e9d2cab4f1a61d3f589785641a73dff027c5" -SRC_URI = "git://github.com/${BPN}/${BPN}.git \ - file://0001-libbacktrace-include-config.h.patch \ +SRCREV = "9d42f667e2a36a6624d92b9bd697de097cc4e619" +PV .= "+10.0.1+git${SRCPV}" +SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210502.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210711.0.bb index 273d6e573..4be634b38 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210502.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210711.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "6df08b82d4845d1b9420d9268f24d5db16ee4480" +SRCREV = "c81079788bfe650190db8ac9df80d63d2bc160aa" SRC_URI = "git://github.com/universal-ctags/ctags" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch new file mode 100644 index 000000000..2a5f23316 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch @@ -0,0 +1,33 @@ +From e735fb23f46f0c3c7a1144ba6b4050bfc0015a05 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 2 Jun 2021 13:34:35 +0800 +Subject: [PATCH] do not hardcode the full path of dpkg + +While calling debootstrap in sdk, if host does not install dpkg package, +the full path calling will fail + +Do not hardcode the full path of dpkg, then then sdk's dpkg will be used. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + debootstrap | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/debootstrap b/debootstrap +index a3cf3af..5e96c3e 100755 +--- a/debootstrap ++++ b/debootstrap +@@ -538,7 +538,7 @@ fi + + if in_path dpkg && \ + dpkg --print-architecture >/dev/null 2>&1; then +- HOST_ARCH=$(/usr/bin/dpkg --print-architecture) ++ HOST_ARCH=$(dpkg --print-architecture) + elif in_path udpkg && \ + udpkg --print-architecture >/dev/null 2>&1; then + HOST_ARCH=$(/usr/bin/udpkg --print-architecture) +-- +2.27.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.124.bb b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.124.bb index 300c98f91..4fc59adfb 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.124.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.124.bb @@ -8,6 +8,7 @@ SRC_URI = "\ http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_${PV}.tar.gz \ file://0001-support-to-override-usr-sbin-and-usr-share.patch \ file://0002-support-to-override-usr-bin-arch-test.patch \ + file://0001-do-not-hardcode-the-full-path-of-dpkg.patch \ " SRC_URI[md5sum] = "8a5e97f60236c3a63f715c056a5f0e29" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.38.0.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.38.1.bb index 2095d81d4..10004b236 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.38.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.38.1.bb @@ -16,7 +16,7 @@ RDEPENDS_${PN}-compiler = "${PN}" RDEPENDS_${PN}-dev += "${PN}-compiler" S = "${WORKDIR}/git" -SRCREV_grpc = "54dc182082db941aa67c7c3f93ad858c99a16d7d" +SRCREV_grpc = "96b73272eadc01afb5fb45b92b408c47e4387274" BRANCH = "v1.38.x" SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch new file mode 100644 index 000000000..f83e0a273 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch @@ -0,0 +1,50 @@ +From ed8dbe1c793f2f770fef61adc4390277f903cceb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 9 Jul 2021 01:32:42 -0700 +Subject: [PATCH] mips: Use hardcodes values for ABI syscall bases + +mips kernels 5.13+ have stopped exposing the UAPIs which provided these +defines, the values are more or less static so just use the hardcoded +values for now. Use __NR_syscalls to get number of syscalls supported +and include asm-generic/unistd.h to get this definition + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sysdeps/linux-gnu/mips/trace.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/sysdeps/linux-gnu/mips/trace.c b/sysdeps/linux-gnu/mips/trace.c +index d54818e..e72184d 100644 +--- a/sysdeps/linux-gnu/mips/trace.c ++++ b/sysdeps/linux-gnu/mips/trace.c +@@ -33,6 +33,7 @@ + #include <asm/unistd.h> + #include <assert.h> + #include <asm/unistd.h> ++#include <asm-generic/unistd.h> + + #include "backend.h" + #include "common.h" +@@ -135,12 +136,12 @@ syscall_p(struct process *proc, int status, int *sysnum) + int min_syscall, max_syscall, sigreturn, rt_sigreturn; + struct callstack_element *top = NULL; + int depth = proc->callstack_depth; +- const int syscallbase[] = {__NR_O32_Linux, __NR_N32_Linux, +- __NR_64_Linux, __NR_O32_Linux}; +- const int syscallnum[] = {__NR_O32_Linux_syscalls, +- __NR_N32_Linux_syscalls, +- __NR_64_Linux_syscalls, +- __NR_O32_Linux_syscalls}; ++ const int syscallbase[] = {4000, 6000, ++ 5000, 4000}; ++ const int syscallnum[] = {__NR_syscalls, ++ __NR_syscalls, ++ __NR_syscalls, ++ __NR_syscalls}; + const int rt_sigreturn_list[] = {193, 211, 211, 193}; + const int sigreturn_list[] = {119, -1, -1, 119}; + +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-Remove-unused-host_powerpc64-function.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-Remove-unused-host_powerpc64-function.patch new file mode 100644 index 000000000..39e1f77a0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-Remove-unused-host_powerpc64-function.patch @@ -0,0 +1,37 @@ +From 4517bf59838f40eb6e3f46e39adb5e5090c59df8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Jun 2021 18:14:36 -0700 +Subject: [PATCH] ppc: Remove unused host_powerpc64 function + +This function is dead code, remove it which avoids compiler warnings +with clang + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sysdeps/linux-gnu/ppc/plt.c | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/sysdeps/linux-gnu/ppc/plt.c b/sysdeps/linux-gnu/ppc/plt.c +index 5f81889..9d1838b 100644 +--- a/sysdeps/linux-gnu/ppc/plt.c ++++ b/sysdeps/linux-gnu/ppc/plt.c +@@ -142,16 +142,6 @@ + #define PPC64_PLT_STUB_SIZE 4 + #endif + +-static inline int +-host_powerpc64() +-{ +-#ifdef __powerpc64__ +- return 1; +-#else +- return 0; +-#endif +-} +- + static void + mark_as_resolved(struct library_symbol *libsym, GElf_Addr value) + { +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch deleted file mode 100644 index e4490bbb9..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch +++ /dev/null @@ -1,30 +0,0 @@ -kernel headers have restructured mips syscall generation in kernel -in recent versions, however, ltrace still has logic to define the -syscall numbers based on old logic, this patch includes the legacy -UAPI headers to get these defines - -Fixes errors e.g. -../../../../git/sysdeps/linux-gnu/mips/trace.c:138:29: error: '__NR_O32_Linux' undeclared (first use in this function) - const int syscallbase[] = {__NR_O32_Linux, __NR_N32_Linux, - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/sysdeps/linux-gnu/mips/trace.c -+++ b/sysdeps/linux-gnu/mips/trace.c -@@ -34,6 +34,16 @@ - #include <assert.h> - #include <asm/unistd.h> - -+#ifndef __NR_O32_Linux -+#include <asm/unistd_nr_o32.h> -+#endif -+#ifndef __NR_N32_Linux -+#include <asm/unistd_nr_n64.h> -+#endif -+#ifndef __NR_N64_Linux -+#include <asm/unistd_nr_n32.h> -+#endif -+ - #include "backend.h" - #include "common.h" - #include "debug.h" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 17264cef5..69dce851f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -26,9 +26,10 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http file://0001-mips-plt.c-Delete-include-error.h.patch \ file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \ file://0001-hook-Do-not-append-int-to-std-string.patch \ - file://include_unistd_nr.patch \ file://0001-Bug-fix-for-data-type-length-judgment.patch \ file://0001-ensure-the-struct-pointers-are-null-initilized.patch \ + file://0001-ppc-Remove-unused-host_powerpc64-function.patch \ + file://0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch \ " SRC_URI_append_libc-musl = " file://add_ppc64le.patch" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.2.bb b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.2.bb index 0ee02d685..20df3620d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.2.bb @@ -31,7 +31,8 @@ PACKAGECONFIG += " \ " PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" -LDFLAGS_append_x86-64 = " -lgcc" +LDFLAGS_append_libc-glibc_x86-64 = " -lgcc" +LDFLAGS_append_libc-glibc_x86 = " -lgcc" inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch new file mode 100644 index 000000000..00b2e9baa --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch @@ -0,0 +1,28 @@ +From 0976af0f3b328436ea44a74a406f311adb2ab211 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Jun 2021 19:01:31 -0700 +Subject: [PATCH] ppc64: Do not use -mminimal-toc with clang + +clang does not support this option + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + common.gypi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common.gypi b/common.gypi +index ee91fb1d..049c8f8c 100644 +--- a/common.gypi ++++ b/common.gypi +@@ -413,7 +413,7 @@ + 'ldflags': [ '-m32' ], + }], + [ 'target_arch=="ppc64" and OS!="aix"', { +- 'cflags': [ '-m64', '-mminimal-toc' ], ++ 'cflags': [ '-m64' ], + 'ldflags': [ '-m64' ], + }], + [ 'target_arch=="s390x"', { +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/v8-call-new-ListFormatter-createInstance.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/v8-call-new-ListFormatter-createInstance.patch deleted file mode 100644 index 806360084..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/v8-call-new-ListFormatter-createInstance.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 035c305ce7761f51328b45f1bd83e26aef267c9d Mon Sep 17 00:00:00 2001 -From: Frank Tang <ftang@chromium.org> -Date: Thu, 15 Oct 2020 22:44:27 -0700 -Subject: [PATCH] [Intl] call new ListFormatter::createInstance - -The one we currently using is now marked as internal and to be removed -for 68. Migrating to the style which already avaiable in ICU 67-1. - -Upstream-Status: Backport -Bug: v8:11031 -Change-Id: I668382a2e1b8602ddca02bf231c5008a6c92bf2d -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477751 -Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> -Commit-Queue: Frank Tang <ftang@chromium.org> -Cr-Commit-Position: refs/heads/master@{#70638} ---- - deps/v8/src/objects/js-list-format.cc | 55 ++++++++++++----------------------- - 1 file changed, 18 insertions(+), 37 deletions(-) - ---- a/deps/v8/src/objects/js-list-format.cc -+++ b/deps/v8/src/objects/js-list-format.cc -@@ -29,46 +29,27 @@ namespace v8 { - namespace internal { - - namespace { --const char* kStandard = "standard"; --const char* kOr = "or"; --const char* kUnit = "unit"; --const char* kStandardShort = "standard-short"; --const char* kOrShort = "or-short"; --const char* kUnitShort = "unit-short"; --const char* kStandardNarrow = "standard-narrow"; --const char* kOrNarrow = "or-narrow"; --const char* kUnitNarrow = "unit-narrow"; - --const char* GetIcuStyleString(JSListFormat::Style style, -- JSListFormat::Type type) { -+UListFormatterWidth GetIcuWidth(JSListFormat::Style style) { -+ switch (style) { -+ case JSListFormat::Style::LONG: -+ return ULISTFMT_WIDTH_WIDE; -+ case JSListFormat::Style::SHORT: -+ return ULISTFMT_WIDTH_SHORT; -+ case JSListFormat::Style::NARROW: -+ return ULISTFMT_WIDTH_NARROW; -+ } -+ UNREACHABLE(); -+} -+ -+UListFormatterType GetIcuType(JSListFormat::Type type) { - switch (type) { - case JSListFormat::Type::CONJUNCTION: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kStandard; -- case JSListFormat::Style::SHORT: -- return kStandardShort; -- case JSListFormat::Style::NARROW: -- return kStandardNarrow; -- } -+ return ULISTFMT_TYPE_AND; - case JSListFormat::Type::DISJUNCTION: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kOr; -- case JSListFormat::Style::SHORT: -- return kOrShort; -- case JSListFormat::Style::NARROW: -- return kOrNarrow; -- } -+ return ULISTFMT_TYPE_OR; - case JSListFormat::Type::UNIT: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kUnit; -- case JSListFormat::Style::SHORT: -- return kUnitShort; -- case JSListFormat::Style::NARROW: -- return kUnitNarrow; -- } -+ return ULISTFMT_TYPE_UNITS; - } - UNREACHABLE(); - } -@@ -143,7 +124,7 @@ MaybeHandle<JSListFormat> JSListFormat:: - icu::Locale icu_locale = r.icu_locale; - UErrorCode status = U_ZERO_ERROR; - icu::ListFormatter* formatter = icu::ListFormatter::createInstance( -- icu_locale, GetIcuStyleString(style_enum, type_enum), status); -+ icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status); - if (U_FAILURE(status) || formatter == nullptr) { - delete formatter; - THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError), diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_14.16.1.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb index 48bf2f4a8..5ac4f9dc7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_14.16.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & BSD & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=85bf260d8b6de1588f57abc5dc66587c" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a1016f9b7979cfe6fc3466a9bba60b1e" DEPENDS = "openssl" DEPENDS_append_class-target = " qemu-native" @@ -21,7 +21,6 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0004-v8-don-t-override-ARM-CFLAGS.patch \ file://big-endian.patch \ file://mips-warnings.patch \ - file://v8-call-new-ListFormatter-createInstance.patch \ file://mips-less-memory.patch \ " SRC_URI_append_class-target = " \ @@ -30,7 +29,10 @@ SRC_URI_append_class-target = " \ SRC_URI_append_toolchain-clang_x86 = " \ file://libatomic.patch \ " -SRC_URI[sha256sum] = "e44adbbed6756c2c1a01258383e9f00df30c147b36e438f6369b5ef1069abac3" +SRC_URI_append_toolchain-clang_powerpc64le = " \ + file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ + " +SRC_URI[sha256sum] = "ddf1d2d56ddf35ecd98c5ea5ddcd690b245899f289559b4330c921255f5a247f" S = "${WORKDIR}/node-v${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb new file mode 100644 index 000000000..27a7f9da7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb @@ -0,0 +1,21 @@ +SUMMARY = "Perl extension for generating and using LALR parsers" +DESCRIPTION = "Parse::Yapp (Yet Another Perl Parser compiler) is a collection \ +of modules that let you generate and use yacc like thread safe (reentrant) parsers \ +with perl object oriented interface." + +HOMEPAGE = "http://search.cpan.org/dist/Parse-Yapp/" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" + +LIC_FILES_CHKSUM = "file://lib/Parse/Yapp.pm;beginline=508;endline=521;md5=41a4542fcde97a600c9de0d782a90256" + +SRC_URI = "https://www.cpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-${PV}.tar.gz" + +SRC_URI[md5sum] = "69584d5b0f0304bb2a23cffcd982c5de" +SRC_URI[sha256sum] = "3810e998308fba2e0f4f26043035032b027ce51ce5c8a52a8b8e340ca65f13e5" + +S = "${WORKDIR}/Parse-Yapp-${PV}" + +inherit cpan + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.0.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.3.bb index 81af2d50f..6ad3bdb3b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.3.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "652d99a8ee8aa6b801e11977951fbf444cfccc8f" +SRCREV = "909a0f36a10075c4b4bc70fdee2c7e32dd612a72" SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ file://run-ptest \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb index 5b5c8b257..ac803294e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/git" inherit cmake -EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" +EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF" # RapidJSON is a header-only C++ library, so the main package will be empty. diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb index 9ccf2d0bf..b92f63b26 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb @@ -1,15 +1,11 @@ LICENSE = "GPLv2 & GPLv3 & BSD-3-Clause & LGPL-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f9f2b9d61cb769a67c4cd079e1166de7" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5fa987762101f748a6cdd951b64ffc6b" SRC_URI = "git://github.com/DrTimothyAldenDavis/SuiteSparse;protocol=https \ file://0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch \ file://0002-Preserve-links-when-installing-libmetis.patch \ file://0003-Add-version-information-to-libmetis.patch \ " - -SRC_URI[md5sum] = "c414679bbc9432a3def01b31ad921140" -SRC_URI[sha256sum] = "06726e471fbaa55f792578f9b4ab282ea9d008cf39ddcc3b42b73400acddef40" - -SRCREV = "v${PV}" +SRCREV = "538273cfd53720a10e34a3d80d3779b607e1ac26" S = "${WORKDIR}/git" @@ -77,4 +73,3 @@ FILES_${PN}-staticdev += "${libdir}/libmongoose.a" FILES_${PN}-dev += "${includedir} ${libdir}/*.so" EXCLUDE_FROM_WORLD = "1" - diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch new file mode 100644 index 000000000..fe40334b6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch @@ -0,0 +1,43 @@ +Origin: https://github.com/GENIVI/dlt-daemon/pull/317 +From 55d31216823841a1547fe261cdf8e3b1002d5f94 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Thu, 1 Jul 2021 12:58:20 +0200 +Subject: [PATCH] dlt-control-common.c: Fix build failure due to out-of-bound + write -Werror=stringop-truncation + +cd /build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/src/console/logstorage && /usr/bin/cc -DCONFIGURATION_FILES_DIR=\"/etc\" -DDLT_DAEMON_USE_FIFO_IPC -DDLT_LIB_USE_FIFO_IPC -DDLT_NETWORK_TRACE_ENABLE -DDLT_SYSTEMD_ENABLE -DDLT_SYSTEMD_JOURNAL_ENABLE -DDLT_UNIT_TESTS -DDLT_USER_IPC_PATH=\"/tmp\" -DDLT_USE_IPv6 -DEXTENDED_FILTERING -D_GNU_SOURCE -I/build/dlt-daemon-2.18.7 -I/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/include/dlt -I/build/dlt-daemon-2.18.7/include/dlt -I/build/dlt-daemon-2.18.7/src/shared -I/build/dlt-daemon-2.18.7/src/core_dump_handler -I/build/dlt-daemon-2.18.7/src/offlinelogstorage -I/build/dlt-daemon-2.18.7/src/lib -I/build/dlt-daemon-2.18.7/src/daemon -I/build/dlt-daemon-2.18.7/src/console -I/build/dlt-daemon-2.18.7/src/gateway -I/build/dlt-daemon-2.18.7/systemd/3rdparty -g -O2 -ffile-prefix-map=/build/dlt-daemon-2.18.7=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Werror -std=gnu99 -Wall -Wextra -Wno-variadic-macros -Wno-strict-aliasing -o CMakeFiles/dlt-logstorage-ctrl.dir/__/dlt-control-common.c.o -c /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c +make[3]: Leaving directory '/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu' +In file included from /usr/include/string.h:495, + from /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:56: +In function 'strncpy', + inlined from 'dlt_json_filter_load' at /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:716:13: +/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: '__builtin_strncpy' specified bound 4 equals destination size [-Werror=stringop-truncation] + 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In function 'strncpy', + inlined from 'dlt_json_filter_load' at /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:721:13: +/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: '__builtin_strncpy' specified bound 4 equals destination size [-Werror=stringop-truncation] + 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org> +--- + src/console/dlt-control-common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/console/dlt-control-common.c b/src/console/dlt-control-common.c +index 8a9d29f0..f58d8268 100644 +--- a/src/console/dlt-control-common.c ++++ b/src/console/dlt-control-common.c +@@ -671,8 +671,8 @@ DltReturnValue dlt_json_filter_load(DltFilter *filter, const char *filename, int + struct json_object *j_payload_max; + enum json_tokener_error jerr; + +- char app_id[DLT_ID_SIZE] = ""; +- char context_id[DLT_ID_SIZE] = ""; ++ char app_id[DLT_ID_SIZE + 1] = ""; ++ char context_id[DLT_ID_SIZE + 1] = ""; + int32_t log_level = 0; + int32_t payload_max = INT32_MAX; + int32_t payload_min = 0; diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb index b3cfb4709..a16e810be 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb @@ -12,13 +12,14 @@ SECTION = "console/utils" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" -DEPENDS = "zlib gzip-native" +DEPENDS = "zlib gzip-native json-c" SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ + file://317.patch \ " -SRCREV = "22715aeceaa81ace2c832312529bde3a42d0814f" +SRCREV = "24d197214bfdcec7430d31b42e5c87df27287aaf" S = "${WORKDIR}/git" @@ -44,7 +45,7 @@ PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt- inherit autotools gettext cmake systemd -EXTRA_OECMAKE += "-DSYSTEMD_UNITDIR=${systemd_system_unitdir}" +EXTRA_OECMAKE += "-DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}" PACKAGES += "${PN}-systemd" SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch b/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch new file mode 100644 index 000000000..139d13f4c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch @@ -0,0 +1,117 @@ +From 2dc0c7e4a3fa7ecc92ee5e22f1d8ee48c2b333a8 Mon Sep 17 00:00:00 2001 +From: Thomas Lee <debian@tomlee.co> +Date: Sun, 4 Nov 2018 22:59:09 +0000 +Subject: [PATCH] CMake configuration for hiredis + +Last-Update: 2018-09-26 + +Upstream-Status: Backport [Ubuntu 20.04] +--- + HiredisConfig.cmake.in | 5 +++++ + HiredisConfigVersion.cmake.in | 22 ++++++++++++++++++++++ + Makefile | 17 ++++++++++++++++- + 3 files changed, 43 insertions(+), 1 deletion(-) + create mode 100644 HiredisConfig.cmake.in + create mode 100644 HiredisConfigVersion.cmake.in + +diff --git a/HiredisConfig.cmake.in b/HiredisConfig.cmake.in +new file mode 100644 +index 0000000..2cce290 +--- /dev/null ++++ b/HiredisConfig.cmake.in +@@ -0,0 +1,5 @@ ++find_path(HIREDIS_INCLUDE_DIRS hiredis/hiredis.h HINTS "/usr/include") ++find_library(HIREDIS_LIB_HIREDIS NAMES hiredis HINTS "/usr/lib") ++ ++set(HIREDIS_LIBRARIES ${HIREDIS_LIB_HIREDIS}) ++ +diff --git a/HiredisConfigVersion.cmake.in b/HiredisConfigVersion.cmake.in +new file mode 100644 +index 0000000..584144a +--- /dev/null ++++ b/HiredisConfigVersion.cmake.in +@@ -0,0 +1,22 @@ ++set(PACKAGE_VERSION "@HIREDIS_VERSION@") ++ ++string(REPLACE "." ";" HIREDIS_VERSION_COMPONENTS ${PACKAGE_VERSION}) ++string(REPLACE "." ";" REQUESTED_VERSION_COMPONENTS ${PACKAGE_FIND_VERSION}) ++ ++list(GET HIREDIS_VERSION_COMPONENTS 0 HIREDIS_VERSION_MAJOR) ++list(GET HIREDIS_VERSION_COMPONENTS 1 HIREDIS_VERSION_MINOR) ++ ++list(GET REQUESTED_VERSION_COMPONENTS 0 REQUESTED_VERSION_MAJOR) ++list(GET REQUESTED_VERSION_COMPONENTS 1 REQUESTED_VERSION_MINOR) ++ ++if(("${HIREDIS_VERSION_MAJOR}" EQUAL "${REQUESTED_VERSION_MAJOR}") AND ++ (("${HIREDIS_VERSION_MINOR}" EQUAL "${REQUESTED_VERSION_MINOR}") OR ++ ("${HIREDIS_VERSION_MINOR}" GREATER "${REQUESTED_VERSION_MINOR}"))) ++ set(PACKAGE_VERSION_COMPATIBLE TRUE) ++ if("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") ++ set(PACKAGE_VERSION_EXACT TRUE) ++ endif() ++else() ++ set(PACKAGE_VERSION_COMPATIBLE FALSE) ++endif() ++ +diff --git a/Makefile b/Makefile +index 339727f..43704cd 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,6 +8,8 @@ EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis- + TESTS=hiredis-test + LIBNAME=libhiredis + PKGCONFNAME=hiredis.pc ++CMAKECONFNAME=HiredisConfig.cmake ++CMAKEVERSNAME=HiredisConfigVersion.cmake + + HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}') + HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}') +@@ -19,9 +21,11 @@ PREFIX?=/usr/local + INCLUDE_PATH?=include/hiredis + LIBRARY_PATH?=lib + PKGCONF_PATH?=pkgconfig ++CMAKE_PATH?=cmake/Hiredis + INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH) + INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH) + INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH) ++INSTALL_CMAKE_PATH= $(INSTALL_LIBRARY_PATH)/$(CMAKE_PATH) + + # redis-server configuration used for testing + REDIS_PORT=56379 +@@ -150,6 +154,7 @@ check: hiredis-test + + clean: + rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov ++ rm -f $(CMAKECONFNAME) $(CMAKEVERSNAME) + + dep: + $(CC) -MM *.c +@@ -169,7 +174,14 @@ $(PKGCONFNAME): hiredis.h + @echo Libs: -L\$${libdir} -lhiredis >> $@ + @echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@ + +-install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) ++$(CMAKECONFNAME): $(CMAKECONFNAME).in ++ cp $(CMAKECONFNAME).in $(CMAKECONFNAME) ++ ++$(CMAKEVERSNAME): $(CMAKEVERSNAME).in ++ sed -e "s,@HIREDIS_VERSION@,$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH),g" \ ++ $(CMAKEVERSNAME).in >$(CMAKEVERSNAME) ++ ++install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) $(CMAKECONFNAME) $(CMAKEVERSNAME) + mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters $(INSTALL_LIBRARY_PATH) + $(INSTALL) hiredis.h async.h read.h sds.h $(INSTALL_INCLUDE_PATH) + $(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters +@@ -178,6 +190,9 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) + $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH) + mkdir -p $(INSTALL_PKGCONF_PATH) + $(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH) ++ mkdir -p $(INSTALL_CMAKE_PATH) ++ $(INSTALL) $(CMAKECONFNAME) $(INSTALL_CMAKE_PATH) ++ $(INSTALL) $(CMAKEVERSNAME) $(INSTALL_CMAKE_PATH) + + 32bit: + @echo "" +-- +2.27.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb index 29f8de8d2..a41888802 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb @@ -7,7 +7,8 @@ DEPENDS = "redis" LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" SRCREV = "685030652cd98c5414ce554ff5b356dfe8437870" SRC_URI = "git://github.com/redis/hiredis;protocol=git \ - file://0001-Makefile-remove-hardcoding-of-CC.patch" + file://0001-Makefile-remove-hardcoding-of-CC.patch \ + file://0001-CMake-configuration-for-hiredis.patch" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.3.3.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.6.0.bb index abc3e098c..90c0d244f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.3.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.6.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b" SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.lz \ file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \ " -SRC_URI[sha256sum] = "4162565cf7566d78d786e4ecf4b0639451b8464bcb24e761b1f08ef43e95e513" +SRC_URI[sha256sum] = "33cc69ba1fb762d85cc2755a930d6cf1a7c23e33f736ef2ec01c59d612f9b2eb" UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-Remove-dead-paren_level-code.patch b/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-Remove-dead-paren_level-code.patch new file mode 100644 index 000000000..5a474cf0f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-Remove-dead-paren_level-code.patch @@ -0,0 +1,79 @@ +From 5af65ce9674a69054c9a8405e51794c6f3ca41df Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 4 Jun 2021 12:34:18 -0700 +Subject: [PATCH] Remove dead paren_level code + +Local variable `paren_level' in src/output.c:dump_line_code() is +initialized to 0, then incremented with count_parens() return +value, and then the variable is never used. Also count_parens() +has no side effect. Thus this patch removes this useless code. + +Upstream-Status: Submitted [https://mail.gnu.org/archive/html/bug-indent/2011-04/msg00000.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/output.c | 35 ----------------------------------- + 1 file changed, 35 deletions(-) + +diff --git a/src/output.c b/src/output.c +index ee01bcc..5b92167 100644 +--- a/src/output.c ++++ b/src/output.c +@@ -798,37 +798,6 @@ static int dump_line_label(void) + return cur_col; + } + +-/** +- * +- */ +- +-static int count_parens( +- const char * string) +-{ +- int paren_level = 0; +- +- while (*string) +- { +- switch (*string) +- { +- case '(': +- case '[': +- paren_level++; +- break; +- case ')': +- case ']': +- paren_level--; +- break; +- default: +- break; +- } +- +- string++; +- } +- +- return paren_level; +-} +- + /** + * + */ +@@ -840,8 +809,6 @@ static void dump_line_code( + BOOLEAN * pbreak_line, + int target_col_break) + { +- int paren_level = 0; +- + if (s_code != e_code) + { /* print code section, if any */ + int i; +@@ -928,8 +895,6 @@ static void dump_line_code( + + *pcur_col = count_columns (*pcur_col, s_code, NULL_CHAR); + +- paren_level += count_parens(s_code); +- + s_code[buf_break->offset] = c; + + *pnot_truncated = 0; +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb b/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb index 90ba8a2e6..829bf0fc1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb @@ -16,6 +16,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-src-indent.c-correct-the-check-for-locale.h.patch \ file://0001-Makefile.am-remove-regression-dir.patch \ file://0001-Fix-builds-with-recent-gettext.patch \ + file://0001-Remove-dead-paren_level-code.patch \ " SRC_URI[md5sum] = "4764b6ac98f6654a35da117b8e5e8e14" SRC_URI[sha256sum] = "e77d68c0211515459b8812118d606812e300097cfac0b4e9fb3472664263bb8b" diff --git a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb index a4a258145..3d87e4481 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb @@ -14,8 +14,8 @@ UPSTREAM_CHECK_REGEX = "Version (?P<pver>\d+(\.\d+)+)" inherit autotools-brokensep pkgconfig -SRC_URI[md5sum] = "6bd98ee3a6e6b9126c82c916d7a9e690" -SRC_URI[sha256sum] = "7c3c7a9c73ff3302084386e96f903eb62ce06953bb1666235fac74363a16fad9" +SRC_URI[md5sum] = "15ec701205f91f21b1187f8b61e0d64f" +SRC_URI[sha256sum] = "545166d6cac037744381d1e9cc5a5405094e7bfad16a411699bcff40bbb31ee7" PACKAGE_BEFORE_PN = "${PN}++" FILES_${PN}++ = "${libdir}/${BPN}++*${SOLIBS}" diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang/libyang-skip-pcre2-config-add-stdint-h.patch b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang/libyang-skip-pcre2-config-add-stdint-h.patch new file mode 100644 index 000000000..e3b2d0e02 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang/libyang-skip-pcre2-config-add-stdint-h.patch @@ -0,0 +1,55 @@ +From c7f3e2a8fe530beec6103cb9071ccc41458879aa Mon Sep 17 00:00:00 2001 +From: Tony Tascioglu <tony.tascioglu@windriver.com> +Date: Mon, 21 Jun 2021 12:34:22 -0400 +Subject: [PATCH] libyang: fix initial build errors + +This patch addresses build errors seen when integrating libyang as a +recipe. + +The call to pcre2-config has been commented out. *-config calls are +being replaced by pkgconfig, and we want to avoid the binary config +calls. This call can safely be discarded since it is used to check +the version of libpcre2 on the system, and all recent YP builds meet +the minimum required version (v10.21). + +There is a missing include statement for stdint.h in utests.h which +causes build problems. stdint.h is required to be imported by cmocka.h +prior to the cmocka file. Adding the stdint allows it to build the +tests correctly + +Upstream-Status: Pending + +Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com> +--- + CMakeModules/FindPCRE2.cmake | 2 +- + tests/utests/utests.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeModules/FindPCRE2.cmake b/CMakeModules/FindPCRE2.cmake +index 8f60daa2..ad014f14 100644 +--- a/CMakeModules/FindPCRE2.cmake ++++ b/CMakeModules/FindPCRE2.cmake +@@ -12,7 +12,7 @@ FIND_PATH(PCRE2_INCLUDE_DIR pcre2.h) + FIND_LIBRARY(PCRE2_LIBRARY NAMES libpcre2.a pcre2-8) + + # Check required version +-execute_process(COMMAND pcre2-config --version OUTPUT_VARIABLE PCRE2_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) ++# execute_process(COMMAND pcre2-config --version OUTPUT_VARIABLE PCRE2_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) + + # Handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if all listed variables are TRUE. + INCLUDE(FindPackageHandleStandardArgs) +diff --git a/tests/utests/utests.h b/tests/utests/utests.h +index 5bea0459..a256120c 100644 +--- a/tests/utests/utests.h ++++ b/tests/utests/utests.h +@@ -23,6 +23,7 @@ + #include <stddef.h> + #include <stdlib.h> + ++#include <stdint.h> + #include <cmocka.h> + + #include <string.h> +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang/run-ptest b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang/run-ptest new file mode 100644 index 000000000..1c9f8f47f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang/run-ptest @@ -0,0 +1,46 @@ +#!/bin/sh +# Valid tests to run +tests="utest_binary \ + utest_bits \ + utest_common \ + utest_hash_table \ + utest_inet_types \ + utest_int8 \ + utest_json \ + utest_list \ + utest_merge \ + utest_metadata \ + utest_parser_yang \ + utest_parser_yin \ + utest_pattern \ + utest_printer_yang \ + utest_printer_yin \ + utest_range \ + utest_schema \ + utest_set \ + utest_string \ + utest_tree_data \ + utest_tree_schema_compile \ + utest_types \ + utest_xml \ + utest_xpath \ + utest_yang_types \ + utest_yanglib" + +# cd into right directory +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +# Run specified tests +for f in $tests +do + if test -e ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + else + echo "SKIP: $f" + fi +done diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb new file mode 100644 index 000000000..8e9e8cc02 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb @@ -0,0 +1,37 @@ +SUMMARY = "YANG data modeling language library" +DESCRIPTION = "libyang is a YANG data modelling language parser and toolkit written (and providing API) in C." +HOMEPAGE = "https://github.com/CESNET/libyang" +SECTION = "libs" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" + +SRCREV = "69d9fff65abb58beb0bb6aa9ecacd572ca1dfc56" + +SRC_URI = "git://github.com/CESNET/libyang.git \ + file://libyang-skip-pcre2-config-add-stdint-h.patch \ + file://run-ptest \ + " + +S = "${WORKDIR}/git" + +COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST_armv5 = "null" +COMPATIBLE_HOST_riscv64 = "null" + +# Main dependencies +inherit cmake pkgconfig lib_package binconfig-disabled ptest +DEPENDS = "libpcre2" +DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}" +BINCONFIG = "${bindir}/pcre2-config" + +# Ptest dependencies +RDEPENDS_${PN}-ptest += "valgrind" + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" +EXTRA_OECMAKE += " ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_BUILD_TESTS=ON', '', d)}" + +do_install_ptest () { + cp -fR ${B}/tests/ ${D}${PTEST_PATH}/ +} + diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.3.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.3.bb deleted file mode 100644 index e903de3da..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "libzip is a C library for reading, creating, and modifying zip archives." -HOMEPAGE = "https://libzip.org/" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=067e9870bba57e1ce20695c4d5672f30" - -DEPENDS = "zlib bzip2" - -PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" -PACKAGECONFIG[lzma] = "-DENABLE_LZMA=ON,-DENABLE_LZMA=OFF,xz" - -PACKAGECONFIG ?= "ssl lzma" - -inherit cmake - -SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" - -SRC_URI[sha256sum] = "a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb new file mode 100644 index 000000000..23ac76a2d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "libzip is a C library for reading, creating, and modifying zip archives." +HOMEPAGE = "https://libzip.org/" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=067e9870bba57e1ce20695c4d5672f30" + +DEPENDS = "zlib bzip2" + +PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" +PACKAGECONFIG[lzma] = "-DENABLE_LZMA=ON,-DENABLE_LZMA=OFF,xz" +PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF,gnutls nettle" +PACKAGECONFIG[zstd] = "-DENABLE_ZSTD=ON,-DENABLE_ZSTD=OFF,zstd" +PACKAGECONFIG[mbedtls] = "-DENABLE_MBEDTLS=ON,-DENABLE_MBEDTLS=OFF,mbedtls" +PACKAGECONFIG[examples] = "-DENABLE_EXAMPLES=ON,-DENABLE_EXAMPLES=OFF," +PACKAGECONFIG[tools] = "-DENABLE_TOOLS=ON,-DENABLE_TOOLS=OFF," +PACKAGECONFIG[tests] = "-DBUILD_REGRESS=ON,-DBUILD_REGRESS=OFF," + +PACKAGECONFIG ?= "ssl lzma tools examples" + +inherit cmake + +SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" + +SRC_URI[sha256sum] = "f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e" diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 86c149ba5..ef82a8fb0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -89,6 +89,7 @@ do_install() { install -d ${D}${MINIFI_BIN} install -d ${D}${MINIFI_HOME}/conf install -m 755 -d ${D}${localstatedir}/lib/minifi + install -m 755 -d ${D}${libexecdir}/minifi-python cp -a ${WORKDIR}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ cp -a ${WORKDIR}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/ @@ -102,6 +103,8 @@ do_install() { ${D}${MINIFI_HOME}/conf/minifi.properties sed -i 's|nifi.flow.configuration.file=.*|nifi.flow.configuration.file='${MINIFI_HOME}'/conf/config.yml|g' \ ${D}${MINIFI_HOME}/conf/minifi.properties + sed -i 's|nifi.python.processor.dir=.*|nifi.python.processor.dir=${libexecdir}/minifi-python|g' \ + ${D}${MINIFI_HOME}/conf/minifi.properties sed -i 's|export MINIFI_HOME=.*|export MINIFI_HOME='${MINIFI_HOME}'|g' ${D}${MINIFI_BIN}/minifi.sh sed -i 's|bin_dir=${MINIFI_HOME}/bin|bin_dir='${MINIFI_BIN}'|g' ${D}${MINIFI_BIN}/minifi.sh @@ -136,3 +139,5 @@ pkg_postinst_${PN}() { fi fi } + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.2.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.3.bb index c3505ab06..c735f6d8b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.3.bb @@ -25,7 +25,7 @@ SRC_URI = " \ gitsm://github.com/ostreedev/ostree;branch=main \ file://run-ptest \ " -SRCREV = "6a72674ec621a2282043c3a083fe1e45cd6a8761" +SRCREV = "38c14b374567f736533f7f515595208fe359819f" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.3.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.4.bb index 67ac974de..35f34a27d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.4.bb @@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "98ed7d532b5e9671f5df0825bb71f0f37483a16546364049384c63db8764512b" +SRC_URI[sha256sum] = "ba32c406a10fc2c09426e2be2787d74ff204eb3a2e496d87cff76a476b6ae16e" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2104.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb index 3f1ec91ab..37f391356 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2104.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb @@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "a0213c989bce297944901e1a85286b8b" -SRC_URI[sha256sum] = "710981c3c34f88d5d1fb55ecfc042aecad8af69414b2b1602b304f4dedbf9f43" +SRC_URI[md5sum] = "b90659d85dce1df0f6c69a79c4ef053a" +SRC_URI[sha256sum] = "faf45c25a2265c001739e8888b3652cf685eb3f35cd65d17d5c38fd44b9ddd81" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index eca8dfc7b..0278b5338 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -1,14 +1,19 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931" -SRCREV = "b31bce98d65f894aad6427bcf6f3f7822e261a59" +SRCREV = "beb4650660179963a8ed5b5cbf2085cc1b34f608" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https" + S = "${WORKDIR}/git" inherit module EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}" -PNBLACKLIST[can-isotp] ?= "Kernel module Needs forward porting to kernel 5.2+" +do_install_append() { + install -Dm 644 ${S}/include/uapi/linux/can/isotp.h ${D}${includedir}/linux/can/isotp.h +} + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb index 3b2b6a9da..36e7d1ef5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -6,9 +6,9 @@ DEPENDS = "libsocketcan" SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git" -SRCREV = "eb66451df280f95a9a12e78b151b8d867e1b78ed" +SRCREV = "e9dd86fa5c4e6ecdfc34e487634a32f19e5c4d63" -PV = "2020.12.0" +PV = "2021.06.0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb index f1b77070c..a626e3b20 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -15,6 +15,8 @@ JIT_mipsarchn64 = "" JIT_riscv64 = "" JIT_riscv32 = "" JIT_powerpc = "" +JIT_powerpc64le = "" +JIT_powerpc64 = "" DEPENDS += "libb64 lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp tbb jq openssl elfutils protobuf protobuf-native jq-native" RDEPENDS_${PN} = "bash" diff --git a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl/fixes.patch b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl/fixes.patch new file mode 100644 index 000000000..1ec4993a1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl/fixes.patch @@ -0,0 +1,115 @@ +Upstream-Status: Submitted [https://github.com/probonopd/zsync-curl/pull/41] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/src/configure.ac b/src/configure.ac +index 10de8c4..6488140 100644 +--- a/src/configure.ac ++++ b/src/configure.ac +@@ -9,7 +9,6 @@ AC_CONFIG_MACRO_DIR([autotools]) + AC_CANONICAL_HOST + + AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip foreign check-news -Woverride -Wobsolete -Wportability -Wsyntax -Wunsupported]) +-AM_MAINTAINER_MODE + + dnl --- Check for programs + AC_PROG_CC +@@ -23,6 +22,7 @@ AS_IF([test "x$enable_profile" = "xyes"], [ + ZS_CFLAGS="${ZS_CFLAGS} -pg" ]) + + dnl --- Header files, typedefs, structures, libraries ++AC_USE_SYSTEM_EXTENSIONS + AC_C_CONST + AC_HEADER_STDC + # string.h, memory.h, stdlib.h both included in the default header checks +@@ -55,10 +55,6 @@ case $host_os in + host_os_mingw32=yes + LIBS="${LIBS} -lwsock32" + ;; +- *) +- AC_DEFINE([_XOPEN_SOURCE], 600, [Enable POSIX extensions if present]) +- AC_DEFINE([_BSD_SOURCE],1, [Enable BSD extensions if present]) +- ;; + esac + AM_CONDITIONAL([MINGW32], test "x$host_os_mingw32" = "xyes") + +diff --git a/src/librcksum/Makefile.am b/src/librcksum/Makefile.am +index f4fce72..47754eb 100644 +--- a/src/librcksum/Makefile.am ++++ b/src/librcksum/Makefile.am +@@ -1,4 +1,4 @@ +- ++AM_CPPFLAGS = "-I$(top_srcdir)" + + noinst_LIBRARIES = librcksum.a + +diff --git a/src/librcksum/md4.h b/src/librcksum/md4.h +index e90603a..0ed7485 100644 +--- a/src/librcksum/md4.h ++++ b/src/librcksum/md4.h +@@ -18,11 +18,8 @@ + + #include "zsglobal.h" + +-#ifdef HAVE_INTTYPES_H +-#include <inttypes.h> +-#else ++#include <stdint.h> + #include <sys/types.h> +-#endif + + #define MD4_BLOCK_LENGTH 64 + #define MD4_DIGEST_LENGTH 16 +diff --git a/src/libzsync/Makefile.am b/src/libzsync/Makefile.am +index 0a6ae85..33a5951 100644 +--- a/src/libzsync/Makefile.am ++++ b/src/libzsync/Makefile.am +@@ -1,3 +1,4 @@ ++AM_CPPFLAGS = "-I$(top_srcdir)" + + noinst_LIBRARIES = libzsync.a + +diff --git a/src/libzsync/sha1.h b/src/libzsync/sha1.h +index 3946505..87f3794 100644 +--- a/src/libzsync/sha1.h ++++ b/src/libzsync/sha1.h +@@ -11,11 +11,8 @@ + + #include "config.h" + +-#ifdef HAVE_INTTYPES_H +-#include <inttypes.h> +-#else ++#include <stdint.h> + #include <sys/types.h> +-#endif + + #define SHA1_BLOCK_LENGTH 64 + #define SHA1_DIGEST_LENGTH 20 +diff --git a/src/libzsync/zmap.c b/src/libzsync/zmap.c +index f052dba..030b2a5 100644 +--- a/src/libzsync/zmap.c ++++ b/src/libzsync/zmap.c +@@ -28,9 +28,6 @@ + #include <string.h> + #include <sys/types.h> + #include <arpa/inet.h> +-#ifdef HAVE_INTTYPES_H +-#include <inttypes.h> +-#endif + + #ifdef WITH_DMALLOC + # include <dmalloc.h> +diff --git a/src/make.c b/src/make.c +index 191b527..ba7f3a9 100644 +--- a/src/make.c ++++ b/src/make.c +@@ -28,9 +28,6 @@ + #include <time.h> + + #include <arpa/inet.h> +-#ifdef HAVE_INTTYPES_H +-#include <inttypes.h> +-#endif + + #include <sys/types.h> + #include <sys/stat.h> diff --git a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl/make.patch b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl/make.patch new file mode 100644 index 000000000..ef19b5e85 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl/make.patch @@ -0,0 +1,50 @@ +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From 3b9d64cf3c33ad235ed444f8715732e509ab023f Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Wed, 9 Jun 2021 16:11:25 +0100 +Subject: [PATCH] Build zsyncmake + +No point having the zsync client without the server-side tool. + +Closes #42 +--- + .gitignore | 1 + + src/Makefile.am | 5 ++++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/.gitignore b/.gitignore +index 36f7bd8..728658e 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -22,3 +22,4 @@ src/librcksum/md4test + src/libzsync/sha1test + stamp-h1 + zsync_curl ++zsyncmake_curl +diff --git a/src/Makefile.am b/src/Makefile.am +index 5f8ff73..ffa2280 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -4,13 +4,16 @@ ACLOCAL_AMFLAGS = -I autotools + + SUBDIRS = librcksum zlib libzsync doc + +-bin_PROGRAMS = zsync_curl ++bin_PROGRAMS = zsync_curl zsyncmake_curl + + zsync_curl_SOURCES = client.c http.c http.h url.c url.h progress.c progress.h base64.c format_string.h zsglobal.h + zsync_curl_LDADD = libzsync/libzsync.a librcksum/librcksum.a zlib/libinflate.a $(LIBOBJS) + + EXTRA_zsync_curl_SOURCES = getaddrinfo.h + ++zsyncmake_curl_SOURCES = make.c makegz.c makegz.h format_string.h ++zsyncmake_curl_LDADD = libzsync/libzsync.a librcksum/librcksum.a zlib/libinflate.a zlib/libdeflate.a -lm ++ + # From "GNU autoconf, automake and libtool" Vaughan, Elliston, + # # Tromey and Taylor, publisher New Riders, p.134 + # # They made me do it! :-) +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb new file mode 100644 index 000000000..adb72d5de --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "File transfer tool optimised for large files (curl port)" +HOMEPAGE = "http://zsync.moria.org.uk/" +DEPENDS = "curl" + +LICENSE = "Artistic-2.0" +LIC_FILES_CHKSUM = "file://src/COPYING;md5=71c0ac4d86266533509aa0825b8d323c" + +SRC_URI = "git://github.com/probonopd/zsync-curl;protocol=https \ + file://fixes.patch \ + file://make.patch" +SRCREV = "00141c2806ccc4ddf2ff6263ee1612d19c0b713f" + +PV = "0.6.2+git${SRCPV}" + +inherit autotools + +S = "${WORKDIR}/git" +AUTOTOOLS_SCRIPT_PATH = "${S}/src" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb b/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb index 0e09c3a64..a3e8bbf49 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb @@ -7,13 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ DEPENDS = "atk glibmm" -inherit features_check gnomebase autotools pkgconfig +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "6194ac577f15567adfa3c923944c6651" -SRC_URI[archive.sha256sum] = "4c4cfc917fd42d3879ce997b463428d6982affa0fb660cafcc0bc2d9afcedd3a" +SRC_URI[archive.sha256sum] = "a0bb49765ceccc293ab2c6735ba100431807d384ffa14c2ebd30e07993fd2fa4" -EXTRA_OECONF = " --disable-documentation " +EXTRA_OEMESON = "-Dbuild-documentation=false" FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h index 714cb5aa9..a899ce0ad 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h +++ b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h @@ -3,3 +3,4 @@ #define ICONV_ISO_INT_FORMAT "iso-%u-%u" #define ICONV_ISO_STR_FORMAT "iso-%u-%s" #define ICONV_10646 "iso-10646" +#define ICONV_SHIFT_JIS "shift-jis" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb index 4ae13e7ef..e70b74789 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb @@ -2,15 +2,14 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DESCRIPTION = "Runtime libraries for parsing and creating MIME mail" SECTION = "libs" + DEPENDS = "glib-2.0 zlib" inherit gnomebase gobject-introspection SRC_URI += "file://iconv-detect.h \ file://nodolt.patch" - -SRC_URI[archive.md5sum] = "656548dc431004d1ebf95e5d0bb4b9c8" -SRC_URI[archive.sha256sum] = "abff194c7c4802fba2e233890d09dde8bf7170c3ad5e13000601c8d5b3c44717" +SRC_URI[archive.sha256sum] = "2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44" export ac_cv_have_iconv_detect_h="yes" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch deleted file mode 100644 index 46a691643..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 152d295a28567ac87b0e6db2e62c0d914b1d7ef9 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Tue, 23 Feb 2021 08:47:54 +0000 -Subject: [PATCH] meson.build: use relative path - -Fixes: -Fatal error: can't create -gdk/gdkmm/libgdkmm-3.0.so.1.1.0.p/_buildarea1_master-wr_build_Userspace_auto-usrmerge_standalone_usrmerge_next_210222_lxbuilds_Har12345_platform_up_intel-x86-64-standard-glibc-std_wrlinux_build_tmp-glibc_work_corei7-64-wrs-linux_gtkmm3_3.24.3-r0_gtkmm-3.24.3_untracked_gdk_gdkmm_timecoord.cc.o: File name too long - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtkmm/-/merge_requests/61] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - gdk/gdkmm/meson.build | 4 ++-- - gtk/gtkmm/meson.build | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gdk/gdkmm/meson.build b/gdk/gdkmm/meson.build -index afccaea..240ce4d 100644 ---- a/gdk/gdkmm/meson.build -+++ b/gdk/gdkmm/meson.build -@@ -200,9 +200,9 @@ else # not maintainer_mode - gdkmm_hg_ccg_basenames, - ) - -- built_cc_files = [ src_untracked_gdkmm / 'wrap_init.cc' ] -+ built_cc_files = [ '../..' / untracked_gdkmm / 'wrap_init.cc' ] - foreach file : gdkmm_used_hg_ccg_basenames -- built_cc_files += src_untracked_gdkmm / file + '.cc' -+ built_cc_files += '../..' / untracked_gdkmm / file + '.cc' - endforeach - - gdk_gen_sources = built_cc_files -diff --git a/gtk/gtkmm/meson.build b/gtk/gtkmm/meson.build -index ab96a22..cc0c050 100644 ---- a/gtk/gtkmm/meson.build -+++ b/gtk/gtkmm/meson.build -@@ -464,9 +464,9 @@ else # not maintainer_mode - gtkmm_hg_ccg_basenames, - ) - -- built_cc_files = [ src_untracked_gtkmm / 'wrap_init.cc' ] -+ built_cc_files = [ '../..' / untracked_gtkmm / 'wrap_init.cc' ] - foreach file : gtkmm_used_hg_ccg_basenames -- built_cc_files += src_untracked_gtkmm / file + '.cc' -+ built_cc_files += '../..' / untracked_gtkmm / file + '.cc' - endforeach - - gtk_gen_sources = built_cc_files --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb index 1648e37fa..2c5012cb2 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb @@ -16,10 +16,7 @@ inherit gnomebase features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += "file://0001-meson.build-use-relative-path.patch \ -" - -SRC_URI[archive.sha256sum] = "60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435" +SRC_URI[archive.sha256sum] = "856333de86689f6a81c123f2db15d85db9addc438bc3574c36f15736aeae22e6" EXTRA_OEMESON = "-Dbuild-demos=false" diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch b/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch index 25e851883..3a62fffe3 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch @@ -1,6 +1,6 @@ -From 5b83983b246cff440de4421696b6b5dd9072ed2d Mon Sep 17 00:00:00 2001 +From bd9b5060bc3b9581090d44f15b4e236566ea86a6 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 6 Feb 2021 11:36:23 -0800 +Date: Fri, 4 Jun 2021 12:57:57 -0700 Subject: [PATCH] Silence clang warnings Fixes @@ -12,15 +12,22 @@ glm/gtc/../ext/quaternion_common.inl:76:87: error: unused parameter 'k' [-Werror GLM_FUNC_QUALIFIER qua<T, Q> slerp(qua<T, Q> const& x, qua<T, Q> const& y, T a, S k) ^ +and + +test/gtx/gtx_fast_trigonometry.cpp:135:9: error: variable 'result' set but not used [-Werror,-Wunused-but-set-variable] +| float result = 0.f; +| ^ + Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/1055] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - glm/ext/quaternion_common.inl | 2 +- - glm/gtc/random.inl | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + glm/ext/quaternion_common.inl | 2 +- + glm/gtc/random.inl | 2 +- + test/gtx/gtx_fast_trigonometry.cpp | 30 ++++++++++++------------------ + 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/glm/ext/quaternion_common.inl b/glm/ext/quaternion_common.inl -index 0e4a3bb2..8f9dccef 100644 +index 0e4a3bb2..6f99f52d 100644 --- a/glm/ext/quaternion_common.inl +++ b/glm/ext/quaternion_common.inl @@ -104,7 +104,7 @@ namespace glm @@ -28,7 +35,7 @@ index 0e4a3bb2..8f9dccef 100644 // Graphics Gems III, page 96 T angle = acos(cosTheta); - T phi = angle + k * glm::pi<T>(); -+ T phi = angle + static_cast<float>(k) * glm::pi<T>(); ++ T phi = angle + static_cast<T>(k) * glm::pi<T>(); return (sin(angle - a * phi)* x + sin(a * phi) * z) / sin(angle); } } @@ -45,6 +52,114 @@ index 70485098..a4af2a06 100644 } }; +diff --git a/test/gtx/gtx_fast_trigonometry.cpp b/test/gtx/gtx_fast_trigonometry.cpp +index 8bf86ba0..ddaa708b 100644 +--- a/test/gtx/gtx_fast_trigonometry.cpp ++++ b/test/gtx/gtx_fast_trigonometry.cpp +@@ -19,15 +19,14 @@ namespace fastCos + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastCos(i); ++ glm::fastCos(i); + + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::cos(i); ++ glm::cos(i); + + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; +@@ -53,15 +52,14 @@ namespace fastSin + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastSin(i); ++ glm::fastSin(i); + + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::sin(i); ++ glm::sin(i); + + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; +@@ -79,15 +77,14 @@ namespace fastTan + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastTan(i); ++ glm::fastTan(i); + + const std::clock_t timestamp2 = std::clock(); + for (float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::tan(i); ++ glm::tan(i); + + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; +@@ -105,15 +102,14 @@ namespace fastAcos + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastAcos(i); ++ glm::fastAcos(i); + + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::acos(i); ++ glm::acos(i); + + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; +@@ -132,13 +128,12 @@ namespace fastAsin + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastAsin(i); ++ glm::fastAsin(i); + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::asin(i); ++ glm::asin(i); + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; + const std::clock_t time_default = timestamp3 - timestamp2; +@@ -155,13 +150,12 @@ namespace fastAtan + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastAtan(i); ++ glm::fastAtan(i); + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::atan(i); ++ glm::atan(i); + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; + const std::clock_t time_default = timestamp3 - timestamp2; -- -2.30.0 +2.31.1 diff --git a/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb index b44b03ce8..085aaae12 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" DEPENDS = "freetype " PROVIDES = "virtual/imlib2" PV = "1.7.1" -SRCREV = "v1.7.1" +SRCREV = "01424487e360383a039dc123bc2a345fe7ea2535" inherit autotools pkgconfig lib_package diff --git a/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.1.bb b/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.46.1.bb index 57d9ff982..f7e126e95 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.46.1.bb @@ -6,18 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ DEPENDS = "mm-common cairomm glibmm pango" -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" +GNOMEBASEBUILDCLASS = "meson" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.xz" -SRC_URI[md5sum] = "339c48dd92ebd3a9911b231708f7a819" -SRC_URI[sha256sum] = "14bf04939930870d5cfa96860ed953ad2ce07c3fd8713add4a1bfe585589f40f" +inherit gnomebase features_check -inherit features_check autotools pkgconfig +SRC_URI[archive.sha256sum] = "c885013fe61a4c5117fda395770d507563411c63e49f4a3aced4c9efe34d9975" REQUIRED_DISTRO_FEATURES = "x11" -EXTRA_OECONF = " --disable-documentation " - FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${libdir}/*/include/ ${libdir}/pangomm-*/" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb index e74f7a7f6..6dc39b17b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb @@ -5,8 +5,8 @@ HOMEPAGE = "https://github.com/googlefonts/noto-emoji" LICENSE = "OFL-1.1" LIC_FILES_CHKSUM = "file://fonts/LICENSE;md5=55719faa0112708e946b820b24b14097" -SRC_URI = "git://github.com/googlefonts/noto-emoji;protocol=https" -SRCREV = "833a43d03246a9325e748a2d783006454d76ff66" +SRC_URI = "git://github.com/googlefonts/noto-emoji;branch=main;protocol=https" +SRCREV = "aac7ccaa4d1dea4543453b96f7d6fc47066a57ff" PACKAGES = "${PN}-color ${PN}-regular" FONT_PACKAGES = "${PN}-color ${PN}-regular" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch new file mode 100644 index 000000000..7703a4320 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch @@ -0,0 +1,44 @@ +From 19bd0a979677a81d7399d5b567998398ec81f38b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 8 Jul 2021 15:40:10 -0700 +Subject: [PATCH] build: Do not build po files + +Fixes +| make[1]: Entering directory '/mnt/b/yoe/master/build/tmp/work/cortexa57-yoe-linux/xscreensaver/6.01-r0/xscreensaver-6.01/po' +| make[1]: *** No rule to make target 'default'. Stop. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -6,8 +6,8 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + + SHELL = /bin/sh +-SUBDIRS = utils jwxyz hacks/images hacks hacks/glx hacks/fonts \ +- driver po ++SUBDIRS = utils jwxyz hacks/images hacks hacks/fonts \ ++ driver + SUBDIRS2 = $(SUBDIRS) OSX android + TARFILES = README README.hacking INSTALL \ + configure configure.ac Makefile.in config.h.in \ +@@ -451,4 +451,3 @@ cerebrum:: + --include 'configure*' \ + --include '*/' \ + --exclude '*' +- +--- a/driver/Makefile.in ++++ b/driver/Makefile.in +@@ -212,7 +212,7 @@ TEST_EXES = test-passwd test-uid + xdpyinfo test-screens test-yarandom test-xinput \ + test-xkb + +-EXES = xscreensaver xscreensaver-command xscreensaver-settings ++EXES = xscreensaver xscreensaver-command + UTIL_EXES = xscreensaver-gfx @EXES_SYSTEMD@ + SETUID_EXES = xscreensaver-auth + DEMO_EXES = @ALL_DEMO_PROGRAMS@ diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch deleted file mode 100644 index afc8bc8e7..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- xscreensaver-5.44.orig/configure.in 2020-06-16 12:49:55.384675395 +0000 -+++ xscreensaver-5.44/configure.in 2020-06-16 12:51:49.451826729 +0000 -@@ -14,6 +14,9 @@ - # - ############################################################################### - -+includedir='' -+libdir='' -+ - AH_TOP([ - /* config.h.in --- xscreensaver, Copyright (c) 1991-2014 Jamie Zawinski. - * -diff -Naur xscreensaver-5.44.orig/driver/Makefile.in xscreensaver-5.44/driver/Makefile.in ---- xscreensaver-5.44.orig/driver/Makefile.in 2020-06-16 12:49:55.388675365 +0000 -+++ xscreensaver-5.44/driver/Makefile.in 2020-06-16 12:53:36.331038333 +0000 -@@ -10,7 +10,7 @@ - top_srcdir = @top_srcdir@ - top_builddir = .. - --install_prefix = -+install_prefix = ${DESTDIR} - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ -@@ -228,7 +228,7 @@ - SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \ - xscreensaver-text - SCRIPTS_OSX = xscreensaver-getimage-desktop --SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ -+#SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ - - HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ - xscreensaver.h prefs.h remote.h exec.h \ -diff -Naur xscreensaver-5.44.orig/hacks/Makefile.in xscreensaver-5.44/hacks/Makefile.in ---- xscreensaver-5.44.orig/hacks/Makefile.in 2020-06-16 12:49:55.532674285 +0000 -+++ xscreensaver-5.44/hacks/Makefile.in 2020-06-16 12:58:54.364719996 +0000 -@@ -10,7 +10,7 @@ - top_srcdir = @top_srcdir@ - top_builddir = .. - --install_prefix = -+install_prefix = ${DESTDIR} - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ -@@ -124,7 +124,7 @@ - tessellimage.c delaunay.c recanim.c binaryring.c \ - glitchpeg.c vfeedback.c scooter.c webcollage-cocoa.m \ - webcollage-helper-cocoa.m testx11.c --SCRIPTS = vidwhacker webcollage ljlatest -+#SCRIPTS = vidwhacker webcollage ljlatest - - # Programs that are mentioned in XScreenSaver.ad, and that have XML files, - # but that are not shipped with xscreensaver itself. -@@ -166,7 +166,13 @@ - tessellimage.o delaunay.o recanim.o binaryring.o \ - glitchpeg.o vfeedback.o scooter.o testx11.o - --EXES = attraction blitspin bouboule braid decayscreen deco \ -+EXES = fontglide -+JPEG_EXES = webcollage-helper -+ -+RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ -+ lightning lisa lissie lmorph rotor sphere spiral t3d vines \ -+ whirlygig worm xsublim juggle testx11 \ -+ attraction blitspin bouboule braid decayscreen deco \ - drift flame galaxy grav greynetic halo \ - helix hopalong ifs imsmap julia kaleidescope \ - maze moire noseguy pedal \ -@@ -182,17 +188,12 @@ - speedmine vermiculate twang apollonian euler2d \ - polyominoes thornbird fluidballs anemone halftone \ - metaballs eruption popsquares barcode piecewise cloudlife \ -- fontglide apple2 xanalogtv pong filmleader wormhole \ -+ apple2 xanalogtv pong filmleader wormhole \ - pacman fuzzyflakes anemotaxis memscroller substrate \ - intermomentary fireworkx fiberlamp boxfit interaggregate \ - celtic cwaves m6502 abstractile lcdscrub hexadrop \ - tessellimage binaryring glitchpeg vfeedback scooter \ - @JPEG_EXES@ --JPEG_EXES = webcollage-helper -- --RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ -- lightning lisa lissie lmorph rotor sphere spiral t3d vines \ -- whirlygig worm xsublim juggle testx11 - - HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ - $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \ -diff -Naur xscreensaver-5.44.orig/Makefile.in xscreensaver-5.44/Makefile.in ---- xscreensaver-5.44.orig/Makefile.in 2020-06-16 12:49:55.384675395 +0000 -+++ xscreensaver-5.44/Makefile.in 2020-06-16 12:52:49.395383836 +0000 -@@ -6,7 +6,7 @@ - VPATH = @srcdir@ - - SHELL = /bin/sh --SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po -+SUBDIRS = utils jwxyz hacks/images hacks driver - SUBDIRS2 = $(SUBDIRS) OSX android - TARFILES = README README.hacking README.VMS INSTALL \ - configure configure.in Makefile.in config.h.in \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch index 0f2e09aec..4ce2faed5 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch @@ -1,5 +1,5 @@ ---- xscreensaver-5.44.orig/driver/XScreenSaver.ad.in 2020-06-16 13:13:14.950970569 +0000 -+++ xscreensaver-5.44/driver/XScreenSaver.ad.in 2020-06-16 13:19:35.777000937 +0000 +--- a/driver/XScreenSaver.ad.in ++++ b/driver/XScreenSaver.ad.in @@ -29,7 +29,7 @@ ! /* (xrdb prevention kludge: whole file) @@ -18,13 +18,13 @@ *grabVideoFrames: False *chooseRandomImages: @DEFAULT_IMAGES_P@ ! This can be a local directory name, or the URL of an RSS or Atom feed. -@@ -48,11 +48,11 @@ +@@ -47,11 +47,11 @@ + *memoryLimit: 0 *lock: False *verbose: False - *timestamp: True -*fade: True +*fade: False - *unfade: False + *unfade: True *fadeSeconds: 0:00:03 *fadeTicks: 20 -*splash: True @@ -32,7 +32,7 @@ *splashDuration: 0:00:05 *visualID: default *installColormap: True -@@ -343,246 +343,8 @@ +@@ -324,250 +324,8 @@ XScreenSaver.bourneShell: /bin/sh !============================================================================= *programs: \ @@ -272,8 +272,12 @@ - vfeedback -root \n\ -@GL_KLUDGE@ GL: deepstars -root \n\ -@GL_KLUDGE@ GL: gravitywell -root \n\ +-@GL_KLUDGE@ GL: beats -root \n\ +-@GL_KLUDGE@ GL: covid19 -root \n\ -@GL_KLUDGE@ GL: etruscanvenus -root \n\ --@GL_KLUDGE@ GL: gibson -root \n +-@GL_KLUDGE@ GL: gibson -root \n\ +-@GL_KLUDGE@ GL: headroom -root \n\ +-@GL_KLUDGE@ GL: sphereeversion -root \n - - +- fontglide -root -program "date +'%F %H:%M %z'" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb deleted file mode 100644 index 9131c754d..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "X screen saver and locker" -HOMEPAGE = "https://www.jwz.org/xscreensaver/" -LICENSE = "BSD-0-Clause" -LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=2b97002f72fbfc9329b4336e798f2463" - -SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "9f764e561f9939f8684a66ec98b27cba" -SRC_URI[sha256sum] = "73d8089cfc7d7363b5dac99b5b01dffb3429d0a855e6af16ce9a4b7777017b95" - -SRC_URI += " \ - file://xscreensaver.service \ - file://fix-buildscripts.patch \ - file://tweak-app-defaults.patch \ -" - -DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native" -# These are only needed as part of the stopgap screensaver implementation: -RDEPENDS_${PN} = " \ - liberation-fonts \ - xuser-account \ -" - -inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check - -EXTRA_OECONF += "--with-x-app-defaults=${datadir}/X11/app-defaults" - -REQUIRED_DISTRO_FEATURES = "x11" - -do_install_append() { - install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service -} - -FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver" -SYSTEMD_SERVICE_${PN} = "xscreensaver.service" - -CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb new file mode 100644 index 000000000..d67e05844 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb @@ -0,0 +1,53 @@ +SUMMARY = "X screen saver and locker" +HOMEPAGE = "https://www.jwz.org/xscreensaver/" +LICENSE = "BSD-0-Clause" +LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=c3ce41cdff745eb1dc9d4fcfbffb4d51" + +SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz" +SRC_URI[sha256sum] = "085484665d91f60b4a1dedacd94bcf9b74b0fb096bcedc89ff1c245168e5473b" + +SRC_URI += " \ + file://xscreensaver.service \ + file://0001-build-Do-not-build-po-files.patch \ + file://tweak-app-defaults.patch \ +" + +DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam" +# These are only needed as part of the stopgap screensaver implementation: +RDEPENDS_${PN} = " \ + liberation-fonts \ + xuser-account \ +" + +inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check + + +EXTRA_OECONF += "--with-app-defaults=${datadir}/X11/app-defaults --libdir=${STAGING_LIBDIR} \ + --includedir=${STAGING_INCDIR} --with-pam --with-login-manager" + +EXTRA_OEMAKE += "install_prefix=${D}" +REQUIRED_DISTRO_FEATURES = "x11 pam" + +do_install_append() { + install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service + for f in xscreensaver-getimage-file xscreensaver-getimage-video webcollage xscreensaver-text vidwhacker + do + sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" ${D}/${libexecdir}/${PN}/$f + done +} + +PACKAGES =+ "${PN}-perl" + +FILES_${PN}-perl = "\ + ${libexecdir}/${PN}/xscreensaver-getimage-file \ + ${libexecdir}/${PN}/xscreensaver-getimage-video \ + ${libexecdir}/${PN}/webcollage \ + ${libexecdir}/${PN}/xscreensaver-text \ + ${libexecdir}/${PN}/vidwhacker \ + " +FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver ${datadir}/fonts" +SYSTEMD_SERVICE_${PN} = "xscreensaver.service" + +RDEPENDS_${PN}-perl = "perl" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4/0002-perf_examples-Remove-unused-sum-variable.patch b/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4/0002-perf_examples-Remove-unused-sum-variable.patch new file mode 100644 index 000000000..e85ca96fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4/0002-perf_examples-Remove-unused-sum-variable.patch @@ -0,0 +1,44 @@ +From 0b2f611a95f3c93454453892bbe021ad2815925d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Jun 2021 17:35:26 -0700 +Subject: [PATCH] perf_examples: Remove unused 'sum' variable + +Fixes +self_smpl_multi.c:144:19: error: variable 'sum' set but not used [-Werror,-Wunused-but-set-variable] + unsigned long x, sum; + ^ +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + perf_examples/self_smpl_multi.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/perf_examples/self_smpl_multi.c b/perf_examples/self_smpl_multi.c +index 391fa61..75b45e0 100644 +--- a/perf_examples/self_smpl_multi.c ++++ b/perf_examples/self_smpl_multi.c +@@ -141,7 +141,7 @@ void + do_cycles(void) + { + struct timeval start, last, now; +- unsigned long x, sum; ++ unsigned long x; + + gettimeofday(&start, NULL); + last = start; +@@ -150,15 +150,12 @@ do_cycles(void) + iter[myid] = 0; + + do { +- +- sum = 1; + for (x = 1; x < 250000; x++) { + /* signal pending to private queue because of + * pthread_kill(), i.e., tkill() + */ + if ((x % 5000) == 0) + pthread_kill(pthread_self(), SIGUSR1); +- sum += x; + } + iter[myid]++; + diff --git a/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.10.1.bb b/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb index ff56d4804..8ffc99f91 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.10.1.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb @@ -10,13 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0de488f3bd4424e308e2e399cb99c788" SECTION = "devel" -COMPATIBLE_HOST = "powerpc64" +COMPATIBLE_HOST = "powerpc64|aarch64" SRC_URI = "${SOURCEFORGE_MIRROR}/perfmon2/${BPN}/libpfm-${PV}.tar.gz \ file://0001-Include-poll.h-instead-of-sys-poll.h.patch \ - " -SRC_URI[md5sum] = "d8f66cb9bfa7e1434434e0de6409db5b" -SRC_URI[sha256sum] = "c61c575378b5c17ccfc5806761e4038828610de76e2e34fac9f7fa73ba844b49" + file://0002-perf_examples-Remove-unused-sum-variable.patch \ + " +SRC_URI[sha256sum] = "5da5f8872bde14b3634c9688d980f68bda28b510268723cc12973eedbab9fecc" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/perfmon2/files/libpfm4/" @@ -24,6 +24,7 @@ EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCON EXTRA_OEMAKE_append_powerpc = " ARCH=\"powerpc\"" EXTRA_OEMAKE_append_powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\"" EXTRA_OEMAKE_append_powerpc64le = " ARCH=\"powerpc\" BITMODE=\"64\"" +EXTRA_OEMAKE_append_aarch64 = " ARCH=\"arm64\"" S = "${WORKDIR}/libpfm-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-kernel/spidev-test/spidev-test.bb b/meta-openembedded/meta-oe/recipes-kernel/spidev-test/spidev-test.bb index 662630291..974cb1e93 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/spidev-test/spidev-test.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/spidev-test/spidev-test.bb @@ -1,7 +1,7 @@ SUMMARY = "Test SPI devices" DESCRIPTION = "SPI testing utility using the spidev driver" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" PROVIDES = "virtual/spidev-test" inherit bash-completion kernelsrc kernel-arch diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210406.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210710.bb index cc138adb6..9d89e1c5a 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210406.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210710.bb @@ -16,7 +16,7 @@ SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz # only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" -SRC_URI[sha256sum] = "0bd182fac7d6297d924af4405ce840515a38fa5438cb1a4b90fcb6bc737b36d6" +SRC_URI[sha256sum] = "c157e848fecb335a7af2917fe787dacc5ada07e74f02026c206b092bc4cecb01" S = "${WORKDIR}/live" diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.1.bb b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.2.bb index ba24d360e..7d2cec18b 100644 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.2.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master \ " S = "${WORKDIR}/git" -SRCREV = "46cb7d92443c9ec7b3af15fb0baa65f65f6415d3" +SRCREV = "40312ddee3035d13e287355544cd7bd7e49b5499" inherit autotools python3native update-rc.d systemd diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch index 0eb7e4bbb..c6f9c6de6 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch @@ -1,4 +1,4 @@ -From 12414304245cce6ef0e8b9547949be5109845353 Mon Sep 17 00:00:00 2001 +From 2cc41bee63223cb398ea932aad6ecc94ff5b61dd Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Tue, 24 Jul 2018 13:33:33 +0800 Subject: [PATCH] cmake: Install libcares.pc @@ -11,12 +11,13 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> update to 1.14.0, fix patch warning Signed-off-by: Changqing Li <changqing.li@windriver.com> + --- - CMakeLists.txt | 28 +++++++++++++++++++++++----- - 1 file changed, 23 insertions(+), 5 deletions(-) + CMakeLists.txt | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fd123e1..3a5878d 100644 +index 08c0247..0020d6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,22 +214,25 @@ ADD_DEFINITIONS(${SYSFLAGS}) @@ -50,9 +51,9 @@ index fd123e1..3a5878d 100644 # When checking for symbols, we need to make sure we set the proper # headers, libraries, and definitions for the detection to work properly -@@ -554,6 +557,15 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h) - # Write ares_config.h configuration file. This is used only for the build. - CONFIGURE_FILE (ares_config.h.cmake ${PROJECT_BINARY_DIR}/ares_config.h) +@@ -551,6 +554,15 @@ ENDIF() + # Record toplevel CMakeLists.txt path + set(CARES_TOPLEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}") +# Pass required CFLAGS to pkg-config in case of static library +IF (CARES_STATIC) @@ -66,19 +67,11 @@ index fd123e1..3a5878d 100644 # TRANSFORM_MAKEFILE_INC # -@@ -728,6 +740,12 @@ IF (CARES_INSTALL) +@@ -624,7 +636,6 @@ IF (CARES_INSTALL) INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") ENDIF () -+# pkg-config file -+IF (CARES_INSTALL) -+ SET (PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -+ INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" DESTINATION ${PKGCONFIG_INSTALL_DIR}) -+ENDIF () -+ +- # Legacy chain-building variables (provided for compatibility with old code). # Don't use these, external code should be updated to refer to the aliases directly (e.g., Cares::cares). SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND") --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb index 67dd70180..92eb9dae5 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb @@ -5,14 +5,14 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" -PV = "1.16.0+gitr${SRCPV}" +PV = "1.17.1" SRC_URI = "\ git://github.com/c-ares/c-ares.git \ file://cmake-install-libcares.pc.patch \ file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ " -SRCREV = "74a1426ba60e2cd7977e53a22ef839c87415066e" +SRCREV = "39c73b503d9ef70a58ad1f4a4643f15b01407c66" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_git.bb b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.0.bb index f74a39b50..c52a04064 100644 --- a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.0.bb @@ -4,11 +4,9 @@ LICENSE = "BSD-2-Clause & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" SRC_URI = "git://github.com/commonmark/cmark.git" -SRCREV = "8daa6b1495124f0b67e6034130e12d7be83e38bd" +SRCREV = "8800e66010214384e75f933830ca5585e1ae3060" S = "${WORKDIR}/git" -PV = "0.29.0" - inherit cmake lib_package EXTRA_OECMAKE += " \ diff --git a/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.8.bb b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb index de175d629..9979c21b8 100644 --- a/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb @@ -9,8 +9,7 @@ SRC_URI = " \ file://install-bench.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "8aac833c943d8e90d51b697b27d4384d" -SRC_URI[sha256sum] = "6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303" +SRC_URI[sha256sum] = "bf2c7ce40b04ae811af714deb512510cc2c17b9ab9d6ddcf49fe4487eea7af3d" inherit autotools pkgconfig ptest diff --git a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb index 56dc30acd..14b988337 100644 --- a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Provides improved implementations of std::function." HOMEPAGE = "https://naios.github.io/function2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRCREV = "3a0746bf5f601dfed05330aefcb6854354fce07d" +SRCREV = "02ca99831de59c7c3a4b834789260253cace0ced" PV .= "+git${SRCPV}" SRC_URI += "gitsm://github.com/Naios/function2" diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Find-Libunwind-during-configure.patch b/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Find-Libunwind-during-configure.patch deleted file mode 100644 index 4c0861cca..000000000 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Find-Libunwind-during-configure.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- /dev/null -+++ b/cmake/FindLibunwind.cmake -@@ -0,0 +1,54 @@ -+# - Try to find libunwind -+# Once done this will define -+# -+# Libunwind_FOUND - system has libunwind -+# unwind - cmake target for libunwind -+ -+find_library (UNWIND_LIBRARY NAMES unwind DOC "unwind library") -+include (CheckIncludeFile) -+check_include_file (libunwind.h HAVE_LIBUNWIND_H) -+check_include_file (unwind.h HAVE_UNWIND_H) -+ -+if (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") -+ set(LIBUNWIND_ARCH "arm") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") -+ set(LIBUNWIND_ARCH "aarch64") -+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR -+ CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR -+ CMAKE_SYSTEM_PROCESSOR STREQUAL "corei7-64") -+ set(LIBUNWIND_ARCH "x86_64") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") -+ set(LIBUNWIND_ARCH "x86") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64") -+ set(LIBUNWIND_ARCH "ppc64") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc") -+ set(LIBUNWIND_ARCH "ppc32") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") -+ set(LIBUNWIND_ARCH "mips") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^hppa") -+ set(LIBUNWIND_ARCH "hppa") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ia64") -+ set(LIBUNWIND_ARCH "ia64") -+endif() -+ -+find_library (UNWIND_LIBRARY_PLATFORM NAMES "unwind-${LIBUNWIND_ARCH}" DOC "unwind library platform") -+if (UNWIND_LIBRARY_PLATFORM) -+ set(HAVE_LIB_UNWIND "1") -+endif() -+ -+include(FindPackageHandleStandardArgs) -+# handle the QUIETLY and REQUIRED arguments and set Libunwind_FOUND to TRUE -+# if all listed variables are TRUE -+find_package_handle_standard_args(Libunwind DEFAULT_MSG -+ UNWIND_LIBRARY HAVE_LIBUNWIND_H HAVE_UNWIND_H HAVE_LIB_UNWIND) -+ -+mark_as_advanced (UNWIND_LIBRARY UNWIND_LIBRARY_PLATFORM) -+ -+if (Libunwind_FOUND) -+ add_library(unwind INTERFACE IMPORTED) -+ set_target_properties(unwind PROPERTIES -+ INTERFACE_LINK_LIBRARIES "${UNWIND_LIBRARY};${UNWIND_LIBRARY_PLATFORM}" -+ ) -+else() -+ message("Can't find libunwind library") -+endif() ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -64,7 +64,6 @@ check_include_file (dlfcn.h HAVE_DLFCN_H - check_include_file (execinfo.h HAVE_EXECINFO_H) - check_include_file (glob.h HAVE_GLOB_H) - check_include_file (inttypes.h HAVE_INTTYPES_H) --check_include_file (libunwind.h HAVE_LIBUNWIND_H) - check_include_file (memory.h HAVE_MEMORY_H) - check_include_file (pwd.h HAVE_PWD_H) - check_include_file (stdint.h HAVE_STDINT_H) -@@ -80,7 +79,6 @@ check_include_file (syscall.h HAVE_SYSCA - check_include_file (syslog.h HAVE_SYSLOG_H) - check_include_file (ucontext.h HAVE_UCONTEXT_H) - check_include_file (unistd.h HAVE_UNISTD_H) --check_include_file (unwind.h HAVE_UNWIND_H) - check_include_file (pwd.h HAVE_PWD_H) - - check_include_file_cxx ("ext/hash_map" HAVE_EXT_HASH_MAP) -@@ -116,11 +114,9 @@ check_cxx_compiler_flag (-Wunnamed-type- - # snprintf as an inline function - check_symbol_exists (snprintf stdio.h HAVE_SNPRINTF) - --check_library_exists (unwind get_static_proc_name "" HAVE_LIB_UNWIND) - check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP) - --find_library (UNWIND_LIBRARY NAMES unwind DOC "unwind library") --mark_as_advanced (UNWIND_LIBRARY) -+find_package(Libunwind) - - check_c_source_compiles (" - #include <stdlib.h> -@@ -471,9 +467,9 @@ add_library(glog::glog ALIAS glog) - - set_target_properties (glog PROPERTIES POSITION_INDEPENDENT_CODE ON) - --if (UNWIND_LIBRARY) -- target_link_libraries (glog PUBLIC ${UNWIND_LIBRARY}) --endif (UNWIND_LIBRARY) -+if (Libunwind_FOUND) -+ target_link_libraries (glog PUBLIC unwind) -+endif (Libunwind_FOUND) - - if (HAVE_DBGHELP) - target_link_libraries (glog PUBLIC dbghelp) -@@ -678,6 +674,7 @@ export (PACKAGE glog) - install (FILES - ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake -+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLibunwind.cmake - DESTINATION ${_glog_CMake_INSTALLDIR}) - - install (EXPORT glog-targets NAMESPACE glog:: DESTINATION ---- a/glog-config.cmake.in -+++ b/glog-config.cmake.in -@@ -8,4 +8,7 @@ include (CMakeFindDependencyMacro) - - @gflags_DEPENDENCY@ - -+list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") -+find_dependency (Libunwind) -+ - include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake") diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog/libexecinfo.patch b/meta-openembedded/meta-oe/recipes-support/glog/glog/libexecinfo.patch index ae46d3274..927c269a6 100644 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog/libexecinfo.patch +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog/libexecinfo.patch @@ -8,17 +8,17 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -115,6 +115,7 @@ check_cxx_compiler_flag (-Wunnamed-type- - check_symbol_exists (snprintf stdio.h HAVE_SNPRINTF) +@@ -144,6 +144,7 @@ check_cxx_compiler_flag (-Wunnamed-type- + check_symbol_exists (snprintf cstdio HAVE_SNPRINTF) check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP) +check_library_exists (execinfo backtrace "" HAVE_EXECINFO) - find_package(Libunwind) - -@@ -471,6 +472,10 @@ if (Libunwind_FOUND) - target_link_libraries (glog PUBLIC unwind) - endif (Libunwind_FOUND) + check_cxx_source_compiles (" + #include <cstdlib> +@@ -584,6 +585,10 @@ if (Unwind_FOUND) + set (Unwind_DEPENDENCY "find_dependency (Unwind ${Unwind_VERSION})") + endif (Unwind_FOUND) +if (HAVE_EXECINFO) + target_link_libraries (glog PUBLIC execinfo) diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.4.0.bb b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb index 6b101ef67..c4ba9f244 100644 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" SRC_URI = " \ git://github.com/google/glog.git;nobranch=1 \ - file://0001-Find-Libunwind-during-configure.patch \ file://libexecinfo.patch \ " -SRCREV = "96a2f23dca4cc7180821ca5f32e526314395d26a" +SRCREV = "8f9ccfe770add9e4c64e9b25c102658e3c763b73" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb index d6ef98f94..a54d8f8f7 100644 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb @@ -1,8 +1,13 @@ DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." AUTHOR = "Benoît Jacob and Gaël Guennebaud and others" HOMEPAGE = "http://eigen.tuxfamily.org/" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad" +LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPLv3 & LGPLv2.1 & MINPACK" +LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ + file://COPYING.BSD;md5=543367b8e11f07d353ef894f71b574a0 \ + file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.MINPACK;md5=5fe4603e80ef7390306f51ef74449bbd \ +" SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;nobranch=1" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest index 4cda05d44..60c661fc1 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest @@ -1,12 +1,19 @@ #!/bin/sh -testbin="gpiod-test" +testbins="gpiod-test gpio-tools-test gpiod-cxx-test gpiod_py_test.py" + ptestdir=$(dirname "$(readlink -f "$0")") cd $ptestdir/tests -./$testbin -if [ $? -ne 0 ]; then - echo "FAIL: $testbin" -else - echo "PASS: $testbin" -fi +for testbin in $testbins; do + if test -e ./$testbin; then + ./$testbin > ./$testbin.out + if [ $? -ne 0 ]; then + echo "FAIL: $testbin" + else + echo "PASS: $testbin" + fi + else + echo "SKIP: $testbin" + fi +done diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb index d9c251705..be5be2f8d 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb @@ -1,11 +1,12 @@ SUMMARY = "C library and tools for interacting with the linux GPIO character device" -AUTHOR = "Bartosz Golaszewski <bgolaszewski@baylibre.com>" +AUTHOR = "Bartosz Golaszewski <brgl@bgdev.pl>" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" -SRC_URI = "https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz \ - file://run-ptest \ +SRC_URI = " \ + https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz \ + file://run-ptest \ " SRC_URI[md5sum] = "28e79f6f70fee1da9079558d8b7b3736" @@ -13,7 +14,7 @@ SRC_URI[sha256sum] = "841be9d788f00bab08ef22c4be5c39866f0e46cb100a3ae49ed816ac9c inherit autotools pkgconfig python3native ptest -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2,bats python3-packaging" PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" @@ -26,19 +27,51 @@ EXTRA_OECONF = "--enable-tools" DEPENDS += "autoconf-archive-native" -PACKAGES =+ "${PN}-tools libgpiodcxx" -FILES_${PN}-tools = "${bindir}/*" +PACKAGES =+ "${PN}-tools libgpiodcxx ${PN}-python" +FILES_${PN}-tools = " \ + ${bindir}/gpiodetect \ + ${bindir}/gpioinfo \ + ${bindir}/gpioget \ + ${bindir}/gpioset \ + ${bindir}/gpiofind \ + ${bindir}/gpiomon \ +" +FILES_${PN}-ptest += " \ + ${bindir}/gpiod-test \ + ${bindir}/gpio-tools-test \ + ${bindir}/gpio-tools-test.bats \ + ${bindir}/gpiod-cxx-test \ + ${bindir}/gpiod_py_test.py \ + ${libdir}/libgpiomockup.so.* \ +" FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*" - -PACKAGES =+ "${PN}-python" FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.so" FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" -RRECOMMENDS_PYTHON = "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '',d)}" -RRECOMMENDS_${PN}-python += "${RRECOMMENDS_PYTHON}" + +RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '', d)}" +RRECOMMENDS_${PN}-ptest += "kernel-module-gpio-mockup" PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)}" do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp ${B}/tests/.libs/gpiod-test ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests + + # These are the core C library tests + install -m 0755 ${B}/tests/.libs/gpiod-test ${D}${PTEST_PATH}/tests/ + + # Tools are always built so let's always install them for ptest even if + # we're not selecting libgpiod-tools. + install -m 0755 ${S}/tools/gpio-tools-test ${D}${PTEST_PATH}/tests/ + install -m 0755 ${S}/tools/gpio-tools-test.bats ${D}${PTEST_PATH}/tests/ + for tool in ${FILES_${PN}-tools}; do + install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ + done + + if ${@bb.utils.contains('PACKAGECONFIG', 'cxx', 'true', 'false', d)}; then + install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/ + fi + + if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then + install -m 0755 ${S}/bindings/python/tests/gpiod_py_test.py ${D}${PTEST_PATH}/tests/ + fi } diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.6.bb b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.7.bb index 2f74013ca..2b8728179 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.7.bb @@ -7,5 +7,5 @@ DEPENDS = "glib-2.0 libusb" inherit meson gobject-introspection gtk-doc gettext vala SRC_URI = "git://github.com/hughsie/libgusb.git" -SRCREV = "b0464454048cac6779d4d51f12fe7f37ae4bbd57" +SRCREV = "ff9c606d9d72c7dd369ad220d92729556faaaf0c" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch b/meta-openembedded/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch new file mode 100644 index 000000000..4d3dcd5ce --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch @@ -0,0 +1,34 @@ +From 717b0f46b23ddc042da481d1d446bdd1c6c49142 Mon Sep 17 00:00:00 2001 +From: Julien Malik <julien.malik@unseenlabs.fr> +Date: Mon, 27 Jul 2020 14:34:44 +0200 +Subject: [PATCH] python: Do not verify whether libiio is installed when + cross-compiling + +This should fix #561 + +Signed-off-by: Julien Malik <julien.malik@paraiso.me> +--- + bindings/python/setup.py.cmakein | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/bindings/python/setup.py.cmakein b/bindings/python/setup.py.cmakein +index cd14e2e..96d58a8 100644 +--- a/bindings/python/setup.py.cmakein ++++ b/bindings/python/setup.py.cmakein +@@ -54,6 +54,13 @@ class InstallWrapper(install): + install.run(self) + + def _check_libiio_installed(self): ++ cross_compiling = ("${CMAKE_CROSSCOMPILING}" == "TRUE") ++ if cross_compiling: ++ # When cross-compiling, we generally cannot dlopen ++ # the libiio shared lib from the build platform. ++ # Simply skip this check in that case. ++ return ++ + from platform import system as _system + from ctypes import CDLL as _cdll + from ctypes.util import find_library +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index 6f37d1e89..d2d6fd475 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" SRCREV = "565bf68eccfdbbf22cf5cb6d792e23de564665c7" PV = "0.21+git${SRCPV}" -SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" +SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https \ + file://0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch \ +" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb index 5245059a8..215f32a78 100644 --- a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" SRC_URI = "git://github.com/leethomason/tinyxml2.git" -SRCREV = "3291390336141573e51dfa991b4179c8bcd8f306" +SRCREV = "1dee28e51f9175a31955b9791c74c430fe13dc82" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg_20210314.bb b/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb index 9275dd233..eb7de1279 100644 --- a/meta-openembedded/meta-oe/recipes-support/mg/mg_20210314.bb +++ b/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://version.c;md5=1895eb37bf6bd79cdc5c89d8166fabfb" DEPENDS = "ncurses libbsd" SECTION = "console/editors" -SRCREV = "598f7a028f01f85f0dee0e798753bccf93233add" +SRCREV = "688f49cd67ab30dfa6482c74815e117cbf7af63a" SRC_URI = "git://github.com/hboetes/mg \ file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.0.bb index b5e16d0f9..069d9f81c 100644 --- a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.0.bb @@ -15,8 +15,7 @@ SRC_URI = " \ file://monitrc \ " -SRC_URI[md5sum] = "13a0804dae18ef08198c3ace72f9dd60" -SRC_URI[sha256sum] = "d8809c78d5dc1ed7a7ba32a5a55c5114855132cc4da4805f8d3aaf8cf46eaa4c" +SRC_URI[sha256sum] = "9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c" DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.7.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb index 6a293c763..8ba4ca13f 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb @@ -13,7 +13,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] = "d4b181cc2ec11def3711b4649e34f2be7a668e70ab506860514031d069cccafa" +SRC_URI[sha256sum] = "e43b63db2f78336e2aa123e8d015dbabc1720a15361714bfd4b1bb4e5e87768c" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb index fce5a856e..98be21d40 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb @@ -45,6 +45,8 @@ TDS = "${S}/tentative-dist-staging" TARGET_CC_ARCH += "${LDFLAGS}" +CFLAGS_append_class-native = " -D_XOPEN_SOURCE " + do_configure_prepend_libc-musl () { sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk } @@ -277,3 +279,6 @@ FILES_${PN}-dev = "\ RDEPENDS_${PN}-smime = "perl" BBCLASSEXTEND = "native nativesdk" + +# CVE-2006-5201 affects only Sun Solaris +CVE_CHECK_WHITELIST += "CVE-2006-5201" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.05.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.07.0.bb index 4cfc5bd86..975ab1d70 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.05.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.07.0.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] = "dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c" +SRC_URI[sha256sum] = "e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19/0001-cmake-Use-GNUInstallDirs.patch b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19/0001-cmake-Use-GNUInstallDirs.patch new file mode 100644 index 000000000..892399de7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19/0001-cmake-Use-GNUInstallDirs.patch @@ -0,0 +1,49 @@ +From ced7af0420c1df0ac02f0c25e7c3534431ebd7fd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 4 Jul 2021 17:09:49 -0700 +Subject: [PATCH] cmake: Use GNUInstallDirs + +Helps install cmakefiles in right libdir + +Upstream-Status: Submitted [https://github.com/PortAudio/portaudio/pull/610] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ + + CMAKE_MINIMUM_REQUIRED(VERSION 2.8) + ++include(GNUInstallDirs) ++ + # Check if the user is building PortAudio stand-alone or as part of a larger + # project. If this is part of a larger project (i.e. the CMakeLists.txt has + # been imported by some other CMakeLists.txt), we don't want to trump over +@@ -452,18 +454,18 @@ IF(NOT PA_OUTPUT_OSX_FRAMEWORK AND NOT P + CONFIGURE_FILE(cmake_support/portaudio-2.0.pc.in ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc @ONLY) + INSTALL(FILES README.md DESTINATION share/doc/portaudio) + INSTALL(FILES LICENSE.txt DESTINATION share/doc/portaudio) +- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc DESTINATION lib/pkgconfig) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + INSTALL(FILES ${PA_PUBLIC_INCLUDES} DESTINATION include) + INSTALL(TARGETS ${PA_TARGETS} + EXPORT portaudio-targets +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) +- INSTALL(EXPORT portaudio-targets FILE "portaudioTargets.cmake" DESTINATION "lib/cmake/portaudio") ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ INSTALL(EXPORT portaudio-targets FILE "portaudioTargets.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/portaudio") + EXPORT(TARGETS ${PA_TARGETS} FILE "${PROJECT_BINARY_DIR}/cmake/portaudio/portaudioTargets.cmake") + INSTALL(FILES "${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfig.cmake" + "${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfigVersion.cmake" +- DESTINATION "lib/cmake/portaudio") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/portaudio") + + IF (NOT TARGET uninstall) + CONFIGURE_FILE( diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb index 3a0f7894f..aec482b9b 100644 --- a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb @@ -8,6 +8,7 @@ PV = "v190700" SRC_URI = " \ git://github.com/PortAudio/portaudio.git \ file://0001-Find-jack.patch \ + file://0001-cmake-Use-GNUInstallDirs.patch \ " SRCREV = "147dd722548358763a8b649b3e4b41dfffbcfbb6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.17.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb index ef7876786..954da272e 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.17.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb @@ -25,7 +25,7 @@ DEPENDS = " \ DEPENDS_append_libc-musl = " libexecinfo" LDFLAGS_append_libc-musl = " -lexecinfo" -SRCREV = "0ef1621b3e16b3168213147a2bfca39da2c2668f" +SRCREV = "045862cc7d7dd986b349c68131df2f86b9b1cd9c" SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index 33f5dccca..a81d8d6ca 100644 --- a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -22,8 +22,8 @@ RDEPENDS_${PN} = "rsync \ perl-module-ipc-open3 \ " -SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9" -PV = "1.4.3+git${SRCPV}" +SRCREV = "4dc82bfe6be3f83fcfa94946dcf6accfd6a18031" +PV = "1.4.4+git${SRCPV}" SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ file://configure-fix-cmd_rsync.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.37.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb index 4630eb021..d01ea42bd 100644 --- a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.37.bb +++ b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb @@ -10,7 +10,7 @@ inherit autotools-brokensep python3native pkgconfig SRC_URI = "git://github.com/abrt/satyr.git \ file://0002-fix-compile-failure-against-musl-C-library.patch \ " -SRCREV = "4a7d0a31cdeee23bb13739f57926188a795bdf25" +SRCREV = "ad0030f071b7ce7eb748eca3c31cb381038e2b21" S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.9.2.bb b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.0.bb index 16b7c3e54..4cf0dee11 100644 --- a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.0.bb @@ -4,7 +4,7 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRC_URI += "git://github.com/martinmoene/span-lite" -SRCREV = "126453198fe2236b31ddfa7353e95d3a06c478ab" +SRCREV = "2987dd8d3b8fe7c861e3c3f879234cc1c412f03f" S = "${WORKDIR}/git" 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 cde26df49..bb41a33c1 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.7" +BPV = "1.0.0" PV = "${BPV}" -SRCREV = "67937230d70ad87c23c7116a72df83577e309f6f" +SRCREV = "f5d87954bd9e13689481700105efe2f42199d364" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-arena-Remove-dead-code.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-arena-Remove-dead-code.patch new file mode 100644 index 000000000..8a603ffe3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-arena-Remove-dead-code.patch @@ -0,0 +1,40 @@ +From b94a1e3d6b5c733ba24cfa0d35450d8659d48289 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 4 Jun 2021 13:07:28 -0700 +Subject: [PATCH] arena: Remove dead code + +Fixes clang warning +arena.cpp:226:19: error: variable 'drained' set b +ut not used [-Werror,-Wunused-but-set-variable] +| std::intptr_t drained = 0; +| ^ + +Upstream-Status: Submitted [https://github.com/oneapi-src/oneTBB/pull/429] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/tbb/arena.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/tbb/arena.cpp b/src/tbb/arena.cpp +index 4a9c0f8a..c8ed4999 100644 +--- a/src/tbb/arena.cpp ++++ b/src/tbb/arena.cpp +@@ -232,14 +232,13 @@ void arena::free_arena () { + __TBB_ASSERT( !my_global_concurrency_mode, NULL ); + #endif + poison_value( my_guard ); +- std::intptr_t drained = 0; + for ( unsigned i = 0; i < my_num_slots; ++i ) { + // __TBB_ASSERT( !my_slots[i].my_scheduler, "arena slot is not empty" ); + // TODO: understand the assertion and modify + // __TBB_ASSERT( my_slots[i].task_pool == EmptyTaskPool, NULL ); + __TBB_ASSERT( my_slots[i].head == my_slots[i].tail, NULL ); // TODO: replace by is_quiescent_local_task_pool_empty + my_slots[i].free_task_pool(); +- drained += mailbox(i).drain(); ++ mailbox(i).drain(); + my_slots[i].my_default_task_dispatcher->~task_dispatcher(); + } + __TBB_ASSERT(my_fifo_task_stream.empty(), "Not all enqueued tasks were executed"); +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb index f4c52daf4..0b039a181 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb @@ -19,6 +19,7 @@ SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH file://0001-CMakeLists.txt-exclude-riscv64-riscv32.patch \ file://0001-Disable-use-of-_tpause-instruction.patch \ file://0001-set_my_tls_end_of_input-Use-an-arbitrary-but-valid-p.patch \ + file://0001-arena-Remove-dead-code.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch new file mode 100644 index 000000000..e95e24049 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch @@ -0,0 +1,276 @@ +Subject: Fix build errors with linux 5.13 +Origin: upstream, https://www.virtualbox.org/browser/vbox/trunk +Bug: https://bugs.launchpad.net/bugs/1929193 + +diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h +--- virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h 2021-04-28 16:24:47.000000000 +0000 ++++ virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h 2021-06-23 10:08:44.431714404 +0000 +@@ -46,20 +41,20 @@ + * Evaluates to true if the linux kernel version is equal or higher to the + * one specfied. */ + #define RTLNX_VER_MIN(a_Major, a_Minor, a_Patch) \ +- (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch)) ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch)) + + /** @def RTLNX_VER_MAX + * Evaluates to true if the linux kernel version is less to the one specfied + * (exclusive). */ + #define RTLNX_VER_MAX(a_Major, a_Minor, a_Patch) \ +- (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch)) ++ (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch)) + + /** @def RTLNX_VER_RANGE + * Evaluates to true if the linux kernel version is equal or higher to the given + * minimum version and less (but not equal) to the maximum version (exclusive). */ + #define RTLNX_VER_RANGE(a_MajorMin, a_MinorMin, a_PatchMin, a_MajorMax, a_MinorMax, a_PatchMax) \ +- ( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin, a_PatchMin) \ +- && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) ) ++ ( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin, a_PatchMin) \ ++ && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) ) + + + /** @def RTLNX_RHEL_MIN +@@ -70,7 +65,7 @@ + */ + #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) + # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) \ +- ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))) ++ ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))) + #else + # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) (0) + #endif +@@ -83,7 +78,7 @@ + */ + #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) + # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) \ +- ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) < (a_iMinor))) ++ ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) < (a_iMinor))) + #else + # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) + #endif +@@ -95,7 +90,7 @@ + */ + #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) + # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax, a_iMinorMax) \ +- (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax)) ++ (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax)) + #else + # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax, a_iMinorMax) (0) + #endif +@@ -173,7 +168,9 @@ + #include <drm/ttm/ttm_bo_api.h> + #include <drm/ttm/ttm_bo_driver.h> + #include <drm/ttm/ttm_placement.h> ++#if RTLNX_VER_MAX(5,13,0) + #include <drm/ttm/ttm_memory.h> ++#endif + #if RTLNX_VER_MAX(5,12,0) + # include <drm/ttm/ttm_module.h> + #endif +@@ -222,7 +219,7 @@ static inline void drm_gem_object_put(st + VBVA_ADAPTER_INFORMATION_SIZE) + #define GUEST_HEAP_SIZE VBVA_ADAPTER_INFORMATION_SIZE + #define GUEST_HEAP_USABLE_SIZE (VBVA_ADAPTER_INFORMATION_SIZE - \ +- sizeof(HGSMIHOSTFLAGS)) ++ sizeof(struct hgsmi_host_flags)) + #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE + + /** How frequently we refresh if the guest is not providing dirty rectangles. */ +@@ -232,7 +229,7 @@ static inline void drm_gem_object_put(st + static inline void *devm_kcalloc(struct device *dev, size_t n, size_t size, + gfp_t flags) + { +- return devm_kzalloc(dev, n * size, flags); ++ return devm_kzalloc(dev, n * size, flags); + } + #endif + +@@ -244,7 +241,7 @@ struct vbox_private { + u8 __iomem *guest_heap; + u8 __iomem *vbva_buffers; + struct gen_pool *guest_pool; +- struct VBVABUFFERCONTEXT *vbva_info; ++ struct vbva_buf_context *vbva_info; + bool any_pitch; + u32 num_crtcs; + /** Amount of available VRAM, including space used for buffers. */ +@@ -252,7 +249,7 @@ struct vbox_private { + /** Amount of available VRAM, not including space used for buffers. */ + u32 available_vram_size; + /** Array of structures for receiving mode hints. */ +- VBVAMODEHINT *last_mode_hints; ++ struct vbva_modehint *last_mode_hints; + + struct vbox_fbdev *fbdev; + +@@ -263,7 +260,11 @@ struct vbox_private { + struct drm_global_reference mem_global_ref; + struct ttm_bo_global_ref bo_global_ref; + #endif ++#if RTLNX_VER_MIN(5,13,0) ++ struct ttm_device bdev; ++#else + struct ttm_bo_device bdev; ++#endif + bool mm_initialised; + } ttm; + +diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_ttm.c virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_ttm.c +--- virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-04-28 16:24:47.000000000 +0000 ++++ virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-06-23 10:08:07.164057918 +0000 +@@ -48,7 +43,11 @@ + #endif + + ++#if RTLNX_VER_MIN(5,13,0) ++static inline struct vbox_private *vbox_bdev(struct ttm_device *bd) ++#else + static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd) ++#endif + { + return container_of(bd, struct vbox_private, ttm.bdev); + } +@@ -188,7 +187,7 @@ static int vbox_ttm_io_mem_reserve(struc + mem->bus.size = mem->num_pages << PAGE_SHIFT; + mem->bus.base = 0; + mem->bus.is_iomem = false; +- if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE)) ++ if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE)) + return -EINVAL; + switch (mem->mem_type) { + case TTM_PL_SYSTEM: +@@ -205,8 +204,13 @@ static int vbox_ttm_io_mem_reserve(struc + return 0; + } + #else ++# if RTLNX_VER_MAX(5,13,0) + static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, + struct ttm_resource *mem) ++# else /* > 5.13.0 */ ++static int vbox_ttm_io_mem_reserve(struct ttm_device *bdev, ++ struct ttm_resource *mem) ++# endif /* > 5.13.0 */ + { + struct vbox_private *vbox = vbox_bdev(bdev); + mem->bus.addr = NULL; +@@ -241,7 +245,12 @@ static int vbox_ttm_io_mem_reserve(struc + + + +-#if RTLNX_VER_MIN(5,10,0) ++#if RTLNX_VER_MIN(5,13,0) ++static void vbox_ttm_io_mem_free(struct ttm_device *bdev, ++ struct ttm_resource *mem) ++{ ++} ++#elif RTLNX_VER_MIN(5,10,0) + static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev, + struct ttm_resource *mem) + { +@@ -253,7 +262,13 @@ static void vbox_ttm_io_mem_free(struct + } + #endif + +-#if RTLNX_VER_MIN(5,10,0) ++#if RTLNX_VER_MIN(5,13,0) ++static void vbox_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *tt) ++{ ++ ttm_tt_fini(tt); ++ kfree(tt); ++} ++#elif 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); +@@ -333,7 +348,11 @@ static int vbox_bo_move(struct ttm_buffe + } + #endif + ++#if RTLNX_VER_MIN(5,13,0) ++static struct ttm_device_funcs vbox_bo_driver = { ++#else /* < 5.13.0 */ + static struct ttm_bo_driver vbox_bo_driver = { ++#endif /* < 5.13.0 */ + .ttm_tt_create = vbox_ttm_tt_create, + #if RTLNX_VER_MIN(5,10,0) + .ttm_tt_destroy = vbox_ttm_tt_destroy, +@@ -370,14 +389,22 @@ int vbox_mm_init(struct vbox_private *vb + { + int ret; + struct drm_device *dev = vbox->dev; ++#if RTLNX_VER_MIN(5,13,0) ++ struct ttm_device *bdev = &vbox->ttm.bdev; ++#else + struct ttm_bo_device *bdev = &vbox->ttm.bdev; ++#endif + + #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) + ret = vbox_ttm_global_init(vbox); + if (ret) + return ret; + #endif ++#if RTLNX_VER_MIN(5,13,0) ++ ret = ttm_device_init(&vbox->ttm.bdev, ++#else + ret = ttm_bo_device_init(&vbox->ttm.bdev, ++#endif + #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) + vbox->ttm.bo_global_ref.ref.object, + #endif +@@ -429,7 +456,11 @@ int vbox_mm_init(struct vbox_private *vb + return 0; + + err_device_release: ++#if RTLNX_VER_MIN(5,13,0) ++ ttm_device_fini(&vbox->ttm.bdev); ++#else + ttm_bo_device_release(&vbox->ttm.bdev); ++#endif + #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) + err_ttm_global_release: + vbox_ttm_global_release(vbox); +@@ -446,7 +477,11 @@ void vbox_mm_fini(struct vbox_private *v + #else + arch_phys_wc_del(vbox->fb_mtrr); + #endif ++#if RTLNX_VER_MIN(5,13,0) ++ ttm_device_fini(&vbox->ttm.bdev); ++#else + ttm_bo_device_release(&vbox->ttm.bdev); ++#endif + #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) + vbox_ttm_global_release(vbox); + #endif +@@ -528,7 +563,9 @@ int vbox_bo_create(struct drm_device *de + { + struct vbox_private *vbox = dev->dev_private; + struct vbox_bo *vboxbo; ++#if RTLNX_VER_MAX(5,13,0) + size_t acc_size; ++#endif + int ret; + + vboxbo = kzalloc(sizeof(*vboxbo), GFP_KERNEL); +@@ -551,16 +588,20 @@ int vbox_bo_create(struct drm_device *de + + vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM); + ++#if RTLNX_VER_MAX(5,13,0) + acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size, + sizeof(struct vbox_bo)); ++#endif + + ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size, + ttm_bo_type_device, &vboxbo->placement, + #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) + align >> PAGE_SHIFT, false, NULL, acc_size, +-#else ++#elif RTLNX_VER_MAX(5,13,0) /* < 5.13.0 */ + align >> PAGE_SHIFT, false, acc_size, +-#endif ++#else /* > 5.13.0 */ ++ align >> PAGE_SHIFT, false, ++#endif /* > 5.13.0 */ + #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2) + NULL, NULL, vbox_bo_ttm_destroy); + #else diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb index a074d0a55..19b8f8f46 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb @@ -13,6 +13,7 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ + file://40-linux-5.13-support.patch \ file://add__divmoddi4.patch \ " SRC_URI[md5sum] = "abb1a20021e5915fe38c666e8c11cf80" diff --git a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.3.0.bb b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.3.0.bb index 8190a5e3a..39a02733f 100644 --- a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.3.0.bb @@ -7,6 +7,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2970203aedf9e829edb96a137a4fe81b" SRC_URI = "git://github.com/bats-core/bats-core.git \ + file://0001-install.sh-consider-multilib.patch \ " # v1.3.0 SRCREV = "9086c47854652f2731861b40385689c85f12103f" @@ -15,7 +16,7 @@ S = "${WORKDIR}/git" do_install() { # Just a bunch of bash scripts to install - ${S}/install.sh ${D}${prefix} + ${S}/install.sh ${D}${prefix} ${baselib} } RDEPENDS_${PN} = "bash" diff --git a/meta-openembedded/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch b/meta-openembedded/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch new file mode 100644 index 000000000..c7393ca2e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch @@ -0,0 +1,43 @@ +From 6e3d01f1ff199383b78a7504858c374fbce05f4e Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Thu, 10 Jun 2021 11:11:07 +0800 +Subject: [PATCH] install.sh: consider multilib + +It may install files to /usr/lib64 when multilib is enabled. Add an +optional parameter for install.sh to support it. + +Upstream-Status: Submitted [https://github.com/bats-core/bats-core/pull/452] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + install.sh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/install.sh b/install.sh +index e660866..d91159e 100755 +--- a/install.sh ++++ b/install.sh +@@ -4,6 +4,7 @@ set -e + + BATS_ROOT="${0%/*}" + PREFIX="$1" ++BASELIB="${2:-lib}" + + if [[ -z "$PREFIX" ]]; then + printf '%s\n' \ +@@ -12,10 +13,10 @@ if [[ -z "$PREFIX" ]]; then + exit 1 + fi + +-install -d -m 755 "$PREFIX"/{bin,libexec/bats-core,lib/bats-core,share/man/man{1,7}} ++install -d -m 755 "$PREFIX"/{bin,libexec/bats-core,${BASELIB}/bats-core,share/man/man{1,7}} + install -m 755 "$BATS_ROOT/bin"/* "$PREFIX/bin" + install -m 755 "$BATS_ROOT/libexec/bats-core"/* "$PREFIX/libexec/bats-core" +-install -m 755 "$BATS_ROOT/lib/bats-core"/* "$PREFIX/lib/bats-core" ++install -m 755 "$BATS_ROOT/lib/bats-core"/* "$PREFIX/${BASELIB}/bats-core" + install -m 644 "$BATS_ROOT/man/bats.1" "$PREFIX/share/man/man1" + install -m 644 "$BATS_ROOT/man/bats.7" "$PREFIX/share/man/man7" + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb b/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb new file mode 100644 index 000000000..a17c0658c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "CppUTest unit testing and mocking framework for C/C++" +HOMEPAGE = "http://cpputest.github.io/" +SECTION = "devel" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177" + +SRC_URI = "git://github.com/cpputest/cpputest.git;protocol=https" +SRCREV = "67d2dfd41e13f09ff218aa08e2d35f1c32f032a1" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DLONGLONG=ON \ + -DC++11=ON \ + -DTESTS=OFF \ + -DEXTENSIONS=OFF \ + " + +FILES_${PN}-dev += "${libdir}/CppUTest/cmake/*" diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Remove-Werror-from-build.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Remove-Werror-from-build.patch index 906ec99a9..5ccd461d9 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Remove-Werror-from-build.patch +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Remove-Werror-from-build.patch @@ -11,12 +11,12 @@ Upstream-Status: Pending 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index a26a197b..70a28174 100644 +index f8066af..6b979f8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -14,7 +14,7 @@ AM_CPPFLAGS = \ - `pkg-config --silence-errors --cflags json` \ - `pkg-config --silence-errors --cflags json-c` \ +@@ -12,7 +12,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src/acpica/source/compiler \ + -I$(top_srcdir)/efi_runtime \ -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ - -Wall -Werror -Wextra \ + -Wall -Wextra \ @@ -24,7 +24,7 @@ index a26a197b..70a28174 100644 -Wfloat-equal -Wmissing-declarations \ -Wno-long-long -Wredundant-decls -Wshadow \ diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am -index 55c52b41..b85d0101 100644 +index 55c52b4..50efa97 100644 --- a/src/lib/src/Makefile.am +++ b/src/lib/src/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS = \ @@ -32,23 +32,23 @@ index 55c52b41..b85d0101 100644 `pkg-config --cflags glib-2.0 gio-2.0` \ -DDATAROOTDIR=\"$(datarootdir)\" \ - -Wall -Werror -Wextra \ -+ -Wall -Wextra \ ++ -Wall -Wextra \ -Wno-address-of-packed-member pkglib_LTLIBRARIES = libfwts.la diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am -index ecc25f0a..129c1036 100644 +index a7d9b9c..e1bf141 100644 --- a/src/utilities/Makefile.am +++ b/src/utilities/Makefile.am @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # --AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ -+AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ - `pkg-config --silence-errors --cflags json` \ - `pkg-config --silence-errors --cflags json-c` \ - -I../lib/include +-AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ ++AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ + -I$(srcdir)/../lib/include + + bin_PROGRAMS = kernelscan -- 2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.03.00.bb b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb index aa7d422f7..21d256351 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.03.00.bb +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb @@ -13,7 +13,7 @@ SRC_URI = "http://fwts.ubuntu.com/release/fwts-V${PV}.tar.gz;subdir=${BP} \ file://0005-Undefine-PAGE_SIZE.patch \ file://0006-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \ " -SRC_URI[sha256sum] = "c22dcba2572e4237bf2fe9ab579e195cf051d3a99b2c07ab58f757cae02d24fb" +SRC_URI[sha256sum] = "ca43439707976f6664fe3f6eb7f356a51ac7d7f8a4e246ef4d1b16305e066909" COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb index 2e0fecf7a..3e1fc4ff8 100644 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb @@ -4,12 +4,12 @@ SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" -PV = "1.10.0+git${SRCPV}" +PV = "1.11.0+git${SRCPV}" PROVIDES += "gmock gtest" S = "${WORKDIR}/git" -SRCREV = "662fe38e44900c007eccb65a5d2ea19df7bd520e" +SRCREV = "e2239ee6043f73722e7aa812a459f54a28552929" SRC_URI = "git://github.com/google/googletest.git" inherit cmake |