From 25c71d320198d41cf760dbea96840d352681dced Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Wed, 22 Feb 2017 05:04:50 -0500 Subject: ltp: upgrade to 20170116 1. Upgrade ltp from 20160126 to 20170116. 2. Delete some patches because these have been integrated in upstream. 0001-ltp-Don-t-link-against-libfl.patch 0006-sendfile-Use-off64_t-instead-of-__off64_t.patch 0007-replace-SIGCLD-with-SIGCHLD.patch 0009-Guard-error.h-with-__GLIBC__.patch 0012-fsstress.c-Replace-__int64_t-with-int64_t.patch 0013-include-fcntl.h-for-getting-O_-definitions.patch 0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch 0015-mincore01-Rename-PAGESIZE-to-pagesize.patch 0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch 0017-replace-sigval_t-with-union-sigval.patch 0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch 0022-include-sys-types.h.patch 0029-trace_shed-Fix-build-with-musl.patch 0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch 0032-regen.sh-Include-asm-unistd.h-explicitly.patch 0037-containers-netns_netlink-Avoid-segmentation-fault.patch 0038-run-posix-option-group-test-replace-CWD-qith-PWD.patch 0040-containers-userns05-use-unsigned-int-for-ns-id.patch 3. Add new patch based on Khem Raj's 0007-replace-SIGCLD-with-SIGCHLD.patch 0001-add-_GNU_SOURCE-to-pec_listener.c.patch 4. Add new patches fix building errors with musl: 0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch 0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch 0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch Add new patch fix building errors, when the distro is poky-lsb 0012-fix-faccessat01.c-build-fails-with-security-flags.patch 5. Modify some patches because the upstream contains changes, those patches maybe failed when they apply to the new version of ltp. 0011-Rename-sigset-variable-to-sigset1.patch 0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch 0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch 0035-fix-test_proc_kill-hang.patch 6. Rename and modify this patch. fcntl-fix-the-time-def-to-use-time_t.patch to 0039-fcntl-fix-the-time-def-to-use-time_t.patch 7. The new version of ltp add the checking for ksh and csh, we doesn't support ksh and csh in oe-core, so remove the checking files when the system executes do_install function. Signed-off-by: Dengke Du Signed-off-by: Ross Burton --- ...iners-userns05-use-unsigned-int-for-ns-id.patch | 60 ---------------------- 1 file changed, 60 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0040-containers-userns05-use-unsigned-int-for-ns-id.patch (limited to 'meta/recipes-extended/ltp/ltp/0040-containers-userns05-use-unsigned-int-for-ns-id.patch') diff --git a/meta/recipes-extended/ltp/ltp/0040-containers-userns05-use-unsigned-int-for-ns-id.patch b/meta/recipes-extended/ltp/ltp/0040-containers-userns05-use-unsigned-int-for-ns-id.patch deleted file mode 100644 index 4dee1f5a9b..0000000000 --- a/meta/recipes-extended/ltp/ltp/0040-containers-userns05-use-unsigned-int-for-ns-id.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 3b63d350e9fe9e4271916cc0abfac65a5d6419ff Mon Sep 17 00:00:00 2001 -From: Jiri Jaburek -Date: Tue, 7 Feb 2017 07:58:16 +0000 -Subject: [PATCH] containers/userns05: use unsigned int for ns id - -The kernel defines it as 'unsigned int' in 'struct ns_common' -and formats it as - - snprintf(buf, size, "%s:[%u]", ns_ops->name, ns->inum); - -This change makes the test work on 32bit systems where LONG_MAX -is smaller than UINT_MAX. - -Signed-off-by: Jiri Jaburek - -Upstream-Status: Backport - -Signed-off-by: He Zhe ---- - testcases/kernel/containers/userns/userns05.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/testcases/kernel/containers/userns/userns05.c b/testcases/kernel/containers/userns/userns05.c -index 8d8c40a..8eac729 100644 ---- a/testcases/kernel/containers/userns/userns05.c -+++ b/testcases/kernel/containers/userns/userns05.c -@@ -49,18 +49,18 @@ static int child_fn1(void) - return 0; - } - --static long getusernsidbypid(int pid) -+static unsigned int getusernsidbypid(int pid) - { - char path[BUFSIZ]; - char userid[BUFSIZ]; -- long id = 0; -+ unsigned int id = 0; - - sprintf(path, "/proc/%d/ns/user", pid); - - if (readlink(path, userid, BUFSIZ) == -1) - tst_resm(TFAIL | TERRNO, "readlink failure."); - -- if (sscanf(userid, "user:[%ld]", &id) != 1) -+ if (sscanf(userid, "user:[%u]", &id) != 1) - tst_resm(TFAIL, "sscanf failure."); - return id; - } -@@ -68,7 +68,7 @@ static long getusernsidbypid(int pid) - static void test_userns_id(void) - { - int cpid1, cpid2, cpid3; -- long parentuserns, cpid1userns, cpid2userns, newparentuserns; -+ unsigned int parentuserns, cpid1userns, cpid2userns, newparentuserns; - - parentuserns = getusernsidbypid(getpid()); - cpid1 = ltp_clone_quick(SIGCHLD, (void *)child_fn1, --- -2.9.3 - -- cgit 1.2.3-korg