diff options
Diffstat (limited to 'poky/meta/recipes-extended')
26 files changed, 36 insertions, 1004 deletions
diff --git a/poky/meta/recipes-extended/bash/bash/execute_cmd.patch b/poky/meta/recipes-extended/bash/bash/execute_cmd.patch deleted file mode 100644 index 7a9e9a902f..0000000000 --- a/poky/meta/recipes-extended/bash/bash/execute_cmd.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Rebase to 5.0 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - execute_cmd.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/execute_cmd.c b/execute_cmd.c -index f1d74bf..31674b4 100644 ---- a/execute_cmd.c -+++ b/execute_cmd.c -@@ -2567,7 +2567,11 @@ execute_pipeline (command, asynchronous, pipe_in, pipe_out, fds_to_close) - /* If the `lastpipe' option is set with shopt, and job control is not - enabled, execute the last element of non-async pipelines in the - current shell environment. */ -- if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) -+ if (lastpipe_opt && -+#if defined(JOB_CONTROL) -+ job_control == 0 && -+#endif -+ asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) - { - lstdin = move_to_high_fd (0, 1, -1); - if (lstdin > 0) --- -2.7.4 - diff --git a/poky/meta/recipes-extended/bash/bash/makerace.patch b/poky/meta/recipes-extended/bash/bash/makerace.patch deleted file mode 100644 index 9bd7c280fe..0000000000 --- a/poky/meta/recipes-extended/bash/bash/makerace.patch +++ /dev/null @@ -1,52 +0,0 @@ -We're seeing pipesize.h being created in parallel: - -/bin/sh ../../bash-5.1/builtins/psize.sh > pipesize.h -/bin/sh ../../bash-5.1/builtins/psize.sh > pipesize.h - -./mkbuiltins -D ../../bash-5.1/builtins ../../bash-5.1/builtins/ulimit.def -x86_64-pokysdk-linux-gcc --sysroot=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot -c -DHAVE_CONFIG_H -DSHELL -I. -I.. -I../../bash-5.1 -I../../bash-5.1/include -I../../bash-5.1/lib -I../../bash-5.1/builtins -O2 -pipe -fmacro-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot-native= ulimit.c || ( rm -f ulimit.c ; exit 1 ) -make[1]: Leaving directory '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/build/builtins' -rm -f redir.o -x86_64-pokysdk-linux-gcc --sysroot=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot -DPROGRAM='"bash"' -DCONF_HOSTTYPE='"x86_64"' -DCONF_OSTYPE='"linux-gnu"' -DCONF_MACHTYPE='"x86_64-pokysdk-linux-gnu"' -DCONF_VENDOR='"pokysdk"' -DLOCALEDIR='"/opt/poky/3.2+snapshot/sysroots/x86_64-pokysdk-linux/usr/share/locale"' -DPACKAGE='"bash"' -DSHELL -DHAVE_CONFIG_H -I. -I../bash-5.1 -I../bash-5.1/include -I../bash-5.1/lib -O2 -pipe -fmacro-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0=/usr/src/debug/nativesdk-bash/5.1-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/recipe-sysroot-native= -c ../bash-5.1/redir.c -In file included from ../../bash-5.1/builtins/../../bash-5.1/builtins/ulimit.def:95: -pipesize.h:9:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '-' token - 9 | bash-5.1/builtins/psize.sh: 37: ../../bash-5.1/builtins/psize.sh: ./psize.aux: Text file busy - | ^ -make[1]: *** [Makefile:119: ulimit.o] Error 1 -make[1]: Leaving directory '/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-bash/5.1-r0/build/builtins' -make: *** [Makefile:737: builtins/libbuiltins.a] Error 1 -make: *** Waiting for unfinished jobs.... -In file included from ../bash-5.1/redir.c:61: -./builtins/pipesize.h:9:5: error: expected '=', ',', ';', 'asm' or '__attribute__' before '-' token - 9 | bash-5.1/builtins/psize.sh: 37: ../../bash-5.1/builtins/psize.sh: ./psize.aux: Text file busy - | ^ -make: *** [Makefile:101: redir.o] Error 1 -WARNING: exit code 1 from a shell command. - -which happens since builtins/ulimit.o depends on pipesize.h as well as a top -level dependency. This means: - - @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) pipesize.h ) || exit 1 - -races with: - - @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) DEBUG=${DEBUG} targets ) || exit 1 - -Hack around this by forcing BUILTINS_LIBRARY onto pipesize.h as a dependency. - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-bash/2021-01/msg00152.html] -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Index: bash-5.1/Makefile.in -=================================================================== ---- bash-5.1.orig/Makefile.in -+++ bash-5.1/Makefile.in -@@ -746,7 +746,7 @@ ${DEFDIR}/bashgetopt.o: $(BUILTIN_SRCDIR - ${DEFDIR}/builtext.h: $(BUILTIN_DEFS) - @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) builtext.h ) || exit 1 - --${DEFDIR}/pipesize.h: -+${DEFDIR}/pipesize.h: $(BUILTINS_LIBRARY) - @(cd $(DEFDIR) && $(MAKE) $(MFLAGS) pipesize.h ) || exit 1 - - $(SDIR)/man2html$(EXEEXT): ${SUPPORT_SRC}/man2html.c diff --git a/poky/meta/recipes-extended/bash/bash/makerace2.patch b/poky/meta/recipes-extended/bash/bash/makerace2.patch deleted file mode 100644 index abb51a5086..0000000000 --- a/poky/meta/recipes-extended/bash/bash/makerace2.patch +++ /dev/null @@ -1,98 +0,0 @@ -The main makefile can call mkbuiltins from multiple different codepaths in parallel. -When called, it moves the existing files out the way and creates new ones, then -compares which will break the build if timing is unlucky. - -The root of the problem is mkbuiltins.c creating a file but also referencing that -file under the same name. By modifing it to allow the final name and the temp name -to be specified, we can avoid the original reason for the moving of files around. -This allows them to be created under a new name and then replaced if changed, -removing any race windows around accessing the files whilst they've been -moved or are being rewritten. - -See [YOCTO #14227] - -Upstream-Status: Submitted [https://savannah.gnu.org/patch/index.php?10210] -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Index: bash-5.1.8/builtins/Makefile.in -=================================================================== ---- bash-5.1.8.orig/builtins/Makefile.in -+++ bash-5.1.8/builtins/Makefile.in -@@ -185,19 +185,17 @@ gen-helpfiles: tmpbuiltins.o gen-helpfil - $(CC_FOR_BUILD) ${CCFLAGS_FOR_BUILD} $(LDFLAGS_FOR_BUILD) -o $@ gen-helpfiles.o tmpbuiltins.o $(LIBS_FOR_BUILD) - - builtext.h builtins.c: $(MKBUILTINS) $(DEFSRC) -- @-if test -f builtins.c; then mv -f builtins.c old-builtins.c; fi -- @-if test -f builtext.h; then mv -f builtext.h old-builtext.h; fi -- ./$(MKBUILTINS) -externfile builtext.h -structfile builtins.c \ -+ ./$(MKBUILTINS) -externfile builtext-new.h -externfinalfile builtext.h -structfile builtins-new.c \ - -noproduction $(DIRECTDEFINE) $(HELPDIRDEFINE) $(HELPSTRINGS) $(DEFSRC) -- @-if cmp -s old-builtext.h builtext.h 2>/dev/null; then \ -- mv old-builtext.h builtext.h; \ -+ @-if ! cmp -s builtext.h builtext-new.h 2>/dev/null; then \ -+ mv builtext-new.h builtext.h; \ - else \ -- $(RM) old-builtext.h; \ -+ $(RM) builtext-new.h; \ - fi -- @-if cmp -s old-builtins.c builtins.c 2>/dev/null; then \ -- mv old-builtins.c builtins.c; \ -+ @-if ! cmp -s builtins.c builtins-new.c 2>/dev/null; then \ -+ mv builtins-new.c builtins.c; \ - else \ -- $(RM) old-builtins.c; \ -+ $(RM) builtins-new.c; \ - fi - - helpdoc: gen-helpfiles -Index: bash-5.1.8/builtins/mkbuiltins.c -=================================================================== ---- bash-5.1.8.orig/builtins/mkbuiltins.c -+++ bash-5.1.8/builtins/mkbuiltins.c -@@ -113,6 +113,9 @@ char *struct_filename = (char *)NULL; - /* The name of the external declaration file. */ - char *extern_filename = (char *)NULL; - -+/* The final name of the external declaration file. */ -+char *extern_final_filename = (char *)NULL; -+ - /* Here is a structure for manipulating arrays of data. */ - typedef struct { - int size; /* Number of slots allocated to array. */ -@@ -230,6 +233,8 @@ main (argc, argv) - - if (strcmp (arg, "-externfile") == 0) - extern_filename = argv[arg_index++]; -+ else if (strcmp (arg, "-externfinalfile") == 0) -+ extern_final_filename = argv[arg_index++]; - else if (strcmp (arg, "-structfile") == 0) - struct_filename = argv[arg_index++]; - else if (strcmp (arg, "-noproduction") == 0) -@@ -273,6 +278,9 @@ main (argc, argv) - } - } - -+ if (!extern_final_filename) -+ extern_final_filename = extern_filename; -+ - /* If there are no files to process, just quit now. */ - if (arg_index == argc) - exit (0); -@@ -1174,7 +1182,7 @@ write_file_headers (structfile, externfi - fprintf (structfile, "%s\n", structfile_header[i]); - - fprintf (structfile, "#include \"%s\"\n", -- extern_filename ? extern_filename : "builtext.h"); -+ extern_final_filename ? extern_final_filename : "builtext.h"); - - fprintf (structfile, "#include \"bashintl.h\"\n"); - -@@ -1184,7 +1192,7 @@ write_file_headers (structfile, externfi - if (externfile) - fprintf (externfile, - "/* %s - The list of builtins found in libbuiltins.a. */\n", -- extern_filename ? extern_filename : "builtext.h"); -+ extern_final_filename ? extern_final_filename : "builtext.h"); - } - - /* Write out any necessary closing information for diff --git a/poky/meta/recipes-extended/bash/bash/use_aclocal.patch b/poky/meta/recipes-extended/bash/bash/use_aclocal.patch index bebaa08bfe..bd6870b386 100644 --- a/poky/meta/recipes-extended/bash/bash/use_aclocal.patch +++ b/poky/meta/recipes-extended/bash/bash/use_aclocal.patch @@ -1,3 +1,8 @@ +From d1bf23817afffd5917b74da6946e0c3b7e63e336 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 28 Dec 2020 21:04:27 +0100 +Subject: [PATCH] bash: update 5.0 -> 5.1 + Including m4 files directly like this confuses autotools.bbclass, remove the references and rely upon aclocal to collect the m4 files together as needed instead making it work like other autotools based projects. @@ -5,17 +10,23 @@ as needed instead making it work like other autotools based projects. Upstream-Status: Inappropriate [OE configuration specific] RP 2021/1/20 -Index: bash-5.1/configure.ac -=================================================================== ---- bash-5.1.orig/configure.ac -+++ bash-5.1/configure.ac -@@ -688,47 +688,6 @@ if test x$SIZE = x; then +--- + configure.ac | 43 ------------------------------------------- + 1 file changed, 43 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 50a6e20..a3b5bd7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -710,49 +710,6 @@ if test x$SIZE = x; then fi AC_SUBST(SIZE) -m4_include([m4/stat-time.m4]) -m4_include([m4/timespec.m4]) - +-m4_include([m4/strtoimax.m4]) +- -dnl include files for gettext - -m4_include([m4/codeset.m4]) @@ -54,6 +65,6 @@ Index: bash-5.1/configure.ac -m4_include([m4/wint_t.m4]) -m4_include([m4/xsize.m4]) - - dnl Turn on any extensions available in the GNU C library. - AC_DEFINE(_GNU_SOURCE, 1) - + dnl C compiler characteristics + AC_C_CONST + AC_C_INLINE diff --git a/poky/meta/recipes-extended/bash/bash_5.1.16.bb b/poky/meta/recipes-extended/bash/bash_5.2.9.bb index d046faa4e5..39a5d3de86 100644 --- a/poky/meta/recipes-extended/bash/bash_5.1.16.bb +++ b/poky/meta/recipes-extended/bash/bash_5.2.9.bb @@ -5,7 +5,6 @@ LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ - file://execute_cmd.patch \ file://mkbuiltins_have_stringize.patch \ file://build-tests.patch \ file://test-output.patch \ @@ -13,11 +12,9 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ file://run-bash-ptests \ file://fix-run-builtins.patch \ file://use_aclocal.patch \ - file://makerace.patch \ - file://makerace2.patch \ " -SRC_URI[tarball.sha256sum] = "5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558" +SRC_URI[tarball.sha256sum] = "68d978264253bc933d692f1de195e2e5b463a3984dfb4e5504b076865f16b6dd" DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" diff --git a/poky/meta/recipes-extended/libidn/libidn2_2.3.3.bb b/poky/meta/recipes-extended/libidn/libidn2_2.3.4.bb index a86b2b5a8d..b48de39fa0 100644 --- a/poky/meta/recipes-extended/libidn/libidn2_2.3.3.bb +++ b/poky/meta/recipes-extended/libidn/libidn2_2.3.4.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d834ea7d480438ada04e5d846152395 \ " SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz" -SRC_URI[sha256sum] = "f3ac987522c00d33d44b323cae424e2cffcb4c63c6aa6cd1376edacbf1c36eb0" +SRC_URI[sha256sum] = "93caba72b4e051d1f8d4f5a076ab63c99b77faee019b72b9783b267986dbb45f" DEPENDS = "virtual/libiconv libunistring" diff --git a/poky/meta/recipes-extended/lsof/lsof_4.96.3.bb b/poky/meta/recipes-extended/lsof/lsof_4.96.4.bb index c32fcd5583..bdd883d0ce 100644 --- a/poky/meta/recipes-extended/lsof/lsof_4.96.3.bb +++ b/poky/meta/recipes-extended/lsof/lsof_4.96.4.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429 SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \ file://remove-host-information.patch" -SRCREV = "eec10fac8f57544e26ff00bf41a2dc09c56049bf" +SRCREV = "669c33a253e414feb60fbbcf2984c25dc413cd75" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-kvm-Fix-stack-access-mode-in-KVM-test-ELF-headers.patch b/poky/meta/recipes-extended/ltp/ltp/0001-kvm-Fix-stack-access-mode-in-KVM-test-ELF-headers.patch deleted file mode 100644 index 764e9c0d9f..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-kvm-Fix-stack-access-mode-in-KVM-test-ELF-headers.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 608fc7bcda43e60536ae1f19842f7affba8f0aea Mon Sep 17 00:00:00 2001 -From: Martin Doucha <mdoucha@suse.cz> -Date: Wed, 1 Jun 2022 16:16:34 +0200 -Subject: [PATCH] kvm: Fix stack access mode in KVM test ELF headers - -When the linker converts guest payload binary into a linkable resource -object file, it somehow defaults to requesting executable stack section -for the final test binary. This trips some build-time security checks -on newer systems. Add explicit linker option to make the stack -non-executable. - -Suggested-by: Fabian Vogt <fvogt@suse.com> -Signed-off-by: Martin Doucha <mdoucha@suse.cz> -Reviewed-by: Petr Vorel <pvorel@suse.cz> -Reviewed-by: Cyril Hrubis <chrubis@suse.cz> - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/f9715d7c2e78713e26533c6e0846aaabf5c4095b] ---- - testcases/kernel/kvm/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/testcases/kernel/kvm/Makefile b/testcases/kernel/kvm/Makefile -index 69a9946fe..adab56952 100644 ---- a/testcases/kernel/kvm/Makefile -+++ b/testcases/kernel/kvm/Makefile -@@ -50,11 +50,11 @@ include $(top_srcdir)/include/mk/generic_leaf_target.mk - ifdef VERBOSE - $(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o $*-payload.elf $^ $(GUEST_LDLIBS) - objcopy -O binary -j .init.boot -j .text -j .data -j .init -j .preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin -- ld -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin -+ ld -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin - else - @$(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o $*-payload.elf $^ $(GUEST_LDLIBS) - @objcopy -O binary -j .init.boot -j .text -j .data -j .init -j .preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin -- @ld -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin -+ @ld -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin - @echo KVM_CC $(target_rel_dir)$@ - endif - @rm $*-payload.elf $*-payload.bin diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-lapi-fsmount-resolve-conflict-in-different-header-fi.patch b/poky/meta/recipes-extended/ltp/ltp/0001-lapi-fsmount-resolve-conflict-in-different-header-fi.patch deleted file mode 100644 index cdbcf6b288..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-lapi-fsmount-resolve-conflict-in-different-header-fi.patch +++ /dev/null @@ -1,71 +0,0 @@ -From b857f8723f30a4b9554bf6b0ff8fa52fd07e8b60 Mon Sep 17 00:00:00 2001 -From: Li Wang <liwang@redhat.com> -Date: Fri, 5 Aug 2022 14:34:01 +0800 -Subject: [PATCH] lapi/fsmount: resolve conflict in different header files - -The latest glibc added new wrappers (e.g. mount_setattr, fsopen) support -in sys/mount.h, which partly conflicts with linux/mount.h at the same time. - -We need to make adjustments to header files to fix compiling error on -different platforms. - -Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/b857f8723f30a4b9554bf6b0ff8fa52fd07e8b60] -Signed-off-by: Li Wang <liwang@redhat.com> -Reviewed-by: Petr Vorel <pvorel@suse.cz> ---- - configure.ac | 1 + - include/lapi/fs.h | 6 ++++-- - include/lapi/fsmount.h | 7 +++++-- - 3 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d50ec1ea7..dbd53cab6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -113,6 +113,7 @@ AC_CHECK_FUNCS_ONCE([ \ - mkdirat \ - mknodat \ - modify_ldt \ -+ mount_setattr \ - move_mount \ - name_to_handle_at \ - open_tree \ -diff --git a/include/lapi/fs.h b/include/lapi/fs.h -index 27b3a183c..84a168a67 100644 ---- a/include/lapi/fs.h -+++ b/include/lapi/fs.h -@@ -6,8 +6,10 @@ - * Email: code@zilogic.com - */ - --#ifdef HAVE_LINUX_FS_H --# include <linux/fs.h> -+#ifndef HAVE_MOUNT_SETATTR -+# ifdef HAVE_LINUX_FS_H -+# include <linux/fs.h> -+# endif - #endif - - #include <sys/user.h> -diff --git a/include/lapi/fsmount.h b/include/lapi/fsmount.h -index b11e7a7bd..07eb42ffa 100644 ---- a/include/lapi/fsmount.h -+++ b/include/lapi/fsmount.h -@@ -11,9 +11,12 @@ - #include "config.h" - #include <sys/syscall.h> - #include <sys/types.h> -+#include <sys/mount.h> - --#ifdef HAVE_LINUX_MOUNT_H --# include <linux/mount.h> -+#ifndef HAVE_FSOPEN -+# ifdef HAVE_LINUX_MOUNT_H -+# include <linux/mount.h> -+# endif - #endif - - #include "lapi/fcntl.h" --- -2.37.2 - diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-lapi-pidfd-adding-pidfd-header-file.patch b/poky/meta/recipes-extended/ltp/ltp/0001-lapi-pidfd-adding-pidfd-header-file.patch deleted file mode 100644 index 184c42640a..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-lapi-pidfd-adding-pidfd-header-file.patch +++ /dev/null @@ -1,60 +0,0 @@ -From dbc9c14c92a5acf450d07868a735ac8cd6ec5b90 Mon Sep 17 00:00:00 2001 -From: Li Wang <liwang@redhat.com> -Date: Fri, 5 Aug 2022 14:34:00 +0800 -Subject: [PATCH] lapi/pidfd: adding pidfd header file -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The newer Glibc already provided wrapper for the series pidfd syscall, -so let's include the header file conditionally. - - # rpm -q glibc-devel - glibc-devel-2.35.9000-31.fc37.ppc64le - # rpm -ql glibc-devel | grep pidfd - /usr/include/sys/pidfd.h - -To get rid of compiling error from fedora-rawhide: - - tst_safe_macros.c: In function ‘safe_pidfd_open’: - tst_safe_macros.c:135:16: error: implicit declaration of function ‘pidfd_open’ [-Werror=implicit-function-declaration] - 135 | rval = pidfd_open(pid, flags); - | ^~~~~~~~~~ - -Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/dbc9c14c92a5acf450d07868a735ac8cd6ec5b90] -Signed-off-by: Li Wang <liwang@redhat.com> -Reviewed-by: Petr Vorel <pvorel@suse.cz> ---- - configure.ac | 1 + - include/lapi/pidfd.h | 3 +++ - 2 files changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 69b145b5f..d50ec1ea7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,6 +71,7 @@ AC_CHECK_HEADERS_ONCE([ \ - sys/epoll.h \ - sys/fanotify.h \ - sys/inotify.h \ -+ sys/pidfd.h - sys/prctl.h \ - sys/shm.h \ - sys/timerfd.h \ -diff --git a/include/lapi/pidfd.h b/include/lapi/pidfd.h -index 244d3acaf..9ca8e5aa2 100644 ---- a/include/lapi/pidfd.h -+++ b/include/lapi/pidfd.h -@@ -8,6 +8,9 @@ - #define LAPI_PIDFD_H__ - - #include <fcntl.h> -+#ifdef HAVE_SYS_PIDFD_H -+# include <sys/pidfd.h> -+#endif - #include "config.h" - #include "lapi/syscalls.h" - --- -2.37.2 - diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch b/poky/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch deleted file mode 100644 index 726f6212f3..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch +++ /dev/null @@ -1,121 +0,0 @@ -From bda92ad659a52d38ac810099f69adff626b064c6 Mon Sep 17 00:00:00 2001 -From: Joerg Vehlow <joerg.vehlow@aox.de> -Date: Mon, 27 Jun 2022 10:44:49 +0200 -Subject: [PATCH] memcg/functional: Fix usage of PAGESIZE from memcg_lib.sh - -$PAGESIZES is set in memcg_lib.sh, which was moved to the bottom of the file. - -Fixes: 04021637f ("tst_test.sh: Cleanup getopts usage") - -Reviewed-by: Petr Vorel <pvorel@suse.cz> -Signed-off-by: Joerg Vehlow <joerg.vehlow@aox.de> -Upstream-Status: Backport [bda92ad659a52d38ac810099f69adff626b064c6] ---- - .../controllers/memcg/functional/memcg_failcnt.sh | 7 ++++--- - .../memcg/functional/memcg_max_usage_in_bytes_test.sh | 10 +++++----- - .../memcg/functional/memcg_subgroup_charge.sh | 8 ++++---- - .../memcg/functional/memcg_usage_in_bytes_test.sh | 10 +++++----- - 4 files changed, 18 insertions(+), 17 deletions(-) - -diff --git a/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh b/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh -index 1fed01569..1be98a056 100755 ---- a/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh -+++ b/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh -@@ -12,9 +12,6 @@ MEMCG_TESTFUNC=test - MEMCG_SHMMAX=1 - TST_TEST_DATA="--mmap-anon --mmap-file --shm" - --MEMORY_LIMIT=$PAGESIZE --MEMORY_TO_ALLOCATE=$((MEMORY_LIMIT * 2)) -- - test() - { - ROD echo $MEMORY_LIMIT \> memory.limit_in_bytes -@@ -36,4 +33,8 @@ test() - } - - . memcg_lib.sh -+ -+MEMORY_LIMIT=$PAGESIZE -+MEMORY_TO_ALLOCATE=$((MEMORY_LIMIT * 2)) -+ - tst_run -diff --git a/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh b/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh -index d1ffbe053..302810513 100755 ---- a/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh -+++ b/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh -@@ -9,11 +9,6 @@ - MEMCG_TESTFUNC=test - TST_CNT=4 - -- --MEM_TO_ALLOC=$((PAGESIZE * 1024)) --MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE)) --MEM_LIMIT=$((MEM_TO_ALLOC * 2)) -- - # Run test cases which checks memory.[memsw.]max_usage_in_bytes after make - # some memory allocation - test_max_usage_in_bytes() -@@ -88,4 +83,9 @@ test4() - } - - . memcg_lib.sh -+ -+MEM_TO_ALLOC=$((PAGESIZE * 1024)) -+MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE)) -+MEM_LIMIT=$((MEM_TO_ALLOC * 2)) -+ - tst_run -diff --git a/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh b/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh -index 08b6697d4..9bcc01258 100755 ---- a/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh -+++ b/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh -@@ -12,10 +12,6 @@ - MEMCG_TESTFUNC=test - TST_CNT=3 - -- --# Allocate memory bigger than per-cpu kernel memory --MEM_TO_ALLOC=$((PAGESIZES * 2)) -- - # Test the memory charge won't move to subgroup - # $1 - memory.limit_in_bytes in sub group - test_subgroup() -@@ -67,4 +63,8 @@ test3() - } - - . memcg_lib.sh -+ -+# Allocate memory bigger than per-cpu kernel memory -+MEM_TO_ALLOC=$((PAGESIZES * 2)) -+ - tst_run -diff --git a/testcases/kernel/controllers/memcg/functional/memcg_usage_in_bytes_test.sh b/testcases/kernel/controllers/memcg/functional/memcg_usage_in_bytes_test.sh -index 6f932124e..125d88e55 100755 ---- a/testcases/kernel/controllers/memcg/functional/memcg_usage_in_bytes_test.sh -+++ b/testcases/kernel/controllers/memcg/functional/memcg_usage_in_bytes_test.sh -@@ -9,11 +9,6 @@ - MEMCG_TESTFUNC=test - TST_CNT=2 - -- --MEM_TO_ALLOC=$((PAGESIZE * 1024)) --MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE)) --MEM_LIMIT=$((MEM_TO_ALLOC * 2)) -- - test1() - { - tst_res TINFO "Test memory.usage_in_bytes" -@@ -35,4 +30,9 @@ test2() - } - - . memcg_lib.sh -+ -+MEM_TO_ALLOC=$((PAGESIZE * 1024)) -+MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE)) -+MEM_LIMIT=$((MEM_TO_ALLOC * 2)) -+ - tst_run --- -2.37.1 - diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch b/poky/meta/recipes-extended/ltp/ltp/0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch deleted file mode 100644 index 1339c603b9..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 6d4c8343d33e7d8fa059246310413f029a9e8573 Mon Sep 17 00:00:00 2001 -From: Li Wang <liwang@redhat.com> -Date: Thu, 7 Jul 2022 17:38:45 +0800 -Subject: [PATCH] mountns0[1-3]: wait for umount completed in thread_b - -To get rid of race condition (occurs with umount_folders): - - mountns01.c:42: TPASS: shared mount in parent passed - mountns01.c:83: TPASS: shared mount in child passed - tst_device.c:394: TWARN: umount('B') failed with EINVAL - mountns.h:39: TWARN: umount(B) failed: EINVAL (22) - -Signed-off-by: Li Wang <liwang@redhat.com> -Reviewed-by: Yang Xu <xuyang2018.jy@fujitsu.com> -Upstream-Status: Backport [6d4c8343d33e7d8fa059246310413f029a9e8573] ---- - testcases/kernel/containers/mountns/mountns01.c | 2 ++ - testcases/kernel/containers/mountns/mountns02.c | 2 ++ - testcases/kernel/containers/mountns/mountns03.c | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/testcases/kernel/containers/mountns/mountns01.c b/testcases/kernel/containers/mountns/mountns01.c -index e99134aba..e8f176920 100644 ---- a/testcases/kernel/containers/mountns/mountns01.c -+++ b/testcases/kernel/containers/mountns/mountns01.c -@@ -86,6 +86,8 @@ static void run(void) - - TST_CHECKPOINT_WAKE(0); - -+ SAFE_WAIT(NULL); -+ - SAFE_UMOUNT(DIRA); - } - -diff --git a/testcases/kernel/containers/mountns/mountns02.c b/testcases/kernel/containers/mountns/mountns02.c -index 258b61217..4b85fa79b 100644 ---- a/testcases/kernel/containers/mountns/mountns02.c -+++ b/testcases/kernel/containers/mountns/mountns02.c -@@ -87,6 +87,8 @@ static void run(void) - - TST_CHECKPOINT_WAKE(0); - -+ SAFE_WAIT(NULL); -+ - SAFE_UMOUNT(DIRA); - } - -diff --git a/testcases/kernel/containers/mountns/mountns03.c b/testcases/kernel/containers/mountns/mountns03.c -index f37ae7902..1d26a25d8 100644 ---- a/testcases/kernel/containers/mountns/mountns03.c -+++ b/testcases/kernel/containers/mountns/mountns03.c -@@ -97,6 +97,8 @@ static void run(void) - - TST_CHECKPOINT_WAKE(0); - -+ SAFE_WAIT(NULL); -+ - SAFE_UMOUNT(DIRA); - } - --- -2.37.1 - diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch b/poky/meta/recipes-extended/ltp/ltp/0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch deleted file mode 100644 index f747a1f97f..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch +++ /dev/null @@ -1,154 +0,0 @@ -From 33c156e295e35d4839a135d8ba5db485b7712ced Mon Sep 17 00:00:00 2001 -From: Joerg Vehlow <joerg.vehlow@aox.de> -Date: Mon, 27 Jun 2022 09:27:09 +0200 -Subject: [PATCH] net_stress: Fix usage of variables from tst_net.sh - -These tests use variables (NS_TIMES, IP_TOTAL, ROUTE_TOTAL -and IF_UPDOWN_TIMES) from tst_net.sh, before sourcing it. - -Fixes: 04021637f ("tst_test.sh: Cleanup getopts usage") - -Reviewed-by: Petr Vorel <pvorel@suse.cz> -Signed-off-by: Joerg Vehlow <joerg.vehlow@aox.de> -Upstream-Status: Backport [33c156e295e35d4839a135d8ba5db485b7712ced] ---- - testcases/network/stress/interface/if-addr-adddel.sh | 7 ++++--- - testcases/network/stress/interface/if-addr-addlarge.sh | 7 ++++--- - testcases/network/stress/interface/if-route-adddel.sh | 5 +++-- - testcases/network/stress/interface/if-route-addlarge.sh | 5 +++-- - testcases/network/stress/interface/if-updown.sh | 5 +++-- - testcases/network/stress/interface/if4-addr-change.sh | 4 +++- - 6 files changed, 20 insertions(+), 13 deletions(-) - -diff --git a/testcases/network/stress/interface/if-addr-adddel.sh b/testcases/network/stress/interface/if-addr-adddel.sh -index cb453e612..0750501f0 100755 ---- a/testcases/network/stress/interface/if-addr-adddel.sh -+++ b/testcases/network/stress/interface/if-addr-adddel.sh -@@ -7,9 +7,6 @@ - - IF_CMD='ifconfig' - --# The interval of the check interface activity --CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} -- - test_body() - { - local cmd="$CMD" -@@ -89,4 +86,8 @@ test_body() - } - - . if-lib.sh -+ -+# The interval of the check interface activity -+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} -+ - tst_run -diff --git a/testcases/network/stress/interface/if-addr-addlarge.sh b/testcases/network/stress/interface/if-addr-addlarge.sh -index 3c876c17d..d0759c86b 100755 ---- a/testcases/network/stress/interface/if-addr-addlarge.sh -+++ b/testcases/network/stress/interface/if-addr-addlarge.sh -@@ -7,9 +7,6 @@ - - IF_CMD='ifconfig' - --# The interval of the check interface activity --CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IP_TOTAL / 20))} -- - test_body() - { - local cmd="$CMD" -@@ -110,4 +107,8 @@ test_body() - } - - . if-lib.sh -+ -+# The interval of the check interface activity -+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IP_TOTAL / 20))} -+ - tst_run -diff --git a/testcases/network/stress/interface/if-route-adddel.sh b/testcases/network/stress/interface/if-route-adddel.sh -index b50da268a..51445e4f7 100755 ---- a/testcases/network/stress/interface/if-route-adddel.sh -+++ b/testcases/network/stress/interface/if-route-adddel.sh -@@ -7,8 +7,6 @@ - - IF_CMD='route' - --CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} -- - test_body() - { - local cmd="$CMD" -@@ -64,4 +62,7 @@ test_body() - } - - . if-lib.sh -+ -+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} -+ - tst_run -diff --git a/testcases/network/stress/interface/if-route-addlarge.sh b/testcases/network/stress/interface/if-route-addlarge.sh -index 7d09d1216..355b6b4ab 100755 ---- a/testcases/network/stress/interface/if-route-addlarge.sh -+++ b/testcases/network/stress/interface/if-route-addlarge.sh -@@ -7,8 +7,6 @@ - - IF_CMD='route' - --CHECK_INTERVAL=${CHECK_INTERVAL:-$(($ROUTE_TOTAL / 20))} -- - test_body() - { - local cmd="$CMD" -@@ -76,4 +74,7 @@ test_body() - } - - . if-lib.sh -+ -+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($ROUTE_TOTAL / 20))} -+ - tst_run -diff --git a/testcases/network/stress/interface/if-updown.sh b/testcases/network/stress/interface/if-updown.sh -index 9a5709c85..71c78d785 100755 ---- a/testcases/network/stress/interface/if-updown.sh -+++ b/testcases/network/stress/interface/if-updown.sh -@@ -8,8 +8,6 @@ - IF_CMD='ifconfig' - TST_CLEANUP="if_cleanup_restore" - --CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IF_UPDOWN_TIMES / 20))} -- - test_body() - { - local cmd="$CMD" -@@ -47,4 +45,7 @@ test_body() - } - - . if-lib.sh -+ -+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IF_UPDOWN_TIMES / 20))} -+ - tst_run -diff --git a/testcases/network/stress/interface/if4-addr-change.sh b/testcases/network/stress/interface/if4-addr-change.sh -index b9ece2af9..f162e6a51 100755 ---- a/testcases/network/stress/interface/if4-addr-change.sh -+++ b/testcases/network/stress/interface/if4-addr-change.sh -@@ -9,7 +9,6 @@ TST_CLEANUP="do_cleanup" - TST_TESTFUNC="test_body" - TST_NEEDS_CMDS="ifconfig" - --CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} - # Maximum host portion of the IPv4 address on the local host - LHOST_IPV4_HOST_MAX="254" - -@@ -61,4 +60,7 @@ test_body() - } - - . tst_net.sh -+ -+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))} -+ - tst_run --- -2.37.1 - diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-netstress-Restore-runtime-to-5m.patch b/poky/meta/recipes-extended/ltp/ltp/0001-netstress-Restore-runtime-to-5m.patch deleted file mode 100644 index 8acfaf7c8e..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-netstress-Restore-runtime-to-5m.patch +++ /dev/null @@ -1,53 +0,0 @@ -From cc4a27c235d0cf69a55cd8829b232566b0223333 Mon Sep 17 00:00:00 2001 -From: Petr Vorel <pvorel@suse.cz> -Date: Wed, 13 Jul 2022 09:46:14 +0200 -Subject: [PATCH] netstress: Restore runtime to 5m - -netstress requires the previous default timeout 5m due longer timeout -for higher message sizes (e.g. 65535): - -./sctp_ipsec.sh -6 -p comp -m transport -s 100:1000:65535:R65535 -sctp_ipsec 1 TPASS: netstress passed, median time 5 ms, data: 5 9 6 5 5 -sctp_ipsec 2 TINFO: run server 'netstress -T sctp -S fd00:1:1:1::1 -D ltp_ns_veth1 -R 500000 -B /tmp/LTP_sctp_ipsec.ARZbGkvjPa' -sctp_ipsec 2 TINFO: run client 'netstress -l -T sctp -H fd00:1:1:1::1 -n 1000 -N 1000 -S fd00:1:1:1::2 -D ltp_ns_veth2 -a 2 -r 100 -d /tmp/LTP_sctp_ipsec.ARZbGkvjPa/tst_netload.res' 5 times -sctp_ipsec 2 TPASS: netstress passed, median time 6 ms, data: 8 6 6 5 6 -sctp_ipsec 3 TINFO: run server 'netstress -T sctp -S fd00:1:1:1::1 -D ltp_ns_veth1 -R 500000 -B /tmp/LTP_sctp_ipsec.ARZbGkvjPa' -sctp_ipsec 3 TINFO: run client 'netstress -l -T sctp -H fd00:1:1:1::1 -n 65535 -N 65535 -S fd00:1:1:1::2 -D ltp_ns_veth2 -a 2 -r 100 -d /tmp/LTP_sctp_ipsec.ARZbGkvjPa/tst_netload.res' 5 times -sctp_ipsec 3 TWARN: netstress failed, ret: 2 -tst_test.c:1526: TINFO: Timeout per run is 0h 00m 30s -netstress.c:896: TINFO: IP_BIND_ADDRESS_NO_PORT is used -netstress.c:898: TINFO: connection: addr 'fd00:1:1:1::1', port '55097' -netstress.c:900: TINFO: client max req: 100 -netstress.c:901: TINFO: clients num: 2 -netstress.c:906: TINFO: client msg size: 65535 -netstress.c:907: TINFO: server msg size: 65535 -netstress.c:979: TINFO: SCTP client -netstress.c:475: TINFO: Running the test over IPv6 -Test timeouted, sending SIGKILL! -tst_test.c:1577: TINFO: If you are running on slow machine, try exporting LTP_TIMEOUT_MUL > 1 -tst_test.c:1579: TBROK: Test killed! (timeout?) - -Converting netstress.c to use TST_NO_DEFAULT_MAIN (i.e. implementing main) -would require more changes, because it uses .forks_child, .needs_checkpoints, -cleanup function. - -Signed-off-by: Petr Vorel <pvorel@suse.cz> -Upstream-Status: Backport [cc4a27c235d0cf69a55cd8829b232566b0223333] ---- - testcases/network/netstress/netstress.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testcases/network/netstress/netstress.c b/testcases/network/netstress/netstress.c -index 6c9e83112..7c222531d 100644 ---- a/testcases/network/netstress/netstress.c -+++ b/testcases/network/netstress/netstress.c -@@ -1028,5 +1028,6 @@ static struct tst_test test = { - {"B:", &server_bg, "Run in background, arg is the process directory"}, - {} - }, -+ .max_runtime = 300, - .needs_checkpoints = 1, - }; --- -2.37.1 - diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-nfs05_make_tree-Restore-5-min-timeout.patch b/poky/meta/recipes-extended/ltp/ltp/0001-nfs05_make_tree-Restore-5-min-timeout.patch deleted file mode 100644 index 2b9557ad01..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-nfs05_make_tree-Restore-5-min-timeout.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 463da729537faa6d5ef206912fdec871c1059dac Mon Sep 17 00:00:00 2001 -From: Petr Vorel <pvorel@suse.cz> -Date: Thu, 16 Jun 2022 16:33:31 +0200 -Subject: [PATCH] nfs05_make_tree: Restore 5 min timeout - -nfs05_make_tree is a long running test. The previous default timeout 5 -min was enough after reducing runtime in 05be61cf6. - -But the new default 30 sec introduced in the concept of max runtime is -definitely not enough. Restore the previous timeout 5 min. - -Signed-off-by: Petr Vorel <pvorel@suse.cz> - -Upstream-Status: Backport [463da729537faa6d5ef206912fdec871c1059dac] ---- - testcases/network/nfs/nfs_stress/nfs05_make_tree.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testcases/network/nfs/nfs_stress/nfs05_make_tree.c b/testcases/network/nfs/nfs_stress/nfs05_make_tree.c -index fdc13bd5d..5456c1bf0 100644 ---- a/testcases/network/nfs/nfs_stress/nfs05_make_tree.c -+++ b/testcases/network/nfs/nfs_stress/nfs05_make_tree.c -@@ -215,4 +215,5 @@ static struct tst_test test = { - .options = opts, - .test_all = do_test, - .setup = setup, -+ .max_runtime = 300, - }; --- -2.37.1 - diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-rt-migrate-Use-int-instead-of-pthread_t-for-thread-I.patch b/poky/meta/recipes-extended/ltp/ltp/0001-rt-migrate-Use-int-instead-of-pthread_t-for-thread-I.patch deleted file mode 100644 index e49f53a9e2..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-rt-migrate-Use-int-instead-of-pthread_t-for-thread-I.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 11e503344c36c1c7df3e455d81736dc4a5b43775 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 23 Aug 2022 23:20:53 -0700 -Subject: [PATCH] rt-migrate: Use int instead of pthread_t for thread IDs - -pthread_t is opaque, but create_fifo_thread() returns integer therefore -on musl where thread_t is not integer, this fails to compile e.g. - -| rt-migrate.c:450:14: error: incompatible integer to pointer conversion assigning to 'pthread_t' (aka 'struct __pthread *') from 'int' [-Wint-conversion] -| threads[i] = create_fifo_thread(start_task, (void *)i, -| ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Align the types used to fix the problems. - -Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2022-August/030239.html] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - testcases/realtime/func/rt-migrate/rt-migrate.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/testcases/realtime/func/rt-migrate/rt-migrate.c b/testcases/realtime/func/rt-migrate/rt-migrate.c -index 3e6c82a2fb..97ab604c7f 100644 ---- a/testcases/realtime/func/rt-migrate/rt-migrate.c -+++ b/testcases/realtime/func/rt-migrate/rt-migrate.c -@@ -394,7 +394,7 @@ static void stop_log(int sig) - - int main(int argc, char **argv) - { -- pthread_t *threads; -+ int *threads; - long i; - int ret; - struct timespec intv; --- -2.37.2 - diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch b/poky/meta/recipes-extended/ltp/ltp/0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch deleted file mode 100644 index 1652f8c94e..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9fb28002bb2ce988b99d1756ff7b902f76e3472a Mon Sep 17 00:00:00 2001 -From: Jan Stancek <jstancek@redhat.com> -Date: Tue, 21 Jun 2022 10:37:17 +0200 -Subject: [PATCH] syscalls/migrate_pages03: restore runtime to 5m - -Arches with large pages have trouble completing all loops in 30s, -restore runtime to 5m. Also check for remaining runtime and -exit if we run out. - -Signed-off-by: Jan Stancek <jstancek@redhat.com> -Reviewed-by: Cyril Hrubis <chrubis@suse.cz> -Signed-off-by: Li Wang <liwang@redhat.com> -Upstream-Status: Backport [9fb28002bb2ce988b99d1756ff7b902f76e3472a] ---- - testcases/kernel/syscalls/migrate_pages/migrate_pages03.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/testcases/kernel/syscalls/migrate_pages/migrate_pages03.c b/testcases/kernel/syscalls/migrate_pages/migrate_pages03.c -index c6afb4cce..2866c96e6 100644 ---- a/testcases/kernel/syscalls/migrate_pages/migrate_pages03.c -+++ b/testcases/kernel/syscalls/migrate_pages/migrate_pages03.c -@@ -127,6 +127,11 @@ static void migrate_test(void) - tst_res(TFAIL | TERRNO, "migrate_pages() failed"); - return; - } -+ -+ if (!tst_remaining_runtime()) { -+ tst_res(TINFO, "Out of runtime, exitting..."); -+ break; -+ } - } - SAFE_SETEUID(0); - -@@ -134,6 +139,7 @@ static void migrate_test(void) - } - - static struct tst_test test = { -+ .max_runtime = 300, - .min_kver = "2.6.32", - .needs_root = 1, - .setup = setup, --- -2.37.1 - diff --git a/poky/meta/recipes-extended/ltp/ltp/0002-kvm-use-LD-instead-of-hardcoding-ld.patch b/poky/meta/recipes-extended/ltp/ltp/0002-kvm-use-LD-instead-of-hardcoding-ld.patch deleted file mode 100644 index 060ba05835..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0002-kvm-use-LD-instead-of-hardcoding-ld.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1cea308a647c2a2f9790b0bac7c523de7aa83270 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Tue, 12 Jul 2022 15:03:54 +0100 -Subject: [PATCH] kvm: use $(LD) instead of hardcoding ld - -In cross-compiled builds the host ld may not know the required ELF format, -so ensure we use $(LD) which will be the cross-capable ld binary. - -Closes: https://github.com/linux-test-project/ltp/pull/948 - -Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/f94e0ef3b7280f886384703ef9019aaf2f2dfebb] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -Reviewed-by: Petr Vorel <pvorel@suse.cz> -Reviewed-by: Martin Doucha <mdoucha@suse.cz> -Signed-off-by: Ross Burton <ross.burton@arm.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - testcases/kernel/kvm/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/testcases/kernel/kvm/Makefile b/testcases/kernel/kvm/Makefile -index adab56952..d67230735 100644 ---- a/testcases/kernel/kvm/Makefile -+++ b/testcases/kernel/kvm/Makefile -@@ -50,11 +50,11 @@ include $(top_srcdir)/include/mk/generic_leaf_target.mk - ifdef VERBOSE - $(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o $*-payload.elf $^ $(GUEST_LDLIBS) - objcopy -O binary -j .init.boot -j .text -j .data -j .init -j .preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin -- ld -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin -+ $(LD) -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin - else - @$(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o $*-payload.elf $^ $(GUEST_LDLIBS) - @objcopy -O binary -j .init.boot -j .text -j .data -j .init -j .preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin -- @ld -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin -+ @$(LD) -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin - @echo KVM_CC $(target_rel_dir)$@ - endif - @rm $*-payload.elf $*-payload.bin diff --git a/poky/meta/recipes-extended/ltp/ltp/0003-Add-KVM_LD-Makefile-variable-for-building-KVM-payloa.patch b/poky/meta/recipes-extended/ltp/ltp/0003-Add-KVM_LD-Makefile-variable-for-building-KVM-payloa.patch deleted file mode 100644 index 974ca5eebe..0000000000 --- a/poky/meta/recipes-extended/ltp/ltp/0003-Add-KVM_LD-Makefile-variable-for-building-KVM-payloa.patch +++ /dev/null @@ -1,63 +0,0 @@ -From a8d41b7937a34904611011ca357f8db880d42270 Mon Sep 17 00:00:00 2001 -From: Martin Doucha <mdoucha@suse.cz> -Date: Mon, 25 Jul 2022 17:37:27 +0200 -Subject: [PATCH] Add KVM_LD Makefile variable for building KVM payload - binaries - -KVM linker needs to be configurable for cross-compiling but some -linkers don't support the linker script for wrapping arbitrary files -into linkable resource files. Allow KVM linker to be changed -independently of $LD via $KVM_LD. - -Signed-off-by: Martin Doucha <mdoucha@suse.cz> -Acked-by: Richard Palethorpe <rpalethorpe@suse.com> - -Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/5ef0b7892a17b64040e55e9ad62d36ebb75d33fd] -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - doc/build-system-guide.txt | 5 +++++ - testcases/kernel/kvm/Makefile | 5 +++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/doc/build-system-guide.txt b/doc/build-system-guide.txt -index 166f7fb92..b8d267b4b 100644 ---- a/doc/build-system-guide.txt -+++ b/doc/build-system-guide.txt -@@ -145,6 +145,11 @@ $(CPPFLAGS) : Preprocessor flags, e.g. -I arguments. - - $(DEBUG_CFLAGS) : Debug flags to pass to $(CC), -g, etc. - -+$(KVM_LD) : Special linker for wrapping KVM payload binaries -+ into linkable object files. Defaults to $(LD). -+ Change this variable if the KVM Makefile fails -+ to build files named *-payload.o. -+ - $(LD) : The system linker (typically $(CC), but not - necessarily). - -diff --git a/testcases/kernel/kvm/Makefile b/testcases/kernel/kvm/Makefile -index d67230735..31f144c26 100644 ---- a/testcases/kernel/kvm/Makefile -+++ b/testcases/kernel/kvm/Makefile -@@ -11,6 +11,7 @@ GUEST_CPPFLAGS = $(CPPFLAGS) -DCOMPILE_PAYLOAD - GUEST_CFLAGS = -ffreestanding -O2 -Wall -fno-asynchronous-unwind-tables -mno-mmx -mno-sse - GUEST_LDFLAGS = -nostdlib -Wl,--build-id=none - GUEST_LDLIBS = -+KVM_LD ?= $(LD) - - FILTER_OUT_MAKE_TARGETS := lib_guest lib_host lib_x86 - -@@ -50,11 +51,11 @@ include $(top_srcdir)/include/mk/generic_leaf_target.mk - ifdef VERBOSE - $(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o $*-payload.elf $^ $(GUEST_LDLIBS) - objcopy -O binary -j .init.boot -j .text -j .data -j .init -j .preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin -- $(LD) -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin -+ $(KVM_LD) -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin - else - @$(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o $*-payload.elf $^ $(GUEST_LDLIBS) - @objcopy -O binary -j .init.boot -j .text -j .data -j .init -j .preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin -- @$(LD) -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin -+ @$(KVM_LD) -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin - @echo KVM_CC $(target_rel_dir)$@ - endif - @rm $*-payload.elf $*-payload.bin diff --git a/poky/meta/recipes-extended/ltp/ltp_20220527.bb b/poky/meta/recipes-extended/ltp/ltp_20220930.bb index b657a6adb1..405b17b637 100644 --- a/poky/meta/recipes-extended/ltp/ltp_20220527.bb +++ b/poky/meta/recipes-extended/ltp/ltp_20220930.bb @@ -24,23 +24,11 @@ TUNE_CCARGS:remove:x86-64 = "-mfpmath=sse" CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "6f88e0f6f1d6eb12c48c902f50f47ecbd3b0f18a" +SRCREV = "b763f81998f19f783982d3937d1fd05bcf649c16" SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ file://0001-Remove-OOM-tests-from-runtest-mm.patch \ file://disable_hanging_tests.patch \ - file://0001-kvm-Fix-stack-access-mode-in-KVM-test-ELF-headers.patch \ - file://0002-kvm-use-LD-instead-of-hardcoding-ld.patch \ - file://0003-Add-KVM_LD-Makefile-variable-for-building-KVM-payloa.patch \ - file://0001-nfs05_make_tree-Restore-5-min-timeout.patch \ - file://0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch \ - file://0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch \ - file://0001-netstress-Restore-runtime-to-5m.patch \ - file://0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch \ - file://0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch \ - file://0001-lapi-pidfd-adding-pidfd-header-file.patch \ - file://0001-lapi-fsmount-resolve-conflict-in-different-header-fi.patch \ - file://0001-rt-migrate-Use-int-instead-of-pthread_t-for-thread-I.patch \ " S = "${WORKDIR}/git" @@ -87,22 +75,9 @@ do_install(){ # OSDL's Scaleable Test Platform, but now http://khack.osdl.org unaccessible rm -rf ${D}${prefix}/bin/STPfailure_report.pl - # Copy POSIX test suite into ${D}${prefix}/testcases by manual - cp -r testcases/open_posix_testsuite ${D}${prefix}/testcases - - # Makefile were configured in the build system - find ${D}${prefix} -name Makefile | xargs -n 1 sed -i \ - -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ - -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ - -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ - -e 's@[^ ]*--sysroot=[^ "]*@@g' - # The controllers memcg_stree test seems to cause us hangs and takes 900s # (maybe we expect more regular output?), anyhow, skip it sed -e '/^memcg_stress/d' -i ${D}${prefix}/runtest/controllers - - # We don't need to ship the compile logs that open_posix_testsuite writes - rm -f ${D}${prefix}/testcases/open_posix_testsuite/logfile.* } RDEPENDS:${PN} = "\ diff --git a/poky/meta/recipes-extended/man-pages/man-pages_5.13.bb b/poky/meta/recipes-extended/man-pages/man-pages_6.01.bb index f8602c699e..1ad4ed1317 100644 --- a/poky/meta/recipes-extended/man-pages/man-pages_5.13.bb +++ b/poky/meta/recipes-extended/man-pages/man-pages_6.01.bb @@ -4,10 +4,10 @@ SECTION = "console/utils" HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://README;md5=92cd5ee2e0b35d782817e7e277b6ce4b" +LIC_FILES_CHKSUM = "file://README;md5=bf1faa9b0245e39a7c0c9690ffdf6e54" SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "ed615e9a31978833f59e7316667b9aeffbbdb0a92d1391f9c66fadc6e77d0da8" +SRC_URI[sha256sum] = "c1e8bea88589f1a80b67dafd82fb98b018ddd7f7bfa594f8f79686258d26e784" inherit manpages diff --git a/poky/meta/recipes-extended/sed/sed_4.8.bb b/poky/meta/recipes-extended/sed/sed_4.9.bb index 31e971aeac..c4d89c34b2 100644 --- a/poky/meta/recipes-extended/sed/sed_4.8.bb +++ b/poky/meta/recipes-extended/sed/sed_4.9.bb @@ -2,8 +2,8 @@ SUMMARY = "Stream EDitor (text filtering utility)" HOMEPAGE = "http://www.gnu.org/software/sed/" DESCRIPTION = "sed (stream editor) is a non-interactive command-line text editor." LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ - file://sed/sed.h;beginline=1;endline=15;md5=fb3c7e6fbca6f66943859153d4be8efe \ +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ + file://sed/sed.h;beginline=1;endline=15;md5=4e8e0f77bc4c1c2c02c2b90d3d24c670 \ " SECTION = "console/utils" @@ -11,8 +11,7 @@ SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.xz \ file://run-ptest \ " -SRC_URI[md5sum] = "6d906edfdb3202304059233f51f9a71d" -SRC_URI[sha256sum] = "f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633" +SRC_URI[sha256sum] = "6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181" inherit autotools texinfo update-alternatives gettext ptest diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng_0.14.06.bb b/poky/meta/recipes-extended/stress-ng/stress-ng_0.14.06.bb index 359560b9e2..b4068b0598 100644 --- a/poky/meta/recipes-extended/stress-ng/stress-ng_0.14.06.bb +++ b/poky/meta/recipes-extended/stress-ng/stress-ng_0.14.06.bb @@ -18,12 +18,15 @@ RCONFLICTS:${PN} = "stress" inherit bash-completion -do_compile:prepend() { +EXTRA_OEMAKE = "VERBOSE=1" + +do_configure() { mkdir -p configs touch configs/HAVE_APPARMOR + oe_runmake makeconfig } do_install() { - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} BINDIR=${bindir} install ln -s stress-ng ${D}${bindir}/stress } diff --git a/poky/meta/recipes-extended/sudo/sudo.inc b/poky/meta/recipes-extended/sudo/sudo.inc index 8947c46129..fd5bbf103d 100644 --- a/poky/meta/recipes-extended/sudo/sudo.inc +++ b/poky/meta/recipes-extended/sudo/sudo.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws" BUGTRACKER = "http://www.sudo.ws/bugs/" SECTION = "admin" LICENSE = "ISC & BSD-3-Clause & BSD-2-Clause & Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=16cf60b466f3a0606427a7b624a3a670 \ +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7aacba499777b719416b293d16f29c8c \ file://plugins/sudoers/redblack.c;beginline=1;endline=46;md5=03e35317699ba00b496251e0dfe9f109 \ file://lib/util/reallocarray.c;beginline=3;endline=15;md5=397dd45c7683e90b9f8bf24638cf03bf \ file://lib/util/fnmatch.c;beginline=3;endline=27;md5=004d7d2866ba1f5b41174906849d2e0f \ diff --git a/poky/meta/recipes-extended/sudo/sudo_1.9.11p3.bb b/poky/meta/recipes-extended/sudo/sudo_1.9.12p1.bb index ba610ee2e7..1495b67b8b 100644 --- a/poky/meta/recipes-extended/sudo/sudo_1.9.11p3.bb +++ b/poky/meta/recipes-extended/sudo/sudo_1.9.12p1.bb @@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[sha256sum] = "4687e7d2f56721708f59cca2e1352c056cb23de526c22725615a42bb094f1f70" +SRC_URI[sha256sum] = "475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8" DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" diff --git a/poky/meta/recipes-extended/sysstat/sysstat_12.6.0.bb b/poky/meta/recipes-extended/sysstat/sysstat_12.6.1.bb index 273c5c1815..6df7bdbb83 100644 --- a/poky/meta/recipes-extended/sysstat/sysstat_12.6.0.bb +++ b/poky/meta/recipes-extended/sysstat/sysstat_12.6.1.bb @@ -4,4 +4,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch" -SRC_URI[sha256sum] = "699fd948836d77f9ad0541fd5dcf75cd2505f9da4ec14df669286ad047c23d97" +SRC_URI[sha256sum] = "18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342" |