diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended')
10 files changed, 125 insertions, 87 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.8.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.1.bb index 4f0f719fb..c382ad87f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.1.bb @@ -25,7 +25,7 @@ SRC_URI = " \ gitsm://github.com/ostreedev/ostree \ file://run-ptest \ " -SRCREV = "3e289b19345e30d2da193cd208e109f7d7aaa2a1" +SRCREV = "e9e4b9112083228b8c385ad26924b6c4623f4179" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/riscv32.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch index 79ec7423d..b2d1a32ed 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/riscv32.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch @@ -1,21 +1,33 @@ -Define correct gregs for RISCV32 +From 6134b471c35df826ccb41aab9a47e5c89e15a0c4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 26 Oct 2020 21:32:22 -0700 +Subject: [PATCH] Define correct gregs for RISCV32 Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Updated patch for 6.2.1 +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> +--- + src/debug.c | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +diff --git a/src/debug.c b/src/debug.c +index e7fec29..5abb404 100644 --- a/src/debug.c +++ b/src/debug.c -@@ -942,7 +942,9 @@ static void *getMcontextEip(ucontext_t * +@@ -1039,7 +1039,9 @@ static void *getMcontextEip(ucontext_t *uc) { #endif #elif defined(__linux__) /* Linux */ -- #if defined(__i386__) || defined(__ILP32__) +- #if defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) + #if defined(__riscv) && __riscv_xlen == 32 + return (void*) uc->uc_mcontext.__gregs[REG_PC]; -+ #elif defined(__i386__) || defined(__ILP32__) ++ #elif defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) return (void*) uc->uc_mcontext.gregs[14]; /* Linux 32 */ #elif defined(__X86_64__) || defined(__x86_64__) return (void*) uc->uc_mcontext.gregs[16]; /* Linux 64 */ -@@ -1102,8 +1104,28 @@ void logRegisters(ucontext_t *uc) { +@@ -1206,8 +1208,28 @@ void logRegisters(ucontext_t *uc) { #endif /* Linux */ #elif defined(__linux__) @@ -40,8 +52,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + ); + logStackContent((void**)uc->uc_mcontext.__gregs[REG_SP]); /* Linux x86 */ -- #if defined(__i386__) || defined(__ILP32__) -+ #elif defined(__i386__) || defined(__ILP32__) +- #if defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) ++ #elif defined(__i386__) || ((defined(__X86_64__) || defined(__x86_64__)) && defined(__ILP32__)) serverLog(LL_WARNING, "\n" "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/ilp32.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/ilp32.patch deleted file mode 100644 index 48d01a1d6..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/ilp32.patch +++ /dev/null @@ -1,29 +0,0 @@ -__ILP32__ is defined for all 32bit architectures with clang e.g. -which is right but it is causing issues on non-x86 architectures -where this condition becomes true and wrongly starts using this -code, this issue is hidden with gcc becuase gcc does not define -__ILP32__ for all 32bit architectures but for selected 64bit arches -who choose to use 32bit ABI e.g. x32 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/src/debug.c -+++ b/src/debug.c -@@ -944,7 +944,7 @@ static void *getMcontextEip(ucontext_t * - /* Linux */ - #if defined(__riscv) && __riscv_xlen == 32 - return (void*) uc->uc_mcontext.__gregs[REG_PC]; -- #elif defined(__i386__) || defined(__ILP32__) -+ #elif defined(__i386__) || (defined(__X86_64__) && defined(__ILP32__)) - return (void*) uc->uc_mcontext.gregs[14]; /* Linux 32 */ - #elif defined(__X86_64__) || defined(__x86_64__) - return (void*) uc->uc_mcontext.gregs[16]; /* Linux 64 */ -@@ -1125,7 +1125,7 @@ void logRegisters(ucontext_t *uc) { - ); - logStackContent((void**)uc->uc_mcontext.__gregs[REG_SP]); - /* Linux x86 */ -- #elif defined(__i386__) || defined(__ILP32__) -+ #elif defined(__i386__) || ( defined(__X86_64__) && defined(__ILP32__)) - serverLog(LL_WARNING, - "\n" - "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch index 7e62ae131..1619e9db3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch @@ -1,4 +1,4 @@ -From 394108035d350ae662a431c80131f812b5f72dff Mon Sep 17 00:00:00 2001 +From 097a2b259cb266c2c861dc74fa6f80712d6138c5 Mon Sep 17 00:00:00 2001 From: Venture Research <tech@ventureresearch.com> Date: Fri, 8 Feb 2013 20:22:19 -0600 Subject: [PATCH] lua: update Makefile to use environment build settings @@ -12,14 +12,42 @@ Updated to work with 3.0.x Signed-off-by: Armin Kuster <akust808@gmail.com> +updated to work wtih 6.2.1 +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> --- - deps/lua/src/Makefile | 18 +++++++----------- - 1 file changed, 7 insertions(+), 11 deletions(-) + deps/Makefile | 1 - + deps/lua/Makefile | 1 - + deps/lua/src/Makefile | 16 ++++++---------- + 3 files changed, 6 insertions(+), 12 deletions(-) -Index: redis-3.0.2/deps/lua/src/Makefile -=================================================================== ---- redis-3.0.2.orig/deps/lua/src/Makefile -+++ redis-3.0.2/deps/lua/src/Makefile +diff --git a/deps/Makefile b/deps/Makefile +index ff16ee9..d8d64aa 100644 +--- a/deps/Makefile ++++ b/deps/Makefile +@@ -74,7 +74,6 @@ LUA_LDFLAGS+= $(LDFLAGS) + # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more + # challenging to cross-compile lua (and redis). These defines make it easier + # to fit redis into cross-compilation environments, which typically set AR. +-AR=ar + ARFLAGS=rc + + lua: .make-prerequisites +diff --git a/deps/lua/Makefile b/deps/lua/Makefile +index 209a132..72f4b2b 100644 +--- a/deps/lua/Makefile ++++ b/deps/lua/Makefile +@@ -33,7 +33,6 @@ INSTALL_DATA= $(INSTALL) -m 0644 + + # Utilities. + MKDIR= mkdir -p +-RANLIB= ranlib + + # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= + +diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile +index f3bba2f..1555ec0 100644 +--- a/deps/lua/src/Makefile ++++ b/deps/lua/src/Makefile @@ -5,18 +5,14 @@ # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= @@ -45,27 +73,3 @@ Index: redis-3.0.2/deps/lua/src/Makefile # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= -Index: redis-3.0.2/deps/Makefile -=================================================================== ---- redis-3.0.2.orig/deps/Makefile -+++ redis-3.0.2/deps/Makefile -@@ -63,7 +63,6 @@ LUA_LDFLAGS+= $(LDFLAGS) - # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more - # challenging to cross-compile lua (and redis). These defines make it easier - # to fit redis into cross-compilation environments, which typically set AR. --AR=ar - ARFLAGS=rcu - - lua: .make-prerequisites -Index: redis-3.0.2/deps/lua/Makefile -=================================================================== ---- redis-3.0.2.orig/deps/lua/Makefile -+++ redis-3.0.2/deps/lua/Makefile -@@ -33,7 +33,6 @@ INSTALL_DATA= $(INSTALL) -m 0644 - - # Utilities. - MKDIR= mkdir -p --RANLIB= ranlib - - # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= - diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch index 6745f3d0e..a0f66b845 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch @@ -1,4 +1,4 @@ -From f8861d2129b9e18bba137705bfa38c6bd9be1790 Mon Sep 17 00:00:00 2001 +From 1fa047162983d4a7e0576f0837a73a6027a783bd Mon Sep 17 00:00:00 2001 From: Venture Research <tech@ventureresearch.com> Date: Wed, 6 Feb 2013 20:51:02 -0600 Subject: [PATCH] hack to force use of libc malloc @@ -6,7 +6,7 @@ Subject: [PATCH] hack to force use of libc malloc Hack to force libc usage as it seems the option to pass it in has been removed in favor of magic. -Note that this of course doesn't allow tcmalloc and jemalloc, however +Note that this of course doesn't allow tcmalloc and jemalloc, however jemalloc wasn't building correctly. Signed-off-by: Venture Research <tech@ventureresearch.com> @@ -15,11 +15,11 @@ Update to work with 4.0.8 Signed-off-by: Alistair Francis <alistair.francis@wdc.com> --- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index 86e0b3fe..a810180b 100644 +index ecd6929..c7f43c5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,7 +13,8 @@ @@ -31,4 +31,4 @@ index 86e0b3fe..a810180b 100644 +uname_S := "USE_LIBC_MALLOC" uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') OPTIMIZATION?=-O2 - DEPENDENCY_TARGETS=hiredis linenoise lua + DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.9.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.1.bb index 50571ed55..89990df3d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.1.bb @@ -15,10 +15,9 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://oe-use-libc-malloc.patch \ file://0001-src-Do-not-reset-FINAL_LIBS.patch \ file://GNU_SOURCE.patch \ - file://riscv32.patch \ - file://ilp32.patch \ + file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "dc2bdcf81c620e9f09cfd12e85d3bc631c897b2db7a55218fd8a65eaa37f86dd" +SRC_URI[sha256sum] = "cd222505012cce20b25682fca931ec93bd21ae92cb4abfe742cf7b76aa907520" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch new file mode 100644 index 000000000..552172d39 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch @@ -0,0 +1,46 @@ +From 194e199ce08acc2192f6a63420ff24d9064666e5 Mon Sep 17 00:00:00 2001 +From: Yi Fan Yu <yifan.yu@windriver.com> +Date: Sat, 27 Mar 2021 19:18:25 -0400 +Subject: [PATCH] tests: disable the check for inotify + +We don't need to check inotify.h. +Assume it is present since it is part of the linux kernel +since 2.6.13 [1]. + +[1](https://kernelnewbies.org/Linux_2_6_13) + +(it would require installing the libc headers otherwise, + for the test to detect /usr/include/sys/inotify.h.) + +Upstream-Status: Inappropriate[OE-specific] + +Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> +--- + tests/diag.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/diag.sh b/tests/diag.sh +index 6cd60ea88..7424f48c5 100755 +--- a/tests/diag.sh ++++ b/tests/diag.sh +@@ -2672,7 +2672,7 @@ case $1 in + fi + ;; + 'check-inotify') # Check for inotify/fen support +- if [ -n "$(find /usr/include -name 'inotify.h' -print -quit)" ]; then ++ if true; then + echo [inotify mode] + elif [ -n "$(find /usr/include/sys/ -name 'port.h' -print -quit)" ]; then + grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h +@@ -2687,7 +2687,7 @@ case $1 in + fi + ;; + 'check-inotify-only') # Check for ONLY inotify support +- if [ -n "$(find /usr/include -name 'inotify.h' -print -quit)" ]; then ++ if true; then + echo [inotify mode] + else + echo [inotify not supported, skipping...] +-- +2.29.2 + diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest index aa698d85c..efa9ba3ed 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest @@ -5,4 +5,8 @@ set -o pipefail SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" cd ${SCRIPTPATH} -make -C tests -k check-TESTS +useradd tester || echo "user already exists" +ln -sf /usr/sbin/logrotate /usr/bin/logrotate +su tester -c "make -C tests -k check-TESTS" +userdel tester +rm -f /usr/bin/logrotate diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2102.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2102.0.bb index 22059d140..921124024 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2102.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2102.0.bb @@ -24,6 +24,7 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t file://rsyslog.service \ file://use-pkgconfig-to-check-libgcrypt.patch \ file://run-ptest \ + file://0001-tests-disable-the-check-for-inotify.patch \ " SRC_URI_append_libc-musl = " \ @@ -80,11 +81,6 @@ PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,," PACKAGECONFIG[valgrind] = ",--without-valgrind-testbench,valgrind," PACKAGECONFIG[imhttp] = "--enable-imhttp,--disable-imhttp,civetweb," -do_configure_prepend() { - sed -i -e 's|python |python3 |g' ${S}/tests/*.sh - sed -i -e 's|/usr/bin/env python|/usr/bin/env python3|g' ${S}/tests/*.py - sed -i -e 's|/usr/bin/env python|/usr/bin/env python3|g' ${S}/tests/testsuites/*.py -} TESTDIR = "tests" do_compile_ptest() { @@ -97,6 +93,10 @@ do_install_ptest() { cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH} cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH} + # give permissions to all users + # some tests need to write to this directory as user 'daemon' + chmod 777 -R ${D}${PTEST_PATH}/tests + # do NOT need to rebuild Makefile itself sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile # do NOT need to rebuild $(check_PROGRAMS) @@ -195,8 +195,11 @@ VALGRIND_libc-musl_powerpc64le = '' VALGRIND_riscv64 = "" VALGRIND_riscv32 = "" +# util-linux: logger needs the -d option RDEPENDS_${PN}-ptest += "\ make diffutils gzip bash gawk coreutils procps \ - libgcc python3-core python3-io \ + libgcc python3-core python3-io python3-json \ + curl util-linux shadow \ " + RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" diff --git a/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb index 8e00cb3ea..f86b2b912 100644 --- a/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb +++ b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb @@ -18,15 +18,14 @@ S = "${WORKDIR}/tools" inherit update-alternatives do_compile() { - oe_runmake + oe_runmake LIB_DIR=${libdir}/uml } do_install() { oe_runmake install DESTDIR=${D} } -FILES_${PN} += "${exec_prefix}${nonarch_base_libdir}" -FILES_${PN}-dbg += "${exec_prefix}${nonarch_base_libdir}/uml/.debug" +FILES_${PN} += "${libdir}/uml" ALTERNATIVE_${PN} = "tunctl" ALTERNATIVE_LINK_NAME[tunctl] = "${bindir}/tunctl" |